Fixed infobar issues

vinceliuice · Dec 25, 2020 · 19ea67f · 19ea67f
1 parent 6bb7049
commit 19ea67f
Show file tree

Hide file tree

Showing 10 changed files with 536 additions and 605 deletions.
diff --git a/src/gtk-3.0/gtk-aliz.css b/src/gtk-3.0/gtk-aliz.css
diff --git a/src/gtk-3.0/gtk-azul.css b/src/gtk-3.0/gtk-azul.css
diff --git a/src/gtk-3.0/gtk-dark-aliz.css b/src/gtk-3.0/gtk-dark-aliz.css
diff --git a/src/gtk-3.0/gtk-dark-azul.css b/src/gtk-3.0/gtk-dark-azul.css
diff --git a/src/gtk-3.0/gtk-dark-sea.css b/src/gtk-3.0/gtk-dark-sea.css
diff --git a/src/gtk-3.0/gtk-light-aliz.css b/src/gtk-3.0/gtk-light-aliz.css
diff --git a/src/gtk-3.0/gtk-light-azul.css b/src/gtk-3.0/gtk-light-azul.css
diff --git a/src/gtk-3.0/gtk-light-sea.css b/src/gtk-3.0/gtk-light-sea.css
diff --git a/src/gtk-3.0/gtk-sea.css b/src/gtk-3.0/gtk-sea.css
diff --git a/src/gtk-3.0/sass/_common.scss b/src/gtk-3.0/sass/_common.scss
@@ -2414,7 +2414,6 @@ radio {
 // GtkScale
 //
 
-%scale,
 scale {
   $_marks_length: 3px;
   $_marks_distance: 1px;
@@ -2585,24 +2584,23 @@ scale {
     &.fine-tune indicator { min-width: ($_marks_length - 1px); }
   }
 
-  %selected_scale,
   &:hover, &:selected {
     trough { // Troughs in selected list-rows and infobars
-      background-color: rgba(black, 0.2);
+      @extend %selected_scale;
+    }
+  }
+}
 
-      highlight {
-        background-color: $alt_selected_bg_color;
+%selected_scale {
+  background-color: rgba(black, 0.2);
 
-        &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, 55%); }
-      }
+  highlight {
+    background-color: $alt_selected_bg_color;
 
-      &:disabled { background-color: rgba(black, 0.1); }
-    }
+    &:disabled { background-color: mix($selected_fg_color, $selected_bg_color, 55%); }
   }
-}
 
-infobar {
-  @extend %selected_scale;
+  &:disabled { background-color: rgba(black, 0.1); }
 }
 
 //
@@ -3191,22 +3189,63 @@ paned {
 infobar {
   border-style: none;
 
+  &.info {
+    & > revealer > box,
+    &:backdrop > revealer > box {
+      background-color: $selected_bg_color;
+      selection { color: $selected_bg_color; }
+    }
+  }
+
+  &.question {
+    & > revealer > box,
+    &:backdrop > revealer > box {
+      background-color: $suggested_color;
+      selection { color: $suggested_color; }
+    }
+  }
+
+  &.warning {
+    & > revealer > box,
+    &:backdrop > revealer > box {
+      background-color: $warning_color;
+      selection { color: $warning_color; }
+    }
+  }
+
+  &.error {
+    & > revealer > box,
+    &:backdrop > revealer > box {
+      background-color: $error_color;
+      selection { color: $error_color; }
+    }
+  }
+
   &.info,
   &.question,
   &.warning,
   &.error {
-    background-color: $selected_bg_color;
-    color: $selected_fg_color;
-    caret-color: currentColor;
+    & > revealer > box,
+    &:hover > revealer > box,
+    &:backdrop > revealer > box {
+      color: $selected_fg_color;
+      caret-color: currentColor;
 
-    button { @extend %selected-button }
+      button {
+        min-height: 28px;
+        @extend %selected-button;
+      }
 
-    selection {
-      color: $selected_bg_color;
-      background-color: $selected_fg_color;
+      selection {
+        background-color: $selected_fg_color;
+      }
+
+      *:link { @extend %link_selected; }
     }
 
-    *:link { @extend %link_selected; }
+    trough {
+      @extend %selected_scale;
+    }
   }
 }