Skip to content

Commit 23ed8cb

Browse files
committed
fix(@clayui/css): Form Validation use clay-form-control-variant to style Danger, Warning, Success readonly inputs instead of clay-button-variant
fix(@clayui/css): Atlas Form Validation readonly inputs should use newer Sass map keys
1 parent c23c8f5 commit 23ed8cb

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

packages/clay-css/src/scss/atlas/variables/_forms.scss

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,13 +196,15 @@ $input-danger: map-deep-merge(
196196
$input-danger-readonly: () !default;
197197
$input-danger-readonly: map-deep-merge(
198198
(
199-
bg:
199+
background-color:
200200
setter(
201201
map-get($input-readonly, bg),
202202
map-get($input-readonly, background-color)
203203
),
204204
border-color: map-get($input-readonly, border-color),
205-
focus-border-color: $input-focus-border-color,
205+
focus: (
206+
border-color: $input-focus-border-color,
207+
),
206208
),
207209
$input-danger-readonly
208210
);
@@ -254,13 +256,15 @@ $input-warning: map-deep-merge(
254256
$input-warning-readonly: () !default;
255257
$input-warning-readonly: map-deep-merge(
256258
(
257-
bg:
259+
background-color:
258260
setter(
259261
map-get($input-readonly, bg),
260262
map-get($input-readonly, background-color)
261263
),
262264
border-color: map-get($input-readonly, border-color),
263-
focus-border-color: $input-focus-border-color,
265+
focus: (
266+
border-color: $input-focus-border-color,
267+
),
264268
),
265269
$input-warning-readonly
266270
);
@@ -312,13 +316,15 @@ $input-success: map-deep-merge(
312316
$input-success-readonly: () !default;
313317
$input-success-readonly: map-deep-merge(
314318
(
315-
bg:
319+
background-color:
316320
setter(
317321
map-get($input-readonly, bg),
318322
map-get($input-readonly, background-color)
319323
),
320324
border-color: map-get($input-readonly, border-color),
321-
focus-border-color: $input-focus-border-color,
325+
focus: (
326+
border-color: $input-focus-border-color,
327+
),
322328
),
323329
$input-success-readonly
324330
);

packages/clay-css/src/scss/components/_form-validation.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
}
104104

105105
.form-control[readonly] {
106-
@include clay-button-variant($input-danger-readonly);
106+
@include clay-form-control-variant($input-danger-readonly);
107107
}
108108

109109
.form-feedback-item {
@@ -180,7 +180,7 @@
180180
}
181181

182182
.form-control[readonly] {
183-
@include clay-button-variant($input-warning-readonly);
183+
@include clay-form-control-variant($input-warning-readonly);
184184
}
185185

186186
.form-feedback-item {
@@ -257,7 +257,7 @@
257257
}
258258

259259
.form-control[readonly] {
260-
@include clay-button-variant($input-success-readonly);
260+
@include clay-form-control-variant($input-success-readonly);
261261
}
262262

263263
.form-feedback-item {

packages/clay-css/src/scss/variables/_forms.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -575,6 +575,8 @@ $input-danger: map-deep-merge(
575575
$input-danger
576576
);
577577

578+
// .has-error .form-control[readonly]
579+
578580
$input-danger-readonly: () !default;
579581

580582
$input-danger-checkbox-label-color: $form-feedback-invalid-color !default;

0 commit comments

Comments
 (0)