From 67b343660a328536a962a1ce5c3030096854769c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bel=C3=A9n=20Albeza?= Date: Wed, 28 Feb 2024 10:07:08 +0100 Subject: [PATCH] :bug: Use new icons in stroke cap dropdown --- .../images/icons/stroke-arrow-refactor.svg | 3 +++ .../images/icons/stroke-circle-refactor.svg | 3 +++ .../images/icons/stroke-diamond-refactor.svg | 3 +++ .../images/icons/stroke-rectangle-refactor.svg | 3 +++ .../images/icons/stroke-rounded-refactor.svg | 3 +++ .../images/icons/stroke-squared-refactor.svg | 3 +++ .../images/icons/stroke-triangle-refactor.svg | 3 +++ frontend/src/app/main/ui/icons.cljs | 7 +++++++ .../workspace/sidebar/options/rows/stroke_row.cljs | 14 +++++++------- 9 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 frontend/resources/images/icons/stroke-arrow-refactor.svg create mode 100644 frontend/resources/images/icons/stroke-circle-refactor.svg create mode 100644 frontend/resources/images/icons/stroke-diamond-refactor.svg create mode 100644 frontend/resources/images/icons/stroke-rectangle-refactor.svg create mode 100644 frontend/resources/images/icons/stroke-rounded-refactor.svg create mode 100644 frontend/resources/images/icons/stroke-squared-refactor.svg create mode 100644 frontend/resources/images/icons/stroke-triangle-refactor.svg diff --git a/frontend/resources/images/icons/stroke-arrow-refactor.svg b/frontend/resources/images/icons/stroke-arrow-refactor.svg new file mode 100644 index 0000000000..0a626f4ac4 --- /dev/null +++ b/frontend/resources/images/icons/stroke-arrow-refactor.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/stroke-circle-refactor.svg b/frontend/resources/images/icons/stroke-circle-refactor.svg new file mode 100644 index 0000000000..06f2857a9b --- /dev/null +++ b/frontend/resources/images/icons/stroke-circle-refactor.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/stroke-diamond-refactor.svg b/frontend/resources/images/icons/stroke-diamond-refactor.svg new file mode 100644 index 0000000000..a8bd63c868 --- /dev/null +++ b/frontend/resources/images/icons/stroke-diamond-refactor.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/stroke-rectangle-refactor.svg b/frontend/resources/images/icons/stroke-rectangle-refactor.svg new file mode 100644 index 0000000000..dc9199872b --- /dev/null +++ b/frontend/resources/images/icons/stroke-rectangle-refactor.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/stroke-rounded-refactor.svg b/frontend/resources/images/icons/stroke-rounded-refactor.svg new file mode 100644 index 0000000000..c99cb3b390 --- /dev/null +++ b/frontend/resources/images/icons/stroke-rounded-refactor.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/stroke-squared-refactor.svg b/frontend/resources/images/icons/stroke-squared-refactor.svg new file mode 100644 index 0000000000..d817d999a5 --- /dev/null +++ b/frontend/resources/images/icons/stroke-squared-refactor.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/stroke-triangle-refactor.svg b/frontend/resources/images/icons/stroke-triangle-refactor.svg new file mode 100644 index 0000000000..96d756fd6c --- /dev/null +++ b/frontend/resources/images/icons/stroke-triangle-refactor.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/src/app/main/ui/icons.cljs b/frontend/src/app/main/ui/icons.cljs index ee4e65c97e..be6dd7ab9f 100644 --- a/frontend/src/app/main/ui/icons.cljs +++ b/frontend/src/app/main/ui/icons.cljs @@ -441,6 +441,13 @@ (def ^:icon status-update-refactor (icon-xref :status-update-refactor)) (def ^:icon status-tick-refactor (icon-xref :status-tick-refactor)) (def ^:icon status-wrong-refactor (icon-xref :status-wrong-refactor)) +(def ^:icon stroke-arrow-refactor (icon-xref :stroke-arrow-refactor)) +(def ^:icon stroke-circle-refactor (icon-xref :stroke-circle-refactor)) +(def ^:icon stroke-diamond-refactor (icon-xref :stroke-diamond-refactor)) +(def ^:icon stroke-rectangle-refactor (icon-xref :stroke-rectangle-refactor)) +(def ^:icon stroke-rounded-refactor (icon-xref :stroke-rounded-refactor)) +(def ^:icon stroke-squared-refactor (icon-xref :stroke-squared-refactor)) +(def ^:icon stroke-triangle-refactor (icon-xref :stroke-triangle-refactor)) (def ^:icon stroke-size-refactor (icon-xref :stroke-size-refactor)) (def ^:icon svg-refactor (icon-xref :svg-refactor)) (def ^:icon swatches-refactor (icon-xref :swatches-refactor)) diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs index 23c70c23e5..9548d8b285 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/rows/stroke_row.cljs @@ -123,14 +123,14 @@ stroke-caps-options [{:value nil :label (tr "workspace.options.stroke-cap.none")} :separator - {:value :line-arrow :label (tr "workspace.options.stroke-cap.line-arrow-short") :icon :cap-line-arrow} - {:value :triangle-arrow :label (tr "workspace.options.stroke-cap.triangle-arrow-short") :icon :cap-triangle-arrow} - {:value :square-marker :label (tr "workspace.options.stroke-cap.square-marker-short") :icon :cap-square-marker} - {:value :circle-marker :label (tr "workspace.options.stroke-cap.circle-marker-short") :icon :cap-circle-marker} - {:value :diamond-marker :label (tr "workspace.options.stroke-cap.diamond-marker-short") :icon :cap-diamond-marker} + {:value :line-arrow :label (tr "workspace.options.stroke-cap.line-arrow-short") :icon :stroke-arrow-refactor} + {:value :triangle-arrow :label (tr "workspace.options.stroke-cap.triangle-arrow-short") :icon :stroke-triangle-refactor} + {:value :square-marker :label (tr "workspace.options.stroke-cap.square-marker-short") :icon :stroke-rectangle-refactor} + {:value :circle-marker :label (tr "workspace.options.stroke-cap.circle-marker-short") :icon :stroke-circle-refactor} + {:value :diamond-marker :label (tr "workspace.options.stroke-cap.diamond-marker-short") :icon :stroke-diamond-refactor} :separator - {:value :round :label (tr "workspace.options.stroke-cap.round") :icon :cap-round} - {:value :square :label (tr "workspace.options.stroke-cap.square") :icon :cap-square}] + {:value :round :label (tr "workspace.options.stroke-cap.round") :icon :stroke-rounded-refactor} + {:value :square :label (tr "workspace.options.stroke-cap.square") :icon :stroke-squared-refactor}] on-cap-switch (mf/use-callback