From c1cae0db4058db7a9bc2989a2eae884c9f6df812 Mon Sep 17 00:00:00 2001 From: Bianca Widstam Date: Thu, 13 Nov 2025 10:26:58 +0000 Subject: [PATCH] Merged in fix/height-input-select-fields (pull request #3146) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fix height value for input and select fields * fix height value for input and select fields Approved-by: Joakim Jäderberg --- .../lib/components/Input/input.module.css | 9 +++------ .../lib/components/Select/select.module.css | 13 +++++-------- packages/design-system/lib/style.css | 1 - packages/design-system/lib/styles/globals.css | 2 -- 4 files changed, 8 insertions(+), 17 deletions(-) delete mode 100644 packages/design-system/lib/styles/globals.css diff --git a/packages/design-system/lib/components/Input/input.module.css b/packages/design-system/lib/components/Input/input.module.css index ccb67c3b6..9c31f3afa 100644 --- a/packages/design-system/lib/components/Input/input.module.css +++ b/packages/design-system/lib/components/Input/input.module.css @@ -1,6 +1,3 @@ -@value globals: "../../styles/globals.css"; -@value inputContainerHeight, inputExpandedHeight from globals; - .container { align-content: center; background-color: var(--Surface-Primary-Default); @@ -8,7 +5,7 @@ border-radius: var(--Corner-radius-md); display: grid; min-width: 0; /* allow shrinkage */ - height: inputContainerHeight; + height: 56px; padding: 0 var(--Space-x15); box-sizing: border-box; cursor: text; @@ -48,7 +45,7 @@ &:focus, &:placeholder-shown, &[value]:not([value='']) { - height: inputExpandedHeight; + height: 24px; outline: none; } @@ -61,7 +58,7 @@ @media (hover: hover) { .input:active:not(:disabled) { - height: inputExpandedHeight; + height: 24px; outline: none; } } diff --git a/packages/design-system/lib/components/Select/select.module.css b/packages/design-system/lib/components/Select/select.module.css index 865c01e9a..cdeabd176 100644 --- a/packages/design-system/lib/components/Select/select.module.css +++ b/packages/design-system/lib/components/Select/select.module.css @@ -1,12 +1,9 @@ -@value globals: "../../styles/globals.css"; -@value inputContainerHeight, inputExpandedHeight from globals; - .select { position: relative; background-color: var(--Surface-UI-Fill-Default); border: 1px solid var(--Border-Interactive-Default); border-radius: var(--Corner-radius-md); - height: inputContainerHeight; + height: 56px; box-sizing: border-box; &[data-required] .label::after { @@ -18,7 +15,7 @@ } .selectedText { - min-height: inputExpandedHeight; + min-height: 24px; } } &[data-focused] { @@ -30,7 +27,7 @@ outline: none; } .input { - min-height: inputExpandedHeight; + min-height: 24px; } .label { color: var(--Text-Interactive-Focus); @@ -98,7 +95,7 @@ width: 100%; &[value]:not([value='']) { - min-height: inputExpandedHeight; + min-height: 24px; } } @@ -109,7 +106,7 @@ } .selectedText:not(:empty) { - min-height: inputExpandedHeight; + min-height: 24px; } .displayText { diff --git a/packages/design-system/lib/style.css b/packages/design-system/lib/style.css index 7eec9f6cb..0991f7b29 100644 --- a/packages/design-system/lib/style.css +++ b/packages/design-system/lib/style.css @@ -1,4 +1,3 @@ -@import url(./styles/globals.css); @import url(./styles/impl.css); @import url(./styles/base.css); @import url(./styles/downtown-camper.css); diff --git a/packages/design-system/lib/styles/globals.css b/packages/design-system/lib/styles/globals.css deleted file mode 100644 index 94c9903ab..000000000 --- a/packages/design-system/lib/styles/globals.css +++ /dev/null @@ -1,2 +0,0 @@ -@value inputContainerHeight: 56px; -@value inputExpandedHeight: 24px;