From 851eff897ef03e337f8770eee39a37603868b9fe Mon Sep 17 00:00:00 2001 From: Juan de la Cruz Date: Tue, 12 Jan 2016 15:04:51 +0100 Subject: [PATCH] add fill element color-picker --- frontend/uxbox/ui/workspace/options.cljs | 8 ++++-- resources/public/images/color-bar.png | Bin 0 -> 256 bytes resources/public/images/color-gamma.png | Bin 0 -> 3306 bytes .../styles/partials/element-options.scss | 23 ++++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 resources/public/images/color-bar.png create mode 100644 resources/public/images/color-gamma.png diff --git a/frontend/uxbox/ui/workspace/options.cljs b/frontend/uxbox/ui/workspace/options.cljs index c61106c14..9194c62e2 100644 --- a/frontend/uxbox/ui/workspace/options.cljs +++ b/frontend/uxbox/ui/workspace/options.cljs @@ -64,6 +64,12 @@ [:div.element-set-content ;; SLIDEBAR FOR ROTATION AND OPACITY [:span "Color"] + [:div.element-color-picker + [:div.color-picker-body + [:img {:src "images/color-gamma.png", :border "none"}]] + [:div.color-picker-bar + [:div.color-bar-select] + [:img {:src "images/color-bar.png", :border "none"}]]] [:div.row-flex [:input#width.input-text {:placeholder "#" @@ -184,5 +190,3 @@ {:render element-opts-render :name "element-opts" :mixins [rum/reactive (mx/local {})]})) - - diff --git a/resources/public/images/color-bar.png b/resources/public/images/color-bar.png new file mode 100644 index 0000000000000000000000000000000000000000..70dad5429f1c1ebf23373bedc19d1adce365386a GIT binary patch literal 256 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 literal 0 HcmV?d00001 diff --git a/resources/public/styles/partials/element-options.scss b/resources/public/styles/partials/element-options.scss index 24a7ce051..5eb453c77 100644 --- a/resources/public/styles/partials/element-options.scss +++ b/resources/public/styles/partials/element-options.scss @@ -204,3 +204,26 @@ } } } + +.element-color-picker { + align-items: center; + display: flex; + height: 160px; + margin: 0 4px; + .color-picker-body { + height: 100%; + margin-right: 15px; + } + .color-picker-bar { + height: 100%; + padding: relative; + width: 15px; + .color-bar-select { + background-color: $color-white; + height: 3px; + position: absolute; + width: 15px; + top: 30%; + } + } +}