Skip to content

input-group - update label typography #1363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Sep 20, 2024
Merged

input-group - update label typography #1363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a684ddb
refactor(input-group): update label typography
desig9stein Aug 22, 2024
95191c5
Merge branch 'master' into mpopov/input-label-typography
desig9stein Aug 22, 2024
0ead685
fix(input-group): fix all comment issues
desig9stein Sep 4, 2024
309b847
fix(input-group): fix material floating label
desig9stein Sep 4, 2024
910bcad
Merge branch 'master' into mpopov/input-label-typography
simeonoff Sep 13, 2024
7d48220
fix(input-group): fix bootstrap label margin
desig9stein Sep 15, 2024
654e387
fix(input-group): remove extra space
desig9stein Sep 15, 2024
5595287
Merge branch 'master' into mpopov/input-label-typography
simeonoff Sep 16, 2024
2a1301a
Merge branch 'master' into mpopov/input-label-typography
desig9stein Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/input/themes/input.base.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
}

[part='label'] {
display: inline-block;
display: block;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
Expand Down
8 changes: 6 additions & 2 deletions src/components/input/themes/shared/input.bootstrap.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,13 @@ $theme: $bootstrap;
border-radius: 0;
}

[part~='label'],
[part~='input']::placeholder {
@include type-style('body-1');
}

[part~='label'] {
line-height: rem(24px);
margin-bottom: rem(4px);
margin-block-end: rem(4px);
color: var-get($theme, 'idle-secondary-color');

&:empty {
Expand Down
5 changes: 3 additions & 2 deletions src/components/input/themes/shared/input.fluent.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ $focused-height: calc(var-get($theme, 'size') - #{($focused-border-width * 2)});
}

[part='label'] {
font-size: rem(14px);
font-weight: 600;
@include type-style('subtitle-2');

color: var-get($theme, 'idle-secondary-color');
margin-block-end: rem(5px);
}

[part^='container'] {
Expand Down
1 change: 1 addition & 0 deletions src/components/input/themes/shared/input.indigo.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ $transition-duration: .25s;
@include type-style('caption');

color: var-get($theme, 'idle-secondary-color');
margin-block-end: rem(4px);
}

[part^='container'] {
Expand Down
5 changes: 4 additions & 1 deletion src/components/input/themes/shared/input.material.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ $fs: rem(16px) !default;
--label-position: #{sizable(18px, 22px, 26px)};

transform: translateY(calc(var(--label-position) * -1));
font-size: rem(12px);
}

%floated-styles {
Expand Down Expand Up @@ -45,6 +44,7 @@ $fs: rem(16px) !default;
input:placeholder-shown + [part='notch'] [part='label'],
[part~='filled'] + [part='notch'] [part='label'] {
@extend %label;
@include type-style('caption');
}

[part~='input'] {
Expand All @@ -56,6 +56,8 @@ input:placeholder-shown + [part='notch'] [part='label'],
}

[part='label'] {
@include type-style('subtitle-1');

color: var-get($theme, 'idle-secondary-color');
transition:
transform 150ms cubic-bezier(.4, 0, .2, 1),
Expand Down Expand Up @@ -137,6 +139,7 @@ input:placeholder-shown + [part='notch'] [part='label'],
:host(:focus-within) {
[part='label'] {
@extend %label;
@include type-style('caption');

color: var-get($theme, 'focused-secondary-color');
}
Expand Down