Skip to content

Commit 4748122

Browse files
authored
Merge pull request #116 from devgeniem/TMS-1164
TMS-1164: Remove color changing on button hover & focus
2 parents ef3462b + 7808d69 commit 4748122

File tree

6 files changed

+10
-126
lines changed

6 files changed

+10
-126
lines changed

CHANGELOG.MD

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
77

88
## [Unreleased]
99

10+
- TMS-1164: Remove color changing for button hover-styles
11+
1012
## [1.19.0] - 2025-12-17
1113

1214
- TMS-1226: Change focus order on events-search form

assets/styles/layouts/_subpages.scss

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,13 @@
1111
h3 {
1212
color: $white;
1313
}
14-
15-
&:focus,
16-
&:hover {
17-
h3 {
18-
color: $heading;
19-
}
20-
21-
svg.icon {
22-
fill: $heading !important;
23-
}
24-
}
2514
}
2615

2716
&:not(.has-background-image) {
2817
&:hover,
2918
&:focus {
30-
background-color: $primary-invert !important;
31-
color: $color-black !important;
19+
background-color: $primary !important;
20+
color: $color-white !important;
3221
border-color: $primary !important;
3322
}
3423
}

assets/styles/overrides/_button.scss

Lines changed: 6 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,57 +14,19 @@
1414
}
1515
}
1616

17-
&:hover,
18-
&:focus {
19-
border-color: $primary !important;
17+
&.is-outlined {
18+
color: $primary !important;
19+
20+
.icon {
21+
fill: $primary !important;
22+
}
2023
}
2124
}
2225

2326
&.is-secondary {
2427
color: $secondary !important;
2528
}
2629

27-
&.is-primary,
28-
&.is-secondary {
29-
&.is-outlined {
30-
&.is-hovered,
31-
&:hover {
32-
color: $primary !important;
33-
background-color: $primary-invert !important;
34-
border-color: $primary !important;
35-
text-decoration: underline !important;
36-
37-
.icon {
38-
fill: $primary !important;
39-
}
40-
}
41-
42-
&.is-active,
43-
&:active,
44-
&.is-focused,
45-
&:focus {
46-
color: $secondary-invert !important;
47-
background-color: $tertiary !important;
48-
border-color: $tertiary !important;
49-
50-
.icon {
51-
fill: $secondary-invert !important;
52-
}
53-
}
54-
}
55-
&.is-inverted{
56-
&:hover,
57-
&:focus {
58-
color: $primary-invert !important;
59-
background-color: $primary !important;
60-
border-color: $primary !important;
61-
.icon {
62-
fill: $primary-invert !important;
63-
}
64-
}
65-
}
66-
}
67-
6830
&.is-secondary-invert {
6931
&.is-outlined {
7032
color: $secondary-invert !important;
@@ -73,19 +35,6 @@
7335
.icon {
7436
fill: $secondary-invert !important;
7537
}
76-
77-
78-
&.is-hovered,
79-
&:hover {
80-
color: $secondary-invert !important;
81-
background-color: $tertiary !important;
82-
border-color: $secondary-invert !important;
83-
text-decoration: underline !important;
84-
85-
.icon {
86-
fill: $secondary-invert !important;
87-
}
88-
}
8938
}
9039
}
9140

assets/styles/overrides/_colors.scss

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,6 @@
1111
.icon {
1212
fill: $secondary-invert !important;
1313
}
14-
15-
&.is-hovered,
16-
&:hover,
17-
&.is-focused,
18-
&:focus {
19-
color: $primary !important;
20-
border-color: $primary !important;
21-
22-
.icon {
23-
fill: $primary !important;
24-
}
25-
}
2614
}
2715
}
2816
}

assets/styles/overrides/_grid.scss

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,6 @@
1111
color: $white !important;
1212
background-color: $primary !important;
1313
border-color: $primary !important;
14-
15-
&.is-hovered,
16-
&:hover,
17-
&.is-focused,
18-
&:focus {
19-
color: $primary !important;
20-
background-color: $primary-invert !important;
21-
border-color: $primary !important;
22-
}
2314
}
2415

2516
&.has-colors-primary {
@@ -56,15 +47,6 @@
5647
color: $primary-invert !important;
5748
background-color: transparent !important;
5849
border-color: $primary-invert !important;
59-
60-
&.is-hovered,
61-
&:hover,
62-
&.is-focused,
63-
&:focus {
64-
color: $primary !important;
65-
background-color: $primary-invert !important;
66-
border-color: $primary !important;
67-
}
6850
}
6951
}
7052
}

assets/styles/ui-components/_pill.scss

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,16 @@
1515
border-color: $black !important;
1616
text-transform: uppercase;
1717

18-
&:hover,
19-
&:focus {
20-
@include pill-hover-focus;
21-
}
22-
2318
&.is-primary-invert {
2419
color: $black !important;
2520
border-color: $black !important;
26-
27-
&:hover,
28-
&:focus {
29-
@include pill-hover-focus;
30-
}
3121
}
3222

3323
&.is-active {
3424
@include pill-hover-focus;
3525

36-
&:hover,
37-
&:focus {
38-
color: $black !important;
39-
}
40-
4126
.icon {
4227
fill: currentColor !important;
4328
}
44-
45-
&:not(span) {
46-
&:hover,
47-
&:focus {
48-
color: $black !important;
49-
50-
.icon {
51-
fill: currentColor !important;
52-
}
53-
}
54-
}
5529
}
5630
}

0 commit comments

Comments
 (0)