From ee651806fa4dc6d542aff196bf8915ba6d3b25f9 Mon Sep 17 00:00:00 2001 From: Konstantinos Kaloutas Date: Sun, 17 Mar 2024 01:15:10 +0200 Subject: [PATCH] remove fixed height --- src/renderer/attribute/angle.cljs | 4 ++-- src/renderer/attribute/d.cljs | 5 ++--- src/renderer/attribute/length.cljs | 8 ++++---- src/renderer/attribute/points.cljs | 8 +++----- src/renderer/attribute/views.cljs | 33 ++++++++++++++++-------------- 5 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/renderer/attribute/angle.cljs b/src/renderer/attribute/angle.cljs index cc2a99e7..d70f14d7 100644 --- a/src/renderer/attribute/angle.cljs +++ b/src/renderer/attribute/angle.cljs @@ -16,8 +16,8 @@ :placeholder initial}] [:> Popover/Root {:modal true} [:> Popover/Trigger {:asChild true} - [:button.button.ml-px.bg-primary.text-muted - {:style {:width "26px" :height "26px"}} + [:button.button.ml-px.bg-primary.text-muted.h-full + {:style {:width "26px"}} [comp/icon "degrees" {:class "icon small"}]]] [:> Popover/Portal [:> Popover/Content diff --git a/src/renderer/attribute/d.cljs b/src/renderer/attribute/d.cljs index 4c28849b..5c4b4a11 100644 --- a/src/renderer/attribute/d.cljs +++ b/src/renderer/attribute/d.cljs @@ -132,9 +132,8 @@ (when v [:> Popover/Root {:modal true} [:> Popover/Trigger {:asChild true} - [:button.ml-px.inline-block.bg-primary.text-muted - {:style {:flex "0 0 26px" - :height "26px"}} + [:button.ml-px.inline-block.bg-primary.text-muted.h-full + {:style {:flex "0 0 26px"}} [comp/icon "pencil" {:class "icon small"}]]] [:> Popover/Portal [:> Popover/Content {:sideOffset 5 diff --git a/src/renderer/attribute/length.cljs b/src/renderer/attribute/length.cljs index 91aa7fe2..32767c2e 100644 --- a/src/renderer/attribute/length.cljs +++ b/src/renderer/attribute/length.cljs @@ -40,12 +40,12 @@ (rf/dispatch [:element/update-attr k - 1]) (rf/dispatch [:element/update-attr k + 1])))}] [:div.flex {:style {:width "54px"}} - [:button.button.ml-px.bg-primary.text-muted - {:style {:width "26px" :height "26px"} + [:button.button.ml-px.bg-primary.text-muted.h-full + {:style {:width "26px"} :on-pointer-down #(rf/dispatch [:element/update-attr k - 1])} [comp/icon "minus" {:class "icon small"}]] - [:button.button..ml-px.bg-primary.text-muted - {:style {:width "26px" :height "26px"} + [:button.button..ml-px.bg-primary.text-muted.h-full + {:style {:width "26px"} :on-click #(rf/dispatch [:element/update-attr k + 1])} [comp/icon "plus" {:class "icon small"}]]]]) diff --git a/src/renderer/attribute/points.cljs b/src/renderer/attribute/points.cljs index e088ff16..6801218c 100644 --- a/src/renderer/attribute/points.cljs +++ b/src/renderer/attribute/points.cljs @@ -36,8 +36,7 @@ [:> Popover/Root {:modal true} [:> Popover/Trigger {:asChild true} [:button.ml-px.inline-block.bg-primary.text-muted - {:style {:flex "0 0 26px" - :height "26px"}} + {:style {:flex "0 0 26px"}} [comp/icon "pencil" {:class "icon small"}]]] [:> Popover/Portal [:> Popover/Content {:sideOffset 5 @@ -55,8 +54,7 @@ {:key (str "x-" index v) :default-value x}] [:input.bg-transparent {:key (str "y-" index v) :default-value y}] - [:button.button.bg-transparent.text-muted - {:style {:height "26px"} - :on-click #(remove-point-by-index points index)} + [:button.button.bg-transparent.text-muted.h-full + {:on-click #(remove-point-by-index points index)} [comp/icon "times" {:class "icon small"}]]]) points)])) [:> Popover/Arrow {:class "popover-arrow"}]]]])])) diff --git a/src/renderer/attribute/views.cljs b/src/renderer/attribute/views.cljs index 9818f6c2..ef97507c 100644 --- a/src/renderer/attribute/views.cljs +++ b/src/renderer/attribute/views.cljs @@ -86,8 +86,8 @@ :on-blur #(on-change-handler % key value) :on-key-down #(keyb/input-key-down-handler % value on-change-handler key value)}] (when-not (or (empty? (str value)) disabled?) - [:button.button.ml-px.bg-primary.text-muted.absolute.right-0.clear-input-button.hover:bg-transparent - {:style {:width "26px" :height "26px"} + [:button.button.ml-px.bg-primary.text-muted.absolute.h-full.right-0.clear-input-button.hover:bg-transparent + {:style {:width "26px"} :on-pointer-down #(rf/dispatch [:element/remove-attr key])} [comp/icon "times" {:class "icon small"}]])]) @@ -121,19 +121,22 @@ (defn select-input [{:keys [key value disabled? items initial]}] [:div.flex.w-full - [form-input {:key key - :value value - :disabled? disabled? - :placeholder initial}] - [:> Select/Root {:value value - :onValueChange #(rf/dispatch [:element/set-attr key %]) - :disabled disabled?} - [:> Select/Trigger {:class "select-trigger ml-px" - :aria-label (name key) - :style {:background "var(--bg-primary)" - :border-radius 0 - :width "26px" - :height "26px"}} + [form-input + {:key key + :value value + :disabled? disabled? + :placeholder initial}] + [:> Select/Root + {:value value + :onValueChange #(rf/dispatch [:element/set-attr key %]) + :disabled disabled?} + [:> Select/Trigger + {:class "select-trigger ml-px h-full" + :aria-label (name key) + :style {:background "var(--bg-primary)" + :border-radius 0 + :width "26px" + :height "26px"}} [:> Select/Value ""] [:> Select/Icon [comp/icon "chevron-down" {:class "icon small"}]]]