Merge pull request #332 from mikedld/patch-2

Style toolbar and its buttons for GTK 4
shimmerproject · Mar 25, 2023 · 2ef038b · 2ef038b
2 parents ea80b5f + 37aba50
commit 2ef038b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/light/gtk-4.0/_common.scss b/light/gtk-4.0/_common.scss
@@ -544,6 +544,7 @@ button {
     }
 
     @at-root %button_basic_flat,
+    .toolbar &,
     &.flat {
       @include button(undecorated);
       // to avoid adjacent buttons borders clashing when transitioning, the transition on the normal state is set
@@ -1368,6 +1369,7 @@ combobox {
   background-color: $bg_color;
 }
 
+.toolbar,
 toolbar {
   @extend %toolbar;
   @include headerbar_fill;

diff --git a/light/gtk-4.0/_drawing.scss b/light/gtk-4.0/_drawing.scss
@@ -207,7 +207,7 @@
     @include _shadows(inset 0 1px $_hilight_color, $_button_edge);
   }
 
-  @else if $t==hover {
+  @else if $t==hover or $t==undecorated-hover {
   //
   // hovered button
   //
@@ -271,7 +271,7 @@
   }
 
 
-  @else if $t==active {
+  @else if $t==active or $t==undecorated-active {
   //
   // pushed button
   //