Skip to content
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

Jump to bottom

fix(TextInput): fix control line height #1477

Merged
merged 2 commits into from
Apr 3, 2024
Merged

fix(TextInput): fix control line height #1477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be84974
fix(TextInput): fix control line height
korvin89 Apr 2, 2024
2f409e6
Merge branch 'main' into fix-input-selection-styles
korvin89 Apr 3, 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
65 changes: 8 additions & 57 deletions src/components/controls/TextInput/TextInput.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,82 +7,33 @@
@if $size == 's' {
@include mixins.text-body-short;

line-height: calc(
#{variables.$s-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
padding-block: 3px;
padding-inline: 8px 4px;
}

@if $size == 'm' {
@include mixins.text-body-short;

line-height: calc(
#{variables.$m-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
padding-block: 5px;
padding-inline: 8px 4px;
}

@if $size == 'l' {
@include mixins.text-body-short;

line-height: calc(
#{variables.$l-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
padding-block: 9px;
padding-inline: 12px 4px;
}

@if $size == 'xl' {
@include mixins.text-body-2;

line-height: calc(
#{variables.$xl-height} - var(
--g-text-input-border-width,
#{control-variables.$border-width}
) *
2
);
padding-block: 0;
padding-block: 11px;
padding-inline: 12px 4px;
}

@include mixins.text-accent;
}
// We use this mixin to correct the positioning of the text inside the input
// See https://github.com/gravity-ui/uikit/issues/975

@mixin input-control($size) {
@include control-mixins.input-control($size);
@if $size == 's' {
line-height: #{variables.$s-height - control-variables.$border-width * 2};
}

@if $size == 'm' {
line-height: #{variables.$m-height - control-variables.$border-width * 2};
}

@if $size == 'l' {
line-height: #{variables.$l-height - control-variables.$border-width * 2};
}

@if $size == 'xl' {
line-height: #{variables.$xl-height - control-variables.$border-width * 2};
}
}

$block: '.#{variables.$ns}text-input';

Expand Down Expand Up @@ -196,7 +147,7 @@ $block: '.#{variables.$ns}text-input';
&_size {
&_s {
#{$block}__control {
@include input-control(s);
@include control-mixins.input-control(s);
}

#{$block}__label {
Expand Down Expand Up @@ -227,7 +178,7 @@ $block: '.#{variables.$ns}text-input';

&_m {
#{$block}__control {
@include input-control(m);
@include control-mixins.input-control(m);
}

#{$block}__label {
Expand Down Expand Up @@ -258,7 +209,7 @@ $block: '.#{variables.$ns}text-input';

&_l {
#{$block}__control {
@include input-control(l);
@include control-mixins.input-control(l);
}

#{$block}__label {
Expand Down Expand Up @@ -289,7 +240,7 @@ $block: '.#{variables.$ns}text-input';

&_xl {
#{$block}__control {
@include input-control(xl);
@include control-mixins.input-control(xl);
}

#{$block}__label {
Expand Down
Loading