Skip to content

Commit cb57cb6

Browse files
committed
Merge branch 'TMS-1164' into stage
2 parents fbf0252 + 8f6d374 commit cb57cb6

File tree

9 files changed

+35
-38
lines changed

9 files changed

+35
-38
lines changed

assets/styles/blocks/custom/_grid.scss

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,6 @@
5454
max-width: 80%;
5555
}
5656
}
57-
58-
.button {
59-
&:hover {
60-
color: $primary-invert !important;
61-
background-color: $primary !important;
62-
}
63-
64-
&:focus {
65-
outline-color: $white;
66-
}
67-
}
6857
}
6958
}
7059
}

assets/styles/helpers/_button.scss

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@ $button-transition-speed: $speed !default;
119119
&.is-hovered,
120120
&:focus,
121121
&.is-focused {
122-
border-color: $button-border-invert;
123122
text-decoration: underline !important;
124123

125124
@extend .button-state-hover;

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
.lang-nav--horizontal {
1818
a {
19-
color: $primary-invert !important;
20-
19+
&,
2120
&:hover,
2221
&:focus {
2322
color: $primary-invert !important;
24-
background-color: $primary !important;
2523
}
2624
}
2725
}
@@ -100,7 +98,7 @@
10098
&:hover,
10199
&:focus {
102100
color: $black !important;
103-
background-color: $primary !important;
101+
background-color: transparent !important;
104102
border-color: $black !important;
105103
}
106104
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
&:hover,
142142
&:focus {
143143
color: $black !important;
144-
background-color: $primary !important;
144+
background-color: transparent !important;
145145
border-color: $black !important;
146146
}
147147
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
&:hover,
139139
&:focus {
140140
color: $black !important;
141-
background-color: $primary !important;
141+
background-color: transparent !important;
142142
border-color: $black !important;
143143
}
144144
}

assets/styles/ui-components/_pill.scss

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ $pill-color-active-hover: $primary-invert !default;
55
$pill-color-hover: $secondary-invert !default;
66
$pill-background-active: $primary !default;
77

8-
$pill-background-active-focus: $primary-dark !default;
9-
$pill-background-color-hover: opacify($secondary-light, .75) !default;
10-
$pill-background-color-focus: $secondary-light !default;
8+
$pill-background-active-focus: $primary !default;
9+
$pill-background-color-hover: $secondary !default;
10+
$pill-background-color-focus: $secondary !default;
1111
$pill-background-color-active: $dark !default;
1212
$pill-background-color-focus: $dark !default;
1313
$pill-border-color: transparent !default;
@@ -46,7 +46,7 @@ $pill-hover-shadow-color: rgba(0, 0, 0, .15) !default;
4646
&.is-active,
4747
&:focus,
4848
&:hover {
49-
text-decoration: none;
49+
text-decoration: underline;
5050
}
5151

5252
&:focus,
@@ -83,18 +83,13 @@ $pill-hover-shadow-color: rgba(0, 0, 0, .15) !default;
8383

8484
&:not(span) {
8585
&:hover,
86-
&.is-hovered {
86+
&.is-hovered,
87+
&:focus,
88+
&.is-focused {
8789
color: $primary-invert;
8890
background-color: bulmaDarken($primary, 2.5%);
8991
border-color: transparent;
9092
}
91-
92-
&:focus,
93-
&.is-focused {
94-
color: $primary;
95-
background-color: $primary-invert;
96-
border-color: $color-black;
97-
}
9893
}
9994

10095
&-invert,
@@ -105,16 +100,12 @@ $pill-hover-shadow-color: rgba(0, 0, 0, .15) !default;
105100

106101
&:not(span) {
107102
&:hover,
108-
&.is-hovered {
109-
color: $primary-invert;
110-
background-color: bulmaDarken($primary, 2.5%);
111-
}
112-
103+
&.is-hovered,
113104
&:focus,
114105
&.is-focused {
115-
color: $primary-invert;
116-
background-color: bulmaDarken($primary, 2.5%);
117-
border-color: bulmaDarken($primary, 2.5%);
106+
color: $primary;
107+
background-color: $primary-invert;
108+
border-color: $primary;
118109
}
119110
}
120111
}
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
.share-links {
2+
a.has-background-accent {
3+
&:hover,
4+
&:focus {
5+
background-color: bulmaDarken($primary, 10) !important;
6+
7+
.icon {
8+
fill: $primary-invert !important;
9+
}
10+
}
11+
}
12+
}

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@ $lang-nav-link-border: $primary !default;
2121
width: 2.2359rem;
2222
height: 2.2359rem;
2323
}
24+
25+
&.has-background-primary {
26+
&:hover,
27+
&:focus {
28+
background-color: $primary !important; // sass-lint:disable-line no-important
29+
}
30+
}
2431
}
2532
}
2633
}

assets/styles/ui-components/index.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
@import "forms";
2828
@import "cookiebot";
2929
@import "archive-filters";
30+
@import "share-links";

0 commit comments

Comments
 (0)