Skip to content

Commit 0572ca7

Browse files
committed
TMS-1164: More hover style fixes
1 parent c3f482b commit 0572ca7

File tree

6 files changed

+20
-39
lines changed

6 files changed

+20
-39
lines changed

assets/styles/theme-amuri.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,13 @@ $navbar-item-grid-item-border-color: $color-ui-border;
9191
$navbar-item-navbar-active-bg-color: $black;
9292

9393
$fly-out-nav-trigger-icon: $color-amuri-coffee;
94-
$fly-out-nav-trigger-icon-hover: $color-amuri-dark-yellow;
94+
$fly-out-nav-trigger-icon-hover: $color-amuri-coffee;
9595
$fly-out-nav-primary-link: $color-amuri-coffee;
9696
$fly-out-nav-primary-link-hover: $color-amuri-coffee;
9797
$fly-out-nav-primary-dropdown-active-background: $primary;
9898
$fly-out-nav-secondary-border-color: $color-ui-border;
9999
$fly-out-nav-secondary-link: $fly-out-nav-primary-link;
100-
$fly-out-nav-secondary-link-hover: $fly-out-nav-primary-link-hover;
100+
$fly-out-nav-secondary-link-hover: $fly-out-nav-primary-link;
101101
$fly-out-nav-search-button-icon: currentColor;
102102

103103
$duet-color-border: $color-vaalean-harmaa;

assets/styles/ui-components/_button.scss

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,6 @@ $button-secondary-border-color: $button-primary-border-color;
5353
color: $primary-invert !important;
5454
border-color: $primary-invert !important;
5555

56-
&.is-outlined {
57-
&:hover,
58-
&:focus {
59-
border-color: $primary-invert !important;
60-
}
61-
}
62-
6356
.icon {
6457
fill: $primary-invert !important;
6558
}

assets/styles/ui-components/_share-links.scss

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,21 @@
66
}
77

88
a {
9-
background-color: $primary-invert;
10-
border: 1px solid $primary-invert;
9+
&,
10+
&.has-background-accent {
11+
&,
12+
&:hover,
13+
&:focus,
14+
&:active {
15+
background-color: $primary-invert !important;
16+
border: 1px solid $primary-invert !important;
1117

12-
.icon {
13-
fill: $primary !important;
14-
}
15-
16-
&:hover,
17-
&.is-hovered,
18-
&:focus,
19-
&.is-focused {
20-
background-color: $primary !important;
21-
22-
.icon {
23-
fill: $primary-invert !important;
18+
.icon {
19+
fill: $primary !important;
20+
}
2421
}
2522
}
2623
}
27-
28-
.icon {
29-
fill: $link !important;
30-
}
3124
}
3225

3326
.entry__share-links {

assets/styles/ui-components/header/_header-top.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
#js-search-toggle {
3131
margin-right: $theme-spacing-oneandhalf !important;
3232
margin-left: $theme-spacing-oneandhalf !important;
33-
34-
&:hover,
35-
&:focus {
36-
background-color: $link-hover !important;
37-
color: $primary !important;
38-
}
3933
}
4034

4135
&__popup {

assets/styles/ui-components/header/_language-nav.scss

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,16 @@
3636
&--horizontal {
3737
a {
3838
border-color: $primary-invert !important;
39-
color: $primary !important;
40-
background-color: $primary-invert !important;
39+
color: $primary-invert !important;
40+
background-color: $primary !important;
4141

42-
&.has-text-primary {
42+
&.has-background-primary {
43+
background-color: $primary-invert !important;
4344
color: $primary !important;
4445
}
4546

46-
&:hover {
47-
background-color: $link-hover !important;
47+
&.has-text-primary {
48+
color: $primary-invert !important;
4849
}
4950

5051
&:focus {

lib/ThemeCustomizationController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public function header( $colors ) : array {
7676
*/
7777
public function footer( array $classes ) : array {
7878
$classes['container'] = '';
79-
$classes['back_to_top'] = 'is-outlined is-primary-invert';
79+
$classes['back_to_top'] = 'is-outlined is-primary is-inverted';
8080
$classes['link'] = 'has-text-paragraph';
8181
$classes['link_icon'] = 'is-secondary';
8282

0 commit comments

Comments
 (0)