Merged in fix/height-input-select-fields (pull request #3146)
fix height value for input and select fields * fix height value for input and select fields Approved-by: Joakim Jäderberg
This commit is contained in:
@@ -1,6 +1,3 @@
|
|||||||
@value globals: "../../styles/globals.css";
|
|
||||||
@value inputContainerHeight, inputExpandedHeight from globals;
|
|
||||||
|
|
||||||
.container {
|
.container {
|
||||||
align-content: center;
|
align-content: center;
|
||||||
background-color: var(--Surface-Primary-Default);
|
background-color: var(--Surface-Primary-Default);
|
||||||
@@ -8,7 +5,7 @@
|
|||||||
border-radius: var(--Corner-radius-md);
|
border-radius: var(--Corner-radius-md);
|
||||||
display: grid;
|
display: grid;
|
||||||
min-width: 0; /* allow shrinkage */
|
min-width: 0; /* allow shrinkage */
|
||||||
height: inputContainerHeight;
|
height: 56px;
|
||||||
padding: 0 var(--Space-x15);
|
padding: 0 var(--Space-x15);
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
cursor: text;
|
cursor: text;
|
||||||
@@ -48,7 +45,7 @@
|
|||||||
&:focus,
|
&:focus,
|
||||||
&:placeholder-shown,
|
&:placeholder-shown,
|
||||||
&[value]:not([value='']) {
|
&[value]:not([value='']) {
|
||||||
height: inputExpandedHeight;
|
height: 24px;
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -61,7 +58,7 @@
|
|||||||
|
|
||||||
@media (hover: hover) {
|
@media (hover: hover) {
|
||||||
.input:active:not(:disabled) {
|
.input:active:not(:disabled) {
|
||||||
height: inputExpandedHeight;
|
height: 24px;
|
||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,9 @@
|
|||||||
@value globals: "../../styles/globals.css";
|
|
||||||
@value inputContainerHeight, inputExpandedHeight from globals;
|
|
||||||
|
|
||||||
.select {
|
.select {
|
||||||
position: relative;
|
position: relative;
|
||||||
background-color: var(--Surface-UI-Fill-Default);
|
background-color: var(--Surface-UI-Fill-Default);
|
||||||
border: 1px solid var(--Border-Interactive-Default);
|
border: 1px solid var(--Border-Interactive-Default);
|
||||||
border-radius: var(--Corner-radius-md);
|
border-radius: var(--Corner-radius-md);
|
||||||
height: inputContainerHeight;
|
height: 56px;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
&[data-required] .label::after {
|
&[data-required] .label::after {
|
||||||
@@ -18,7 +15,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.selectedText {
|
.selectedText {
|
||||||
min-height: inputExpandedHeight;
|
min-height: 24px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&[data-focused] {
|
&[data-focused] {
|
||||||
@@ -30,7 +27,7 @@
|
|||||||
outline: none;
|
outline: none;
|
||||||
}
|
}
|
||||||
.input {
|
.input {
|
||||||
min-height: inputExpandedHeight;
|
min-height: 24px;
|
||||||
}
|
}
|
||||||
.label {
|
.label {
|
||||||
color: var(--Text-Interactive-Focus);
|
color: var(--Text-Interactive-Focus);
|
||||||
@@ -98,7 +95,7 @@
|
|||||||
width: 100%;
|
width: 100%;
|
||||||
|
|
||||||
&[value]:not([value='']) {
|
&[value]:not([value='']) {
|
||||||
min-height: inputExpandedHeight;
|
min-height: 24px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -109,7 +106,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.selectedText:not(:empty) {
|
.selectedText:not(:empty) {
|
||||||
min-height: inputExpandedHeight;
|
min-height: 24px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.displayText {
|
.displayText {
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
@import url(./styles/globals.css);
|
|
||||||
@import url(./styles/impl.css);
|
@import url(./styles/impl.css);
|
||||||
@import url(./styles/base.css);
|
@import url(./styles/base.css);
|
||||||
@import url(./styles/downtown-camper.css);
|
@import url(./styles/downtown-camper.css);
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
@value inputContainerHeight: 56px;
|
|
||||||
@value inputExpandedHeight: 24px;
|
|
||||||
Reference in New Issue
Block a user