From 67a481356b5d3b17f72dd563645cd31b808c5227 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Moya?= Date: Mon, 6 Apr 2020 10:39:50 +0200 Subject: [PATCH] :sparkles: Enable locking of artboards and enhance visualization --- frontend/resources/images/icons/lock-open.svg | 1 + frontend/resources/styles/main/partials/sidebar-layers.scss | 4 +--- frontend/src/uxbox/builtins/icons.cljs | 1 + frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 frontend/resources/images/icons/lock-open.svg diff --git a/frontend/resources/images/icons/lock-open.svg b/frontend/resources/images/icons/lock-open.svg new file mode 100644 index 0000000000..ed703a641c --- /dev/null +++ b/frontend/resources/images/icons/lock-open.svg @@ -0,0 +1 @@ + diff --git a/frontend/resources/styles/main/partials/sidebar-layers.scss b/frontend/resources/styles/main/partials/sidebar-layers.scss index c5cc2e3630..bc72e312c6 100644 --- a/frontend/resources/styles/main/partials/sidebar-layers.scss +++ b/frontend/resources/styles/main/partials/sidebar-layers.scss @@ -57,8 +57,6 @@ } .toggle-content { - margin-left: $x-small; - svg { fill: $color-gray-60; } @@ -205,4 +203,4 @@ span.element-name { fill: $color-black !important; padding: 1px; } -} \ No newline at end of file +} diff --git a/frontend/src/uxbox/builtins/icons.cljs b/frontend/src/uxbox/builtins/icons.cljs index b043dd48e3..a000cbdec2 100644 --- a/frontend/src/uxbox/builtins/icons.cljs +++ b/frontend/src/uxbox/builtins/icons.cljs @@ -47,6 +47,7 @@ (def line (icon-xref :line)) (def loader (icon-xref :loader)) (def lock (icon-xref :lock)) +(def lock-open (icon-xref :lock-open)) (def logo (icon-xref :uxbox-logo)) (def logo-icon (icon-xref :uxbox-logo-icon)) (def mail (icon-xref :mail)) diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 2e824e1814..176b0a5775 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -167,7 +167,7 @@ (if (:hidden item) i/eye-closed i/eye)] [:div.block-element {:class (when (:blocked item) "selected") :on-click toggle-blocking} - i/lock]] + (if (:blocked item) i/lock i/lock-open)]] (when (:shapes item) [:span.toggle-content @@ -268,9 +268,9 @@ [:div.toggle-element {:class (when (:hidden item) "selected") :on-click toggle-visibility} (if (:hidden item) i/eye-closed i/eye)] - #_[:div.block-element {:class (when (:blocked item) "selected") + [:div.block-element {:class (when (:blocked item) "selected") :on-click toggle-blocking} - i/lock]] + (if (:blocked item) i/lock i/lock-open)]] [:span.toggle-content {:on-click toggle-collapse