Skip to content

Commit c7c270a

Browse files
Merge branch 'next' into ROU-11438
2 parents 60cd0fd + b7da1e8 commit c7c270a

File tree

45 files changed

+71
-43
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+71
-43
lines changed

core/src/components/select/select.ionic.outline.scss

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,3 +50,23 @@
5050

5151
box-sizing: border-box;
5252
}
53+
54+
// Focus
55+
// ---------------------------------------------
56+
57+
:host(.ion-focused.select-fill-outline) {
58+
--border-color: var(--highlight-color);
59+
}
60+
61+
:host(.ion-focused.select-fill-outline:not(.ion-invalid):not(.ion-valid)) {
62+
--border-width: #{globals.$ion-border-size-050};
63+
}
64+
65+
/**
66+
* If the select has a validity state, the
67+
* border should reflect that as a color.
68+
*/
69+
:host(.has-focus.select-fill-outline.ion-valid),
70+
:host(.select-fill-outline.ion-touched.ion-invalid) {
71+
--border-color: var(--highlight-color);
72+
}

core/src/components/select/select.ionic.scss

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
--background: #{globals.$ion-primitives-base-white};
1010
// TODO(ROU-10778, ROU-10875): Sync the color names to the design system of
1111
// ios and md. This will allow us to have a single color map.
12-
--border-color: #{globals.current-color(neutral)};
12+
--border-color: #{globals.$ion-primitives-neutral-500};
1313
--border-width: #{globals.$ion-border-size-025};
1414
--padding-start: #{globals.$ion-space-400};
1515
--padding-end: #{globals.$ion-space-400};
1616
--padding-top: #{globals.$ion-space-300};
1717
--padding-bottom: #{globals.$ion-space-300};
1818
--placeholder-color: #{globals.$ion-primitives-neutral-800};
1919
--placeholder-opacity: 1;
20+
--highlight-color-focused: #{globals.$ion-border-focus-default};
21+
--highlight-color-valid: #{globals.$ion-semantics-success-900};
22+
--highlight-color-invalid: #{globals.$ion-semantics-danger-800};
2023
}
2124

2225
// Select Label
-50 Bytes
-17 Bytes
-63 Bytes
-62 Bytes
-44 Bytes
-56 Bytes

0 commit comments

Comments
 (0)