Skip to content

Commit c178afd

Browse files
committed
TMS-1164: Color theme button hovers
1 parent bcd16ca commit c178afd

File tree

4 files changed

+52
-27
lines changed

4 files changed

+52
-27
lines changed

assets/styles/helpers/_button.scss

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,10 +296,7 @@ $button-transition-speed: $speed !default;
296296
&.is-outlined {
297297
&,
298298
&:active,
299-
&.is-active {
300-
@include button_colors(transparent, $btn-pair-primary, $btn-pair-primary);
301-
}
302-
299+
&.is-active,
303300
&:hover,
304301
&:focus,
305302
&.is-hovered {
@@ -327,10 +324,7 @@ $button-transition-speed: $speed !default;
327324
&.is-inverted {
328325
&,
329326
&:active,
330-
&.is-active {
331-
@include button_colors($btn-pair-primary-invert, $btn-pair-primary-text, $btn-pair-primary-invert);
332-
}
333-
327+
&.is-active,
334328
&:hover,
335329
&.is-hovered,
336330
&:focus,

assets/styles/themes/_theme-haive-overrides.scss

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,16 @@
4343
.language-nav {
4444
.dropdown-trigger {
4545
.button {
46-
color: $black !important;
47-
border-color: $black !important;
46+
&,
47+
&:hover,
48+
&:focus,
49+
&:active {
50+
color: $black !important;
51+
border-color: $black !important;
4852

49-
.icon {
50-
fill: $black !important;
53+
.icon {
54+
fill: $black !important;
55+
}
5156
}
5257
}
5358
}

assets/styles/themes/_theme-kokemus-overrides.scss

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,16 @@
3535
.language-nav {
3636
.dropdown-trigger {
3737
.button {
38-
color: $black !important;
39-
border-color: $black !important;
38+
&,
39+
&:hover,
40+
&:focus,
41+
&:active {
42+
color: $black !important;
43+
border-color: $black !important;
4044

41-
.icon {
42-
fill: $black !important;
45+
.icon {
46+
fill: $black !important;
47+
}
4348
}
4449
}
4550
}
@@ -215,8 +220,13 @@
215220
}
216221

217222
.button.is-primary {
218-
color: $black !important;
219-
border-color: $black !important;
223+
&,
224+
&:hover,
225+
&:focus,
226+
&:active {
227+
color: $black !important;
228+
border-color: $black !important;
229+
}
220230
}
221231
}
222232

assets/styles/themes/_theme-paahde-overrides.scss

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,23 @@
22
* Copyright (c) 2021. Geniem Oy
33
*/
44

5-
.button {
6-
color: $black !important;
7-
border-color: $black !important;
5+
// Use a low-level selector for easier overriding
6+
.site-header,
7+
.main-content,
8+
.site-footer {
9+
.button {
10+
&,
11+
&#js-back-to-top,
12+
&:hover,
13+
&:focus,
14+
&:active {
15+
color: $black !important;
16+
border-color: $black !important;
817

9-
.icon {
10-
fill: $black !important;
18+
.icon {
19+
fill: $black !important;
20+
}
21+
}
1122
}
1223
}
1324

@@ -41,11 +52,16 @@
4152
.language-nav {
4253
.dropdown-trigger {
4354
.button {
44-
color: $black !important;
45-
border-color: $black !important;
55+
&,
56+
&:hover,
57+
&:focus,
58+
&:active {
59+
color: $black !important;
60+
border-color: $black !important;
4661

47-
.icon {
48-
fill: $black !important;
62+
.icon {
63+
fill: $black !important;
64+
}
4965
}
5066
}
5167
}

0 commit comments

Comments
 (0)