Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

Commit da48b6c

Browse files
EladBezalelThomasBurleson
authored andcommitted
fix(components): wrong use of accent and primary colors
- Accent colors was 600, should be from the accent palette A700 - ripple accent color was 600, should be from the accent palette A700 - Accent color was 500 and not default (A400) as should be - In case the user changed the default color, primary color was 500 and not deafult as should be - Accent colors was 100, should be from the accent palette A100 - ripple accent color was 600, should be from the accent palette A700 - Accent color was 500 and not default (A400) as should be - hover accent color was 600, should be from the accent palette A700 - focus accent color was 200, should be from the accent palette A200 - Accent colors was 100, should be from the accent palette A100 - Accent color was A200 and not default (A400) as should be fixed #7879 Closes #7890
1 parent a3f63cb commit da48b6c

File tree

9 files changed

+32
-30
lines changed

9 files changed

+32
-30
lines changed

src/components/button/button-theme.scss

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
}
2121
&:not([disabled]) {
2222
&:hover {
23-
background-color: '{{accent-600}}';
23+
background-color: '{{accent-A700}}';
2424
}
2525
&.md-focused {
26-
background-color: '{{accent-600}}';
26+
background-color: '{{accent-A700}}';
2727
}
2828
}
2929
}
@@ -60,10 +60,10 @@
6060
color: '{{accent-contrast}}';
6161
}
6262
&:hover {
63-
background-color: '{{accent-600}}';
63+
background-color: '{{accent-A700}}';
6464
}
6565
&.md-focused {
66-
background-color: '{{accent-600}}';
66+
background-color: '{{accent-A700}}';
6767
}
6868
}
6969
}
@@ -121,10 +121,10 @@
121121
color: '{{accent-contrast}}';
122122
}
123123
&:hover {
124-
background-color: '{{accent-600}}';
124+
background-color: '{{accent-A700}}';
125125
}
126126
&.md-focused {
127-
background-color: '{{accent-600}}';
127+
background-color: '{{accent-A700}}';
128128
}
129129
}
130130
}
@@ -157,12 +157,6 @@
157157
}
158158

159159
a.md-THEME_NAME-theme:not(.md-button) {
160-
color: '{{accent-color}}';
161-
162-
&:hover {
163-
color: '{{accent-700}}';
164-
}
165-
166160
&.md-primary {
167161
color: '{{primary-color}}';
168162

@@ -171,6 +165,14 @@ a.md-THEME_NAME-theme:not(.md-button) {
171165
}
172166
}
173167

168+
&.md-accent {
169+
color: '{{accent-color}}';
170+
171+
&:hover {
172+
color: '{{accent-A700}}';
173+
}
174+
}
175+
174176
&.md-warn {
175177
color: '{{warn-color}}';
176178

src/components/checkbox/checkbox-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
md-checkbox.md-THEME_NAME-theme {
22
.md-ripple {
3-
color: '{{accent-600}}';
3+
color: '{{accent-A700}}';
44
}
55

66
&.md-checked .md-ripple {

src/components/input/input-theme.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,20 +37,20 @@ md-input-container.md-THEME_NAME-theme {
3737
}
3838
&.md-input-focused {
3939
.md-input {
40-
border-color: '{{primary-500}}';
40+
border-color: '{{primary-color}}';
4141
}
4242
label {
43-
color: '{{primary-500}}';
43+
color: '{{primary-color}}';
4444
}
4545
md-icon {
46-
color: '{{primary-500}}';
46+
color: '{{primary-color}}';
4747
}
4848
&.md-accent {
4949
.md-input {
50-
border-color: '{{accent-500}}';
50+
border-color: '{{accent-color}}';
5151
}
5252
label {
53-
color: '{{accent-500}}';
53+
color: '{{accent-color}}';
5454
}
5555
}
5656
&.md-warn {

src/components/progressLinear/progress-linear-theme.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ md-progress-linear.md-THEME_NAME-theme {
1919

2020
&.md-accent {
2121
._md-container {
22-
background-color: '{{accent-100}}';
22+
background-color: '{{accent-A100}}';
2323
}
2424

2525
._md-bar {
@@ -38,10 +38,10 @@ md-progress-linear.md-THEME_NAME-theme {
3838
}
3939
&.md-accent {
4040
._md-bar1 {
41-
background-color: '{{accent-100}}';
41+
background-color: '{{accent-A100}}';
4242
}
4343
._md-dashed:before {
44-
background: radial-gradient('{{accent-100}}' 0%, '{{accent-100}}' 16%, transparent 42%);
44+
background: radial-gradient('{{accent-A100}}' 0%, '{{accent-A100}}' 16%, transparent 42%);
4545
}
4646
}
4747
}

src/components/radioButton/radio-button-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ md-radio-button.md-THEME_NAME-theme {
1414
color: '{{accent-color-0.87}}';
1515
}
1616
._md-container .md-ripple {
17-
color: '{{accent-600}}';
17+
color: '{{accent-A700}}';
1818
}
1919
}
2020

src/components/select/select-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@ md-select-menu.md-THEME_NAME-theme {
7171
color: '{{primary-600}}';
7272
}
7373
&.md-accent {
74-
color: '{{accent-500}}';
74+
color: '{{accent-color}}';
7575
&:focus {
76-
color: '{{accent-600}}';
76+
color: '{{accent-A700}}';
7777
}
7878
}
7979
}

src/components/slider/slider-theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ md-slider.md-THEME_NAME-theme {
77
color: '{{background-contrast}}';
88
}
99
._md-focus-ring {
10-
background-color: '{{accent-200-0.38}}';
10+
background-color: '{{accent-A200-0.2}}';
1111
}
1212
._md-disabled-thumb {
1313
border-color: '{{background-color}}';

src/components/tabs/tabs-theme.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
> md-tabs-canvas {
4545
> md-pagination-wrapper {
4646
> md-tab-item:not([disabled]) {
47-
color: '{{accent-100}}';
47+
color: '{{accent-A100}}';
4848
&.md-active, &.md-focused {
4949
&, md-icon {
5050
color: '{{accent-contrast}}';
@@ -93,7 +93,7 @@ md-tabs.md-THEME_NAME-theme {
9393
background: '{{primary-color-0.1}}';
9494
}
9595
.md-ripple-container {
96-
color: '{{accent-100}}';
96+
color: '{{accent-A100}}';
9797
}
9898
}
9999

src/components/toast/toast-theme.scss

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ md-toast.md-THEME_NAME-theme {
99

1010
&.md-highlight {
1111
// By default the toast should use the accent color as the primary highlight color
12-
color: '{{accent-A200}}';
12+
color: '{{accent-color}}';
1313

1414
&.md-primary {
15-
color: '{{primary-A200}}';
15+
color: '{{primary-color}}';
1616
}
1717

1818
&.md-warn {
19-
color: '{{warn-A200}}';
19+
color: '{{warn-color}}';
2020
}
2121
}
2222
}

0 commit comments

Comments
 (0)