From 1ba4419eb02aedc1d9fcad77bf7439ac5f6bbaeb Mon Sep 17 00:00:00 2001 From: Juan de la Cruz Date: Wed, 24 Feb 2016 16:04:19 +0100 Subject: [PATCH] fix options border styles --- .../partials/sidebar-element-options.scss | 1 + src/uxbox/ui/workspace/sidebar/options.cljs | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/resources/styles/partials/sidebar-element-options.scss b/resources/styles/partials/sidebar-element-options.scss index dd28a9063..5ff3d7e19 100644 --- a/resources/styles/partials/sidebar-element-options.scss +++ b/resources/styles/partials/sidebar-element-options.scss @@ -205,6 +205,7 @@ left: -4px; position: absolute; width: 23px; + transition: none; top: 30%; } diff --git a/src/uxbox/ui/workspace/sidebar/options.cljs b/src/uxbox/ui/workspace/sidebar/options.cljs index cbc6c94ee..a7ecc1729 100644 --- a/src/uxbox/ui/workspace/sidebar/options.cljs +++ b/src/uxbox/ui/workspace/sidebar/options.cljs @@ -87,17 +87,18 @@ [:div.element-set-content [:span "Style"] [:div.row-flex - [:input#width.input-text - {:placeholder "Width" - :type "number" - :min "0" - :value (:stroke-width shape "") - :on-change on-width-change}] - [:select#style {:placeholder "Style" + [:select#style.input-select {:placeholder "Style" :on-change on-stroke-style-change} + [:option {:value "nil"} "None"] [:option {:value "nil"} "Solid"] [:option {:value ":dotted"} "Dotted"] - [:option {:value ":dashed"} "Dashed"]]] + [:option {:value ":dashed"} "Dashed"]] + [:input#width.input-text + {:placeholder "Width" + :type "number" + :min "0" + :value (:stroke-width shape "") + :on-change on-width-change}]] ;; SLIDEBAR FOR ROTATION AND OPACITY [:span "Color"]