Various tweaks

lassekongo83 · Jul 13, 2022 · 4d4a36f · 4d4a36f
1 parent c2e8f63
commit 4d4a36f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 11 deletions.
diff --git a/gtk/src/adw-gtk3/gtk-3.0/_apps.scss b/gtk/src/adw-gtk3/gtk-3.0/_apps.scss
@@ -527,6 +527,12 @@ $panel_transition_duration: 250ms;
 window.background.chromium {
   background-color: if($variant == 'light', $bg_color, gtkmix(currentColor, $bg_color, 10%));
 
+  // If there was/is an incognito class then https://github.com/lassekongo83/adw-gtk3/issues/147
+  // could be fixed, so disabled for now until a better solution is found.
+  //headerbar.titlebar button.titlebutton {
+  //  color: white;
+  //}
+
   entry,
   > button {
     border-color: gtkmix(currentColor, $bg_color, 27%);

diff --git a/gtk/src/adw-gtk3/gtk-3.0/_common.scss b/gtk/src/adw-gtk3/gtk-3.0/_common.scss
@@ -4756,7 +4756,7 @@ button.titlebutton {
 
   &:not(.appmenu) {
     border-radius: 9999px;
-    padding: 0px; //$_hb_btn_pad;
+    padding: 0px;
     margin: 0 4px;
     min-width: 24px;
     min-height: 24px;

diff --git a/gtk/src/adw-gtk3/gtk-3.0/_custom.scss b/gtk/src/adw-gtk3/gtk-3.0/_custom.scss
@@ -164,22 +164,27 @@ headerbar, .titlebar {
   // Text colors for gtk named color support (except backdrop and disabled)
   &:not(.selection-mode) {
     &,
-    entry,
-    button:not(.suggested-action):not(.destructive-action) {
+    entry {
       color: $headerbar_fg_color;
     }
 
     &:backdrop,
-    entry:backdrop,
-    button:not(.suggested-action):not(.destructive-action):backdrop {
+    entry:backdrop {
       color: $backdrop_fg_color;
     }
 
-    entry:disabled,
-    button:not(.suggested-action):not(.destructive-action):disabled {
+    entry:disabled {
       color: $insensitive_fg_color;
     }
 
+    button {
+      &:not(.suggested-action):not(.destructive-action) {
+        color: $headerbar_fg_color;
+        &:backdrop { color: $backdrop_fg_color; }
+        &:disabled { color: $insensitive_fg_color; }
+      }
+    }
+
     switch image { color: transparent; }
   }
 
@@ -189,8 +194,8 @@ headerbar, .titlebar {
   }
 
   // Text buttons
-  button.text-button:not(.suggested-action):not(.destructive-action):not(:disabled) {
-    @extend %colored_buttons;
+  button.text-button {
+    &:not(.suggested-action):not(.destructive-action):not(:disabled) { @extend %colored_buttons; }
   }
 
   // Linked button borders
@@ -237,7 +242,9 @@ headerbar, .titlebar {
   // Selection mode
   &.selection-mode {
     button,
-    button.text-button:not(.suggested-action):not(.destructive-action):not(:disabled) { @extend %suggested_buttons; }
+    button.text-button:not(.suggested-action):not(.destructive-action):not(:disabled) {
+      @extend %suggested_buttons;
+    }
   }
 
   // Entries
@@ -326,7 +333,7 @@ headerbar, .titlebar {
   // better animation when switching from backdrop
   &:not(:backdrop) {
     transition: 200ms ease-in;
-    transition-property: background-color, background-image, box-shadow, border-color, color;
+    transition-property: background-color, background-image, box-shadow, border-color, color, text-shadow;
   }
 
   // Balance out the titlebutton margin