Skip to content

Commit c9d0c69

Browse files
committed
fix textarea tokens
1 parent 3201a19 commit c9d0c69

File tree

3 files changed

+34
-18
lines changed

3 files changed

+34
-18
lines changed

core/src/components/textarea/textarea.common.scss

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@import "./textarea.vars";
1+
@import "../../themes/mixins";
22

33
// Textarea
44
// --------------------------------------------------
@@ -35,10 +35,8 @@
3535
--placeholder-color: initial;
3636
--placeholder-font-style: initial;
3737
--placeholder-font-weight: initial;
38-
--placeholder-opacity: #{$placeholder-opacity};
3938
--padding-top: 0;
4039
--padding-end: 0;
41-
--padding-bottom: #{$textarea-padding-bottom};
4240
--padding-start: 0;
4341
--border-radius: 0;
4442
--border-style: solid;
@@ -400,8 +398,6 @@
400398
*/
401399
@include margin-horizontal(auto, null);
402400

403-
color: $text-color-step-300;
404-
405401
white-space: nowrap;
406402
}
407403

@@ -578,19 +574,6 @@
578574
opacity: 1;
579575
}
580576

581-
/**
582-
* This makes the label sit above the textarea.
583-
*/
584-
:host(.label-floating) .label-text-wrapper {
585-
@include transform(translateY(50%), scale(#{$form-control-label-stacked-scale}));
586-
587-
/**
588-
* Label text should not extend
589-
* beyond the bounds of the textarea.
590-
*/
591-
max-width: calc(100% / #{$form-control-label-stacked-scale});
592-
}
593-
594577
// Start / End Slots
595578
// ----------------------------------------------------------------
596579

core/src/components/textarea/textarea.ionic.scss

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
--placeholder-color: #{globals.$ion-primitives-neutral-800};
1414
--placeholder-opacity: 1;
1515
--background: #{globals.$ion-primitives-base-white};
16+
--padding-bottom: #{globals.$ion-space-200};
1617

1718
@include globals.typography(globals.$ion-body-md-regular);
1819
}
@@ -220,3 +221,18 @@ ion-icon {
220221
:host(.textarea-readonly) {
221222
--background: #{globals.$ion-primitives-neutral-100};
222223
}
224+
225+
/**
226+
* This makes the label sit above the textarea.
227+
*/
228+
:host(.label-floating) .label-text-wrapper {
229+
$form-control-label-stacked-scale: 0.75;
230+
231+
@include globals.transform(translateY(50%), scale(#{$form-control-label-stacked-scale}));
232+
233+
/**
234+
* Label text should not extend
235+
* beyond the bounds of the textarea.
236+
*/
237+
max-width: calc(100% / #{$form-control-label-stacked-scale});
238+
}

core/src/components/textarea/textarea.native.scss

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
@use "../../themes/native/native.globals" as globals;
22
@use "./textarea.common";
3+
@import "./textarea.vars";
34

45
// Textarea - iOS and Material Design
56
// --------------------------------------------------
67

78
:host {
9+
--placeholder-opacity: #{$placeholder-opacity};
10+
--padding-bottom: #{$textarea-padding-bottom};
11+
812
min-height: 44px;
913

1014
font-family: globals.$font-family-base;
@@ -138,3 +142,16 @@
138142
margin-inline-start: globals.$form-control-label-margin;
139143
margin-inline-end: 0;
140144
}
145+
146+
/**
147+
* This makes the label sit above the textarea.
148+
*/
149+
:host(.label-floating) .label-text-wrapper {
150+
@include transform(translateY(50%), scale(#{$form-control-label-stacked-scale}));
151+
152+
/**
153+
* Label text should not extend
154+
* beyond the bounds of the textarea.
155+
*/
156+
max-width: calc(100% / #{$form-control-label-stacked-scale});
157+
}

0 commit comments

Comments
 (0)