From b798f7a988847e5a2241f24bf98350e1877fc571 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Tue, 7 Apr 2020 12:34:25 +0200 Subject: [PATCH] :recycle: Rename text align icons for consistency --- .../icons/{align-center.svg => text-align-center.svg} | 2 +- .../icons/{align-justify.svg => text-align-justify.svg} | 2 +- .../images/icons/{align-left.svg => text-align-left.svg} | 2 +- .../icons/{align-right.svg => text-align-right.svg} | 2 +- frontend/src/uxbox/builtins/icons.cljs | 8 ++++---- .../src/uxbox/main/ui/workspace/sidebar/options/text.cljs | 8 ++++---- 6 files changed, 12 insertions(+), 12 deletions(-) rename frontend/resources/images/icons/{align-center.svg => text-align-center.svg} (98%) rename frontend/resources/images/icons/{align-justify.svg => text-align-justify.svg} (98%) rename frontend/resources/images/icons/{align-left.svg => text-align-left.svg} (98%) rename frontend/resources/images/icons/{align-right.svg => text-align-right.svg} (97%) diff --git a/frontend/resources/images/icons/align-center.svg b/frontend/resources/images/icons/text-align-center.svg similarity index 98% rename from frontend/resources/images/icons/align-center.svg rename to frontend/resources/images/icons/text-align-center.svg index fd33ddb422..304412d42b 100644 --- a/frontend/resources/images/icons/align-center.svg +++ b/frontend/resources/images/icons/text-align-center.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/frontend/resources/images/icons/align-justify.svg b/frontend/resources/images/icons/text-align-justify.svg similarity index 98% rename from frontend/resources/images/icons/align-justify.svg rename to frontend/resources/images/icons/text-align-justify.svg index 290dd055e2..acf125ade8 100644 --- a/frontend/resources/images/icons/align-justify.svg +++ b/frontend/resources/images/icons/text-align-justify.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/frontend/resources/images/icons/align-left.svg b/frontend/resources/images/icons/text-align-left.svg similarity index 98% rename from frontend/resources/images/icons/align-left.svg rename to frontend/resources/images/icons/text-align-left.svg index bff66a31f0..20f7e7caae 100644 --- a/frontend/resources/images/icons/align-left.svg +++ b/frontend/resources/images/icons/text-align-left.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/frontend/resources/images/icons/align-right.svg b/frontend/resources/images/icons/text-align-right.svg similarity index 97% rename from frontend/resources/images/icons/align-right.svg rename to frontend/resources/images/icons/text-align-right.svg index dbb51c79d4..40dc9024df 100644 --- a/frontend/resources/images/icons/align-right.svg +++ b/frontend/resources/images/icons/text-align-right.svg @@ -1 +1 @@ - \ No newline at end of file + diff --git a/frontend/src/uxbox/builtins/icons.cljs b/frontend/src/uxbox/builtins/icons.cljs index 08f6d4b972..e2683b90c5 100644 --- a/frontend/src/uxbox/builtins/icons.cljs +++ b/frontend/src/uxbox/builtins/icons.cljs @@ -11,10 +11,10 @@ (def action (icon-xref :action)) (def actions (icon-xref :actions)) -(def align-center (icon-xref :align-center)) -(def align-justify (icon-xref :align-justify)) -(def align-left (icon-xref :align-left)) -(def align-right (icon-xref :align-right)) +(def text-align-center (icon-xref :text-align-center)) +(def text-align-justify (icon-xref :text-align-justify)) +(def text-align-left (icon-xref :text-align-left)) +(def text-align-right (icon-xref :text-align-right)) (def alignment (icon-xref :alignment)) (def arrow (icon-xref :arrow)) (def arrow-down (icon-xref :arrow-down)) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs index 41fd6aaaf2..9bddea6ede 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options/text.cljs @@ -263,16 +263,16 @@ [:div.row-flex.align-icons [:span {:class (when (= text-align "left") "current") :on-click #(on-font-align-change % "left")} - i/align-left] + i/text-align-left] [:span {:class (when (= text-align "center") "current") :on-click #(on-font-align-change % "center")} - i/align-center] + i/text-align-center] [:span {:class (when (= text-align "right") "current") :on-click #(on-font-align-change % "right")} - i/align-right] + i/text-align-right] [:span {:class (when (= text-align "justify") "current") :on-click #(on-font-align-change % "justify")} - i/align-justify]]]])) + i/text-align-justify]]]])) (def +fonts+ [{:id "sourcesanspro"