fix: set input font-size

gravity-ui · Jan 9, 2024 · 38d8fa5 · 38d8fa5
1 parent 02aff05
commit 38d8fa5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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;
+    }
 }