Skip to content

Commit ef118bf

Browse files
committed
fix(form): TextArea disabled styles
The placeholder text was still appearing for TextArea due to missing some of the base text field styles. Since the code for the floating state is the same between TextField and TextArea, the `&--floating` state was moved to the `@mixin rmd-text-field-base`
1 parent e8f2c57 commit ef118bf

File tree

1 file changed

+15
-28
lines changed

1 file changed

+15
-28
lines changed

packages/form/src/text-field/_mixins.scss

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -246,21 +246,6 @@
246246
@include rmd-theme(color, text-disabled-on-background);
247247
}
248248
}
249-
}
250-
251-
/// @access private
252-
@mixin rmd-text-field {
253-
@include rmd-utils-rtl {
254-
@include rmd-form-theme(padding-left, text-padding-right);
255-
@include rmd-form-theme(padding-right, text-padding-left);
256-
}
257-
@include rmd-form-theme(padding-left, text-padding-left);
258-
@include rmd-form-theme(padding-right, text-padding-right);
259-
@include rmd-form-theme(padding-top, text-padding-top);
260-
@include rmd-text-field-base;
261-
262-
flex: 1 1 auto;
263-
height: 100%;
264249

265250
&--floating {
266251
@include rmd-text-field-placeholder {
@@ -282,6 +267,21 @@
282267
}
283268
}
284269

270+
/// @access private
271+
@mixin rmd-text-field {
272+
@include rmd-utils-rtl {
273+
@include rmd-form-theme(padding-left, text-padding-right);
274+
@include rmd-form-theme(padding-right, text-padding-left);
275+
}
276+
@include rmd-form-theme(padding-left, text-padding-left);
277+
@include rmd-form-theme(padding-right, text-padding-right);
278+
@include rmd-form-theme(padding-top, text-padding-top);
279+
@include rmd-text-field-base;
280+
281+
flex: 1 1 auto;
282+
height: 100%;
283+
}
284+
285285
/// @access private
286286
@mixin rmd-text-field-addon {
287287
@include rmd-icon-theme(height, size);
@@ -354,19 +354,6 @@
354354
flex: 1 1 auto;
355355
height: 100%;
356356

357-
&--floating {
358-
@include rmd-text-field-placeholder {
359-
color: transparent;
360-
transition: color $rmd-transition-standard-time;
361-
}
362-
363-
&:focus {
364-
@include rmd-text-field-placeholder {
365-
@include rmd-theme(color, text-secondary-on-background);
366-
}
367-
}
368-
}
369-
370357
&--rh {
371358
resize: horizontal;
372359
}

0 commit comments

Comments
 (0)