From d0af14c40fbe4eeace196991141ed74c5a70ec29 Mon Sep 17 00:00:00 2001 From: elhombretecla Date: Thu, 29 Apr 2021 14:47:26 +0200 Subject: [PATCH] :tada: Add new svg icons --- frontend/resources/images/icons/alignment.svg | 4 +++- frontend/resources/images/icons/arrow-down.svg | 4 +++- frontend/resources/images/icons/arrow-end.svg | 4 +++- frontend/resources/images/icons/arrow-slide.svg | 4 +++- frontend/resources/images/icons/artboard.svg | 4 ++-- frontend/resources/images/icons/box.svg | 4 +++- frontend/resources/images/icons/chain.svg | 4 +++- frontend/resources/images/icons/code.svg | 4 ++-- frontend/resources/images/icons/component.svg | 4 ++-- frontend/resources/images/icons/copy.svg | 5 ++--- frontend/resources/images/icons/exit.svg | 4 +++- frontend/resources/images/icons/file-html.svg | 4 +++- frontend/resources/images/icons/file-svg.svg | 4 +++- frontend/resources/images/icons/fill.svg | 4 +++- frontend/resources/images/icons/folder-zip.svg | 4 +++- frontend/resources/images/icons/folder.svg | 4 +++- frontend/resources/images/icons/grid-snap.svg | 4 +++- frontend/resources/images/icons/grid.svg | 4 +++- frontend/resources/images/icons/html.svg | 4 +++- frontend/resources/images/icons/image.svg | 4 +++- frontend/resources/images/icons/import.svg | 3 +++ frontend/resources/images/icons/interaction.svg | 6 ++---- frontend/resources/images/icons/layers.svg | 5 ++--- frontend/resources/images/icons/library.svg | 5 ++--- frontend/resources/images/icons/lock-open.svg | 1 - frontend/resources/images/icons/lock.svg | 4 +++- frontend/resources/images/icons/mail.svg | 4 +++- frontend/resources/images/icons/minus.svg | 4 +++- frontend/resources/images/icons/multi-canvas.svg | 4 +++- frontend/resources/images/icons/navigate.svg | 4 +++- frontend/resources/images/icons/palette.svg | 5 ++--- frontend/resources/images/icons/picker-harmony.svg | 3 ++- frontend/resources/images/icons/pin-fill.svg | 4 ++-- frontend/resources/images/icons/pin.svg | 4 +++- frontend/resources/images/icons/plus.svg | 4 +++- frontend/resources/images/icons/recent.svg | 4 ++-- frontend/resources/images/icons/ruler-tool.svg | 4 +++- frontend/resources/images/icons/size-horiz.svg | 4 ++-- frontend/resources/images/icons/size-vert.svg | 4 ++-- frontend/resources/images/icons/sort-ascending.svg | 4 ++-- frontend/resources/images/icons/sort-descending.svg | 4 ++-- frontend/resources/images/icons/tick.svg | 4 ++-- frontend/resources/images/icons/toggle.svg | 4 +++- frontend/resources/images/icons/tree.svg | 4 +++- frontend/resources/images/icons/unchain.svg | 8 ++------ frontend/resources/images/icons/undo-history.svg | 4 ---- frontend/resources/images/icons/ungroup.svg | 4 +++- frontend/resources/images/icons/unlock.svg | 4 +++- frontend/resources/images/icons/user.svg | 4 +++- frontend/src/app/main/ui/workspace/left_toolbar.cljs | 2 +- frontend/src/app/main/ui/workspace/sidebar/history.cljs | 2 +- frontend/src/app/main/ui/workspace/sidebar/layers.cljs | 2 +- .../main/ui/workspace/sidebar/options/menus/layer.cljs | 2 +- 53 files changed, 128 insertions(+), 81 deletions(-) create mode 100644 frontend/resources/images/icons/import.svg delete mode 100644 frontend/resources/images/icons/lock-open.svg delete mode 100644 frontend/resources/images/icons/undo-history.svg diff --git a/frontend/resources/images/icons/alignment.svg b/frontend/resources/images/icons/alignment.svg index aaacb23b1..65db1eb38 100644 --- a/frontend/resources/images/icons/alignment.svg +++ b/frontend/resources/images/icons/alignment.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/arrow-down.svg b/frontend/resources/images/icons/arrow-down.svg index a56f66d87..9402aff96 100644 --- a/frontend/resources/images/icons/arrow-down.svg +++ b/frontend/resources/images/icons/arrow-down.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/arrow-end.svg b/frontend/resources/images/icons/arrow-end.svg index fe82545d6..a025ca2c5 100644 --- a/frontend/resources/images/icons/arrow-end.svg +++ b/frontend/resources/images/icons/arrow-end.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/arrow-slide.svg b/frontend/resources/images/icons/arrow-slide.svg index 3f4c3f96c..754e3e97f 100644 --- a/frontend/resources/images/icons/arrow-slide.svg +++ b/frontend/resources/images/icons/arrow-slide.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/artboard.svg b/frontend/resources/images/icons/artboard.svg index c91397300..87f4543a3 100644 --- a/frontend/resources/images/icons/artboard.svg +++ b/frontend/resources/images/icons/artboard.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/box.svg b/frontend/resources/images/icons/box.svg index cbed171e6..d8ef1bffe 100644 --- a/frontend/resources/images/icons/box.svg +++ b/frontend/resources/images/icons/box.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/chain.svg b/frontend/resources/images/icons/chain.svg index a34db111e..661d8db6b 100644 --- a/frontend/resources/images/icons/chain.svg +++ b/frontend/resources/images/icons/chain.svg @@ -1 +1,3 @@ - + + + diff --git a/frontend/resources/images/icons/code.svg b/frontend/resources/images/icons/code.svg index d8ae15c9e..3c80441e3 100644 --- a/frontend/resources/images/icons/code.svg +++ b/frontend/resources/images/icons/code.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/component.svg b/frontend/resources/images/icons/component.svg index 2042881f9..2777568a4 100644 --- a/frontend/resources/images/icons/component.svg +++ b/frontend/resources/images/icons/component.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/copy.svg b/frontend/resources/images/icons/copy.svg index 8a65c91c7..d676e2227 100644 --- a/frontend/resources/images/icons/copy.svg +++ b/frontend/resources/images/icons/copy.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/frontend/resources/images/icons/exit.svg b/frontend/resources/images/icons/exit.svg index 403b4c675..ce145a385 100644 --- a/frontend/resources/images/icons/exit.svg +++ b/frontend/resources/images/icons/exit.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/file-html.svg b/frontend/resources/images/icons/file-html.svg index 9427f31d2..91a9e6c42 100644 --- a/frontend/resources/images/icons/file-html.svg +++ b/frontend/resources/images/icons/file-html.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/file-svg.svg b/frontend/resources/images/icons/file-svg.svg index 5cab59e98..33e5830de 100644 --- a/frontend/resources/images/icons/file-svg.svg +++ b/frontend/resources/images/icons/file-svg.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/fill.svg b/frontend/resources/images/icons/fill.svg index 7593f603f..a509069cc 100644 --- a/frontend/resources/images/icons/fill.svg +++ b/frontend/resources/images/icons/fill.svg @@ -1 +1,3 @@ - + + + diff --git a/frontend/resources/images/icons/folder-zip.svg b/frontend/resources/images/icons/folder-zip.svg index 37e404e8b..a07dbcb80 100644 --- a/frontend/resources/images/icons/folder-zip.svg +++ b/frontend/resources/images/icons/folder-zip.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/folder.svg b/frontend/resources/images/icons/folder.svg index 64899804d..cd7c2a4ec 100644 --- a/frontend/resources/images/icons/folder.svg +++ b/frontend/resources/images/icons/folder.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/grid-snap.svg b/frontend/resources/images/icons/grid-snap.svg index 14fb513c3..2f03be05a 100644 --- a/frontend/resources/images/icons/grid-snap.svg +++ b/frontend/resources/images/icons/grid-snap.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/grid.svg b/frontend/resources/images/icons/grid.svg index a42d22149..be57664c1 100644 --- a/frontend/resources/images/icons/grid.svg +++ b/frontend/resources/images/icons/grid.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/html.svg b/frontend/resources/images/icons/html.svg index 09616a9ba..a2dd0494e 100644 --- a/frontend/resources/images/icons/html.svg +++ b/frontend/resources/images/icons/html.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/image.svg b/frontend/resources/images/icons/image.svg index dda84b545..1d3f13f09 100644 --- a/frontend/resources/images/icons/image.svg +++ b/frontend/resources/images/icons/image.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/import.svg b/frontend/resources/images/icons/import.svg new file mode 100644 index 000000000..4e0914b05 --- /dev/null +++ b/frontend/resources/images/icons/import.svg @@ -0,0 +1,3 @@ + + + diff --git a/frontend/resources/images/icons/interaction.svg b/frontend/resources/images/icons/interaction.svg index afc359d84..d95baa8be 100644 --- a/frontend/resources/images/icons/interaction.svg +++ b/frontend/resources/images/icons/interaction.svg @@ -1,5 +1,3 @@ - - - - + + diff --git a/frontend/resources/images/icons/layers.svg b/frontend/resources/images/icons/layers.svg index 3968ee0db..703fd0cbe 100644 --- a/frontend/resources/images/icons/layers.svg +++ b/frontend/resources/images/icons/layers.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/frontend/resources/images/icons/library.svg b/frontend/resources/images/icons/library.svg index 4b5457f7f..c4be0d41f 100644 --- a/frontend/resources/images/icons/library.svg +++ b/frontend/resources/images/icons/library.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/frontend/resources/images/icons/lock-open.svg b/frontend/resources/images/icons/lock-open.svg deleted file mode 100644 index ed703a641..000000000 --- a/frontend/resources/images/icons/lock-open.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/frontend/resources/images/icons/lock.svg b/frontend/resources/images/icons/lock.svg index cbb4a4ec9..6477336ae 100644 --- a/frontend/resources/images/icons/lock.svg +++ b/frontend/resources/images/icons/lock.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/mail.svg b/frontend/resources/images/icons/mail.svg index e40e68ed3..0d03f891d 100644 --- a/frontend/resources/images/icons/mail.svg +++ b/frontend/resources/images/icons/mail.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/minus.svg b/frontend/resources/images/icons/minus.svg index c92d33dd5..d79c63c51 100644 --- a/frontend/resources/images/icons/minus.svg +++ b/frontend/resources/images/icons/minus.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/multi-canvas.svg b/frontend/resources/images/icons/multi-canvas.svg index 8545ec76a..94025eee1 100644 --- a/frontend/resources/images/icons/multi-canvas.svg +++ b/frontend/resources/images/icons/multi-canvas.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/navigate.svg b/frontend/resources/images/icons/navigate.svg index 154f70535..1b13012e4 100644 --- a/frontend/resources/images/icons/navigate.svg +++ b/frontend/resources/images/icons/navigate.svg @@ -1 +1,3 @@ - + + + diff --git a/frontend/resources/images/icons/palette.svg b/frontend/resources/images/icons/palette.svg index 80ab78401..4984a76b1 100644 --- a/frontend/resources/images/icons/palette.svg +++ b/frontend/resources/images/icons/palette.svg @@ -1,4 +1,3 @@ - - - + + diff --git a/frontend/resources/images/icons/picker-harmony.svg b/frontend/resources/images/icons/picker-harmony.svg index c108e2812..1f8de0d5c 100644 --- a/frontend/resources/images/icons/picker-harmony.svg +++ b/frontend/resources/images/icons/picker-harmony.svg @@ -1,2 +1,3 @@ - + + diff --git a/frontend/resources/images/icons/pin-fill.svg b/frontend/resources/images/icons/pin-fill.svg index 5119bbf6d..1e11c8c45 100644 --- a/frontend/resources/images/icons/pin-fill.svg +++ b/frontend/resources/images/icons/pin-fill.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/pin.svg b/frontend/resources/images/icons/pin.svg index 438791743..46d71436a 100644 --- a/frontend/resources/images/icons/pin.svg +++ b/frontend/resources/images/icons/pin.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/plus.svg b/frontend/resources/images/icons/plus.svg index 716813537..8368e0234 100644 --- a/frontend/resources/images/icons/plus.svg +++ b/frontend/resources/images/icons/plus.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/recent.svg b/frontend/resources/images/icons/recent.svg index 590de6517..696757240 100644 --- a/frontend/resources/images/icons/recent.svg +++ b/frontend/resources/images/icons/recent.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/ruler-tool.svg b/frontend/resources/images/icons/ruler-tool.svg index b0ae77a90..0d18c21a5 100644 --- a/frontend/resources/images/icons/ruler-tool.svg +++ b/frontend/resources/images/icons/ruler-tool.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/size-horiz.svg b/frontend/resources/images/icons/size-horiz.svg index ab9456580..553fbfea1 100644 --- a/frontend/resources/images/icons/size-horiz.svg +++ b/frontend/resources/images/icons/size-horiz.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/size-vert.svg b/frontend/resources/images/icons/size-vert.svg index f2e807c40..14bba276d 100644 --- a/frontend/resources/images/icons/size-vert.svg +++ b/frontend/resources/images/icons/size-vert.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/sort-ascending.svg b/frontend/resources/images/icons/sort-ascending.svg index a8907d170..48ed056f4 100644 --- a/frontend/resources/images/icons/sort-ascending.svg +++ b/frontend/resources/images/icons/sort-ascending.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/sort-descending.svg b/frontend/resources/images/icons/sort-descending.svg index 4ba6c45c0..3a5838b95 100644 --- a/frontend/resources/images/icons/sort-descending.svg +++ b/frontend/resources/images/icons/sort-descending.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/tick.svg b/frontend/resources/images/icons/tick.svg index f92e28e87..93e3f520b 100644 --- a/frontend/resources/images/icons/tick.svg +++ b/frontend/resources/images/icons/tick.svg @@ -1,3 +1,3 @@ - - + + diff --git a/frontend/resources/images/icons/toggle.svg b/frontend/resources/images/icons/toggle.svg index 992c33882..732c7042c 100644 --- a/frontend/resources/images/icons/toggle.svg +++ b/frontend/resources/images/icons/toggle.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/tree.svg b/frontend/resources/images/icons/tree.svg index cdb26bd89..ddfffe3e7 100644 --- a/frontend/resources/images/icons/tree.svg +++ b/frontend/resources/images/icons/tree.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/unchain.svg b/frontend/resources/images/icons/unchain.svg index 5727cc380..911560889 100644 --- a/frontend/resources/images/icons/unchain.svg +++ b/frontend/resources/images/icons/unchain.svg @@ -1,7 +1,3 @@ - - - - - - + + diff --git a/frontend/resources/images/icons/undo-history.svg b/frontend/resources/images/icons/undo-history.svg deleted file mode 100644 index 42a4cc1c7..000000000 --- a/frontend/resources/images/icons/undo-history.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/frontend/resources/images/icons/ungroup.svg b/frontend/resources/images/icons/ungroup.svg index 6017f0ecd..5afc3a40e 100644 --- a/frontend/resources/images/icons/ungroup.svg +++ b/frontend/resources/images/icons/ungroup.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/unlock.svg b/frontend/resources/images/icons/unlock.svg index dd2954b08..b9c1ffa83 100644 --- a/frontend/resources/images/icons/unlock.svg +++ b/frontend/resources/images/icons/unlock.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/resources/images/icons/user.svg b/frontend/resources/images/icons/user.svg index eac608035..228a69876 100644 --- a/frontend/resources/images/icons/user.svg +++ b/frontend/resources/images/icons/user.svg @@ -1 +1,3 @@ - \ No newline at end of file + + + diff --git a/frontend/src/app/main/ui/workspace/left_toolbar.cljs b/frontend/src/app/main/ui/workspace/left_toolbar.cljs index fd7053d5e..f948e8237 100644 --- a/frontend/src/app/main/ui/workspace/left_toolbar.cljs +++ b/frontend/src/app/main/ui/workspace/left_toolbar.cljs @@ -127,7 +127,7 @@ {:alt (tr "workspace.sidebar.history" (sc/get-tooltip :toggle-history)) :class (when (contains? layout :document-history) "selected") :on-click (st/emitf (dw/go-to-layout :document-history))} - i/undo-history] + i/recent] [:li.tooltip.tooltip-right {:alt (tr "workspace.toolbar.color-palette" (sc/get-tooltip :toggle-palette)) :class (when (contains? layout :colorpalette) "selected") diff --git a/frontend/src/app/main/ui/workspace/sidebar/history.cljs b/frontend/src/app/main/ui/workspace/sidebar/history.cljs index d74a904c5..f188172a2 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/history.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/history.cljs @@ -286,7 +286,7 @@ [:div.history-toolbox-title (t locale "workspace.undo.title")] (if (empty? entries) [:div.history-entry-empty - [:div.history-entry-empty-icon i/undo-history] + [:div.history-entry-empty-icon i/recent] [:div.history-entry-empty-msg (t locale "workspace.undo.empty")]] [:ul.history-entries (for [[idx-entry entry] (->> entries (map-indexed vector) reverse)] #_[i (range 0 10)] diff --git a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs index a4744b6a4..fa842aa4d 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/layers.cljs @@ -233,7 +233,7 @@ (if (:hidden item) i/eye-closed i/eye)] [:div.block-element {:class (when (:blocked item) "selected") :on-click toggle-blocking} - (if (:blocked item) i/lock i/lock-open)]] + (if (:blocked item) i/lock i/unlock)]] (when (:shapes item) [:span.toggle-content diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs index 46fa46660..c7be781cf 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/layer.cljs @@ -133,7 +133,7 @@ (cond (or (= :multiple (:blocked values)) (not (:blocked values))) - [:div.element-set-actions-button {:on-click handle-set-blocked} i/lock-open] + [:div.element-set-actions-button {:on-click handle-set-blocked} i/unlock] :else [:div.element-set-actions-button {:on-click handle-set-unblocked} i/lock])]]]]))