Skip to content
This repository was archived by the owner on Jan 13, 2025. It is now read-only.

Commit 397905b

Browse files
allan-chenallan-chen
authored
fix(switch): set track border to be transparent (#5323)
1 parent 878a08b commit 397905b

File tree

2 files changed

+17
-14
lines changed

2 files changed

+17
-14
lines changed

‎packages/mdc-switch/_mixins.scss‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@
146146
&.mdc-switch--checked .mdc-switch__track {
147147
@include mdc-feature-targets($feat-color) {
148148
@include mdc-theme-prop(background-color, $color);
149-
@include mdc-theme-prop(border-color, $color);
150149
}
151150
}
152151
}
@@ -174,7 +173,6 @@
174173
&:not(.mdc-switch--checked) .mdc-switch__track {
175174
@include mdc-feature-targets($feat-color) {
176175
@include mdc-theme-prop(background-color, $color);
177-
@include mdc-theme-prop(border-color, $color);
178176
}
179177
}
180178
}
@@ -272,6 +270,7 @@
272270
@mixin mdc-switch__track_($query: mdc-feature-all()) {
273271
$feat-animation: mdc-feature-create-target($query, animation);
274272
$feat-structure: mdc-feature-create-target($query, structure);
273+
$feat-color: mdc-feature-create-target($query, color);
275274

276275
@include mdc-feature-targets($feat-structure) {
277276
box-sizing: border-box;
@@ -288,6 +287,10 @@
288287
mdc-switch-transition(background-color),
289288
mdc-switch-transition(border-color);
290289
}
290+
291+
@include mdc-feature-targets($feat-color) {
292+
@include mdc-theme-prop(border-color, transparent);
293+
}
291294
}
292295

293296
@mixin mdc-switch__thumb-underlay_($query: mdc-feature-all()) {

‎test/screenshot/golden.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,35 +1232,35 @@
12321232
}
12331233
},
12341234
"spec/mdc-switch/classes/baseline.html": {
1235-
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/09/10/17_42_51_602/spec/mdc-switch/classes/baseline.html?utm_source=golden_json",
1235+
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/classes/baseline.html?utm_source=golden_json",
12361236
"screenshots": {
12371237
"desktop_windows_chrome@77": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/09/03/21_25_57_424/spec/mdc-switch/classes/baseline.html.windows_chrome_68.png",
1238-
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/09/10/17_42_51_602/spec/mdc-switch/classes/baseline.html.windows_firefox_62.png",
1239-
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/09/03/21_25_57_424/spec/mdc-switch/classes/baseline.html.windows_ie_11.png"
1238+
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/classes/baseline.html.windows_firefox_69.png",
1239+
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/classes/baseline.html.windows_ie_11.png"
12401240
}
12411241
},
12421242
"spec/mdc-switch/mixins/density.html": {
1243-
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/24/18_29_48_641/spec/mdc-switch/mixins/density.html?utm_source=golden_json",
1243+
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/density.html?utm_source=golden_json",
12441244
"screenshots": {
12451245
"desktop_windows_chrome@77": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/24/18_29_48_641/spec/mdc-switch/mixins/density.html.windows_chrome_76.png",
1246-
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/24/18_29_48_641/spec/mdc-switch/mixins/density.html.windows_firefox_69.png",
1247-
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/09/24/18_29_48_641/spec/mdc-switch/mixins/density.html.windows_ie_11.png"
1246+
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/density.html.windows_firefox_69.png",
1247+
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/density.html.windows_ie_11.png"
12481248
}
12491249
},
12501250
"spec/mdc-switch/mixins/thumb-color.html": {
1251-
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/09/10/17_42_51_602/spec/mdc-switch/mixins/thumb-color.html?utm_source=golden_json",
1251+
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/thumb-color.html?utm_source=golden_json",
12521252
"screenshots": {
12531253
"desktop_windows_chrome@77": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/09/03/21_25_57_424/spec/mdc-switch/mixins/thumb-color.html.windows_chrome_68.png",
1254-
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/09/10/17_42_51_602/spec/mdc-switch/mixins/thumb-color.html.windows_firefox_62.png",
1255-
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/09/03/21_25_57_424/spec/mdc-switch/mixins/thumb-color.html.windows_ie_11.png"
1254+
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/thumb-color.html.windows_firefox_69.png",
1255+
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/thumb-color.html.windows_ie_11.png"
12561256
}
12571257
},
12581258
"spec/mdc-switch/mixins/track-color.html": {
1259-
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/03/18_19_22_511/spec/mdc-switch/mixins/track-color.html?utm_source=golden_json",
1259+
"public_url": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/track-color.html?utm_source=golden_json",
12601260
"screenshots": {
12611261
"desktop_windows_chrome@77": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2019/05/03/18_19_22_511/spec/mdc-switch/mixins/track-color.html.windows_chrome_74.png",
1262-
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/travis/2018/09/10/17_42_51_602/spec/mdc-switch/mixins/track-color.html.windows_firefox_62.png",
1263-
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/advorak/2018/09/03/21_25_57_424/spec/mdc-switch/mixins/track-color.html.windows_ie_11.png"
1262+
"desktop_windows_firefox@69": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/track-color.html.windows_firefox_69.png",
1263+
"desktop_windows_ie@11": "https://storage.googleapis.com/mdc-web-screenshot-tests/allanchen/2019/12/11/23_59_41_879/spec/mdc-switch/mixins/track-color.html.windows_ie_11.png"
12641264
}
12651265
},
12661266
"spec/mdc-tab-bar/classes/baseline.html": {

0 commit comments

Comments
 (0)