Merge branch 'TMS-1164' into stage

eebbi · eebbi · commit f4938e191acb · 2025-12-16T19:41:00.000+02:00
diff --git a/assets/styles/helpers/_button.scss b/assets/styles/helpers/_button.scss
@@ -106,9 +106,10 @@ $button-transition-speed: $speed !default;
     &,
     &:active,
     &.is-active {
-        background-color: $button-background-primary;
-        border-color: $button-border-primary;
-        color: $button-text-primary;
+        text-decoration: underline;
+        // background-color: $button-background-primary;
+        // border-color: $button-border-primary;
+        // color: $button-text-primary;
 
         .icon {
             fill: currentColor !important;
diff --git a/assets/styles/themes/_theme-haive-overrides.scss b/assets/styles/themes/_theme-haive-overrides.scss
@@ -245,8 +245,13 @@
     }
 
     .button.is-primary {
-        color: $black !important;
-        border-color: $black !important;
+        &,
+        &:hover,
+        &:focus,
+        &:active {
+            color: $black !important;
+            border-color: $black !important;
+        }
     }
 }
 
diff --git a/assets/styles/themes/_theme-paahde-overrides.scss b/assets/styles/themes/_theme-paahde-overrides.scss
@@ -248,8 +248,13 @@
     }
 
     .button.is-primary {
-        color: $black !important;
-        border-color: $black !important;
+        &,
+        &:hover,
+        &:focus,
+        &:active {
+            color: $black !important;
+            border-color: $black !important;
+        }
     }
 }
 
diff --git a/assets/styles/ui-components/_pill.scss b/assets/styles/ui-components/_pill.scss
@@ -73,15 +73,25 @@ $pill-hover-shadow-color: rgba(0, 0, 0, .15) !default;
     }
 
     &.is-primary {
-        color: $primary-invert;
-        background-color: $primary;
-        border-color: $primary;
+        &,
+        &:hover,
+        &:focus,
+        &:active {
+            color: $primary-invert;
+            background-color: $primary;
+            border-color: $primary;
+        }
 
         &-invert,
         &.is-inverted {
-            color: $primary;
-            background-color: $primary-invert;
-            border-color: $primary;
+            &,
+            &:hover,
+            &:focus,
+            &:active {
+                color: $primary;
+                background-color: $primary-invert;
+                border-color: $primary;
+            }
         }
     }
 
@@ -99,8 +109,13 @@ $pill-hover-shadow-color: rgba(0, 0, 0, .15) !default;
     }
 
     &.is-outlined {
-        color: $pill-outlined-color;
-        background-color: $pill-outlined-background-color;
-        border-color: $pill-outlined-border-color;
+        &,
+        &:hover,
+        &:focus,
+        &:active {
+            color: $pill-outlined-color;
+            background-color: $pill-outlined-background-color;
+            border-color: $pill-outlined-border-color;
+        }
     }
 }
diff --git a/assets/styles/ui-components/header/_primary-nav.scss b/assets/styles/ui-components/header/_primary-nav.scss
@@ -108,7 +108,7 @@ $navbar-item-navbar-active-bg-color: rgba($navbar-item-navbar-link-color, .05) !
             }
 
             .icon {
-                fill: $navbar-item-dropdown-accent-color !important;
+                fill: $navbar-item-dropdown-accent-color;
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -245,8 +245,13 @@`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`.button.is-primary {`
`248`		`- color: $black !important;`
`249`		`- border-color: $black !important;`
	`248`	`+ &,`
	`249`	`+ &:hover,`
	`250`	`+ &:focus,`
	`251`	`+ &:active {`
	`252`	`+ color: $black !important;`
	`253`	`+ border-color: $black !important;`
	`254`	`+ }`
`250`	`255`	`}`
`251`	`256`	`}`
`252`	`257`
Original file line number	Diff line number	Diff line change
`@@ -248,8 +248,13 @@`
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`.button.is-primary {`
`251`		`- color: $black !important;`
`252`		`- border-color: $black !important;`
	`251`	`+ &,`
	`252`	`+ &:hover,`
	`253`	`+ &:focus,`
	`254`	`+ &:active {`
	`255`	`+ color: $black !important;`
	`256`	`+ border-color: $black !important;`
	`257`	`+ }`
`253`	`258`	`}`
`254`	`259`	`}`
`255`	`260`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ $navbar-item-navbar-active-bg-color: rgba($navbar-item-navbar-link-color, .05) !`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`.icon {`
`111`		`- fill: $navbar-item-dropdown-accent-color !important;`
	`111`	`+ fill: $navbar-item-dropdown-accent-color;`
`112`	`112`	`}`
`113`	`113`	`}`
`114`	`114`