3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-26 02:27:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

🔧 Restore some things broken in merge

Browse source
This commit is contained in:
Andrés Moya 2024-12-13 15:01:22 +01:00
parent d70b101aa1
commit 17a873e9f8
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/app/main/ui/ds/controls/input.cljs
View file

@ -19,8 +19,7 @@
[:class {:optional true} :string] [:class {:optional true} :string]
[:icon {:optional true} [:icon {:optional true}
[:and :string [:fn #(contains? icon-list %)]]] [:and :string [:fn #(contains? icon-list %)]]]
[:type {:optional true} :string] [:type {:optional true} :string]])
[:ref {:optional true} some?]])
(mf/defc input* (mf/defc input*
{::mf/props :obj {::mf/props :obj

16
frontend/src/app/main/ui/workspace/tokens/common.scss
View file

@ -6,6 +6,22 @@
@import "refactor/common-refactor.scss"; @import "refactor/common-refactor.scss";
.input {
@extend .input-element;
}
.labeled-input {
@extend .input-element;
.label {
width: auto;
text-wrap: nowrap;
}
}
.labeled-input-error {
border: 1px solid var(--status-color-error-500) !important;
}
.button { .button {
@extend .button-primary; @extend .button-primary;
} }

4
frontend/src/app/main/ui/workspace/tokens/modals/themes.cljs
View file

@ -173,8 +173,6 @@
(set! (.-value (mf/ref-val group-input-ref)) value) (set! (.-value (mf/ref-val group-input-ref)) value)
(on-update-group value)) (on-update-group value))
:on-close on-close-dropdown}]) :on-close on-close-dropdown}])
;; TODO: This span should be remove when labeled-input is updated
[:span {:class (stl/css :labeled-input-label)} "Theme group"]
[:& labeled-input {:label "Group" [:& labeled-input {:label "Group"
:input-props {:ref group-input-ref :input-props {:ref group-input-ref
:default-value (:group theme) :default-value (:group theme)
@ -188,8 +186,6 @@
(on-toggle-dropdown))} (on-toggle-dropdown))}
[:> icon* {:id "arrow-down"}]]))}]] [:> icon* {:id "arrow-down"}]]))}]]
[:div {:class (stl/css :group-input-wrapper)} [:div {:class (stl/css :group-input-wrapper)}
;; TODO: This span should be remove when labeled-input is updated
[:span {:class (stl/css :labeled-input-label)} "Theme"]
[:& labeled-input {:label "Theme" [:& labeled-input {:label "Theme"
:input-props {:default-value (:name theme) :input-props {:default-value (:name theme)
:on-change (comp on-update-name dom/get-target-val)}}]]])) :on-change (comp on-update-name dom/get-target-val)}}]]]))