From 38d8fa54194fbb068be42ee6b4b982e1263a0893 Mon Sep 17 00:00:00 2001 From: Alexey Sudilovskiy Date: Tue, 9 Jan 2024 17:32:30 +0100 Subject: [PATCH] fix: set input font-size --- src/components/controls/TextArea/TextArea.scss | 8 ++++---- src/components/controls/TextInput/TextInput.scss | 8 ++++---- src/components/controls/mixins.scss | 6 +++++- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/components/controls/TextArea/TextArea.scss b/src/components/controls/TextArea/TextArea.scss index 6622ee5bbe..5a0e3906e6 100644 --- a/src/components/controls/TextArea/TextArea.scss +++ b/src/components/controls/TextArea/TextArea.scss @@ -69,7 +69,7 @@ $block: '.#{variables.$ns-new}text-area'; &_size { &_s { #{$block}__control { - @include control-mixins.input-control(s); + @include control-mixins.input-control(s, $block); } &#{$block}_has-clear #{$block}__control { @@ -81,7 +81,7 @@ $block: '.#{variables.$ns-new}text-area'; &_m { #{$block}__control { - @include control-mixins.input-control(m); + @include control-mixins.input-control(m, $block); } &#{$block}_has-clear #{$block}__control { @@ -93,7 +93,7 @@ $block: '.#{variables.$ns-new}text-area'; &_l { #{$block}__control { - @include control-mixins.input-control(l); + @include control-mixins.input-control(l, $block); } &#{$block}_has-clear #{$block}__control { @@ -105,7 +105,7 @@ $block: '.#{variables.$ns-new}text-area'; &_xl { #{$block}__control { - @include control-mixins.input-control(xl); + @include control-mixins.input-control(xl, $block); } &#{$block}_has-clear #{$block}__control { diff --git a/src/components/controls/TextInput/TextInput.scss b/src/components/controls/TextInput/TextInput.scss index 2533d8f37d..49388fcd48 100644 --- a/src/components/controls/TextInput/TextInput.scss +++ b/src/components/controls/TextInput/TextInput.scss @@ -109,7 +109,7 @@ $block: '.#{variables.$ns}text-input'; &_size { &_s { #{$block}__control { - @include control-mixins.input-control(s); + @include control-mixins.input-control(s, $block); } #{$block}__label { @@ -139,7 +139,7 @@ $block: '.#{variables.$ns}text-input'; &_m { #{$block}__control { - @include control-mixins.input-control(m); + @include control-mixins.input-control(m, $block); } #{$block}__label { @@ -169,7 +169,7 @@ $block: '.#{variables.$ns}text-input'; &_l { #{$block}__control { - @include control-mixins.input-control(l); + @include control-mixins.input-control(l, $block); } #{$block}__label { @@ -199,7 +199,7 @@ $block: '.#{variables.$ns}text-input'; &_xl { #{$block}__control { - @include control-mixins.input-control(xl); + @include control-mixins.input-control(xl, $block); } #{$block}__label { diff --git a/src/components/controls/mixins.scss b/src/components/controls/mixins.scss index 4710dbc5c5..32c2109193 100644 --- a/src/components/controls/mixins.scss +++ b/src/components/controls/mixins.scss @@ -2,7 +2,7 @@ @use '../variables.scss'; @use './variables.scss' as control-variables; -@mixin input-control($size) { +@mixin input-control($size, $block) { @if $size == 's' { @include mixins.text-body-short; @@ -27,4 +27,8 @@ height: #{variables.$xl-height - control-variables.$border-width * 2}; padding: 11px 12px; } + + @at-root #{$block}_mobile#{&} { + font-size: control-variables.$mobile-safari-font-size; + } }