From d886c5615acf99c1eeede2fb8cd725ceae157610 Mon Sep 17 00:00:00 2001 From: Juan de la Cruz Date: Wed, 18 Dec 2019 13:58:46 +0100 Subject: [PATCH] wip options css --- .../public/images/svg/arrow-down-white.svg | 60 +++++++++++++++++++ .../resources/styles/common/framework.scss | 2 +- .../styles/main/partials/colorpicker.scss | 7 ++- .../partials/sidebar-element-options.scss | 11 ++-- .../main/ui/workspace/sidebar/layers.cljs | 3 +- .../main/ui/workspace/sidebar/options.cljs | 8 +-- 6 files changed, 79 insertions(+), 12 deletions(-) create mode 100644 frontend/resources/public/images/svg/arrow-down-white.svg diff --git a/frontend/resources/public/images/svg/arrow-down-white.svg b/frontend/resources/public/images/svg/arrow-down-white.svg new file mode 100644 index 000000000..c47a7be72 --- /dev/null +++ b/frontend/resources/public/images/svg/arrow-down-white.svg @@ -0,0 +1,60 @@ + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/frontend/resources/styles/common/framework.scss b/frontend/resources/styles/common/framework.scss index dde66467b..a96aced98 100644 --- a/frontend/resources/styles/common/framework.scss +++ b/frontend/resources/styles/common/framework.scss @@ -454,7 +454,7 @@ input.element-name { .input-select { @extend .input-text; - background-image: url("/images/svg/arrow-down.svg"); + background-image: url("/images/svg/arrow-down-white.svg"); background-repeat: no-repeat; background-position: 95% 48%; background-size: 10px; diff --git a/frontend/resources/styles/main/partials/colorpicker.scss b/frontend/resources/styles/main/partials/colorpicker.scss index 94202077c..89f5ffc77 100644 --- a/frontend/resources/styles/main/partials/colorpicker.scss +++ b/frontend/resources/styles/main/partials/colorpicker.scss @@ -154,12 +154,17 @@ .color-info { input { - border: 1px solid $soft-ui-border; + border: 1px solid $intense-ui-border; border-radius: $br-small; + color: $soft-ui-text; margin: 3px 0 0 $x-small; padding: 0 $x-small; width: 58px; font-size: $fs13; + + &:focus { + border-color: $soft-ui-text; + } } } diff --git a/frontend/resources/styles/main/partials/sidebar-element-options.scss b/frontend/resources/styles/main/partials/sidebar-element-options.scss index c3b4c5129..2eee292bd 100644 --- a/frontend/resources/styles/main/partials/sidebar-element-options.scss +++ b/frontend/resources/styles/main/partials/sidebar-element-options.scss @@ -62,14 +62,15 @@ } .element-set { + border-bottom: 1px solid $soft-ui-border; color: $medium-ui-text; margin: 0 $x-small; .element-set-title { - border-bottom: 1px dashed $soft-ui-border; - color: $medium-ui-text; - font-weight: bold; - padding: 2px $x-small; + color: $soft-ui-text; + font-size: $fs14; + margin-top: $x-small; + padding: $x-small; width: 100%; } @@ -214,7 +215,7 @@ } span { - color: $medium-ui-text; + color: $soft-ui-text; font-size: $fs12; } diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs index 066854cc4..e76075ac7 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/layers.cljs @@ -260,7 +260,8 @@ [:div.tool-window-bar [:div.tool-window-icon i/layers] [:span (tr "ds.settings.layers")] - [:div.tool-window-close {:on-click on-click} i/close]] + ;; [:div.tool-window-close {:on-click on-click} i/close] + ] [:div.tool-window-content [:& canvas-list {:canvas canvas :shapes all-shapes diff --git a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs index 492e1bc42..9feb2214c 100644 --- a/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs +++ b/frontend/src/uxbox/main/ui/workspace/sidebar/options.cljs @@ -113,10 +113,10 @@ (let [close #(st/emit! (udw/toggle-layout-flag :element-options)) selected (mf/deref refs/selected-shapes)] [:div.elementa-options.tool-window - [:div.tool-window-bar - [:div.tool-window-icon i/options] - [:span (tr "ds.settings.element-options")] - [:div.tool-window-close {:on-click close} i/close]] + ;; [:div.tool-window-bar + ;; [:div.tool-window-icon i/options] + ;; [:span (tr "ds.settings.element-options")] + ;; [:div.tool-window-close {:on-click close} i/close]] [:div.tool-window-content [:div.element-options (if (= (count selected) 1)