Skip to content

Commit d3c2c4c

Browse files
authored
Merge branch 'master' into mpopov/fix/combo/notch-styles
2 parents 6af54ba + 765305d commit d3c2c4c

File tree

5 files changed

+23
-19
lines changed

5 files changed

+23
-19
lines changed

src/components/checkbox/themes/shared/checkbox/checkbox.material.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,16 @@ $theme: $material;
5555
[part~='base'] {
5656
gap: rem(2px);
5757

58+
[part~='control'] {
59+
&::before {
60+
opacity: .06;
61+
}
62+
}
63+
5864
&:hover {
5965
[part~='control'] {
6066
&::before {
6167
background: var-get($theme, 'empty-color');
62-
opacity: .06;
6368
}
6469
}
6570
}
@@ -70,7 +75,6 @@ $theme: $material;
7075
[part~='control'] {
7176
&::before {
7277
background: var-get($theme, 'fill-color-hover');
73-
opacity: .06;
7478
}
7579
}
7680
}

src/components/checkbox/themes/shared/switch/switch.material.scss

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,22 @@ $ripple-radius: calc(#{$ripple-size} / 2);
1414
}
1515

1616
[part~='base'] {
17+
[part~='thumb'] {
18+
&::after {
19+
opacity: .06;
20+
}
21+
}
22+
1723
&:hover {
1824
[part~='thumb'] {
1925
&::after {
2026
background: color(gray, 600);
21-
opacity: .06;
2227
}
2328
}
2429

2530
[part~='thumb'][part~='checked'] {
2631
&::after {
2732
background: var-get($theme, 'thumb-on-color');
28-
opacity: .06;
2933
}
3034
}
3135

src/components/navbar/themes/shared/navbar.bootstrap.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,6 @@ $theme: $bootstrap;
55

66
:host {
77
box-shadow: var(--ig-elevation-0);
8-
padding: 0 pad-inline(rem(8px));
9-
}
10-
11-
[part='base'] {
12-
padding-inline: pad-inline(rem(4px));
138
}
149

1510
::slotted(*) {

src/components/navbar/themes/shared/navbar.indigo.scss

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,11 @@
88
[name='end']::slotted(*) {
99
margin: initial;
1010
}
11+
12+
::slotted(igc-icon),
13+
::slotted(igc-avatar) {
14+
--ig-size: 2;
15+
}
1116
}
1217

1318
[part='end'] {
@@ -23,12 +28,6 @@
2328
}
2429

2530
::slotted(igc-icon) {
26-
--size: rem(16px);
27-
2831
padding: pad(rem(6px));
2932
margin: 0;
3033
}
31-
32-
::slotted(igc-avatar) {
33-
--ig-size: 2;
34-
}

src/components/select/themes/shared/select.material.scss

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@ $active-border-width: rem(2px) !default;
2727
}
2828
}
2929

30+
:host([outlined]:focus-within) {
31+
[part~='toggle-icon'] {
32+
background: var-get($theme, 'toggle-button-background-focus--border');
33+
}
34+
}
35+
3036
:host(:not(:state(ig-invalid))[outlined]:focus-within) {
3137
igc-input[readonly]:not([disabled])::part(start) {
3238
border: {
@@ -71,10 +77,6 @@ $active-border-width: rem(2px) !default;
7177
igc-input[readonly]:not([disabled])::part(label) {
7278
color: $active-color;
7379
}
74-
75-
[part~='toggle-icon'] {
76-
background: var-get($theme, 'toggle-button-background-focus--border');
77-
}
7880
}
7981

8082
:host(:not(:state(ig-invalid),[outlined]):focus-within) {

0 commit comments

Comments
 (0)