From 6aef94418be603394b5c0cdc9916965075601c3d Mon Sep 17 00:00:00 2001 From: Juan de la Cruz Date: Mon, 25 Jan 2016 19:54:28 +0100 Subject: [PATCH] add correct border radius inputs --- .../styles/partials/element-options.scss | 52 +++++++++---------- .../public/styles/partials/settings-bar.scss | 1 + src/uxbox/ui/workspace/options.cljs | 14 +---- 3 files changed, 29 insertions(+), 38 deletions(-) diff --git a/resources/public/styles/partials/element-options.scss b/resources/public/styles/partials/element-options.scss index 46375410d1..af2cacfaf1 100644 --- a/resources/public/styles/partials/element-options.scss +++ b/resources/public/styles/partials/element-options.scss @@ -162,32 +162,32 @@ } } -.border-element { - align-items: center; - display: flex; - flex-direction: column; - margin: 5px 2% 0 2%; - svg { - fill: $color-gray-light; - height: 12px; - width: 12px; - } - &.top-left { - svg { - transform: rotate(270deg); - } - } - &.bottom-left { - svg { - transform: rotate(180deg); - } - } - &.bottom-right { - svg { - transform: rotate(90deg); - } - } -} +// .border-element { +// align-items: center; +// display: flex; +// flex-direction: column; +// margin: 5px 2% 0 2%; +// svg { +// fill: $color-gray-light; +// height: 12px; +// width: 12px; +// } +// &.top-left { +// svg { +// transform: rotate(270deg); +// } +// } +// &.bottom-left { +// svg { +// transform: rotate(180deg); +// } +// } +// &.bottom-right { +// svg { +// transform: rotate(90deg); +// } +// } +// } .align-icons { cursor: pointer; diff --git a/resources/public/styles/partials/settings-bar.scss b/resources/public/styles/partials/settings-bar.scss index 5cd128feec..570d8e7f0d 100644 --- a/resources/public/styles/partials/settings-bar.scss +++ b/resources/public/styles/partials/settings-bar.scss @@ -241,6 +241,7 @@ .element-actions { align-items: center; display: flex; + flex-shrink: 0; width: 62px; } diff --git a/src/uxbox/ui/workspace/options.cljs b/src/uxbox/ui/workspace/options.cljs index 039f29c8be..f06fa1e925 100644 --- a/src/uxbox/ui/workspace/options.cljs +++ b/src/uxbox/ui/workspace/options.cljs @@ -103,19 +103,9 @@ (recent-colors shape #(change-stroke {:color %})) [:span "Border radius"] [:div.row-flex - [:div.border-element.top-left - i/radius - [:input.input-text {:type "text" :placeholder "px"}]] - [:div.border-element.top-right - i/radius - [:input.input-text {:type "text" :placeholder "px"}]] + [:input.input-text {:type "text" :placeholder "rx"}] [:span.lock-size i/lock] - [:div.border-element.bottom-left - i/radius - [:input.input-text {:type "text" :placeholder "px"}]] - [:div.border-element.bottom-right - i/radius - [:input.input-text {:type "text" :placeholder "px"}]]] + [:input.input-text {:type "text" :placeholder "ry"}]] ;; SLIDEBAR FOR ROTATION AND OPACITY [:span "Opacity"]