[gtk+] Adwaita: restrict infobar styling to, well, infobars



commit d74e4af1a2cabb16d851f85a7d40d0de003109e5
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Sat Jun 25 18:17:59 2016 +0200

    Adwaita: restrict infobar styling to, well, infobars
    
    we used to style infobars by using the .info, .question, .warning
    and .error selectors directly, which used to be ok when we had just
    styleclasses all over the place, now it needs to be more specific
    or it interferes with everything with those styleclasses applied
    like entries.

 gtk/theme/Adwaita/_common.scss           |   60 +++++-----
 gtk/theme/Adwaita/gtk-contained-dark.css |  193 +++++++++--------------------
 gtk/theme/Adwaita/gtk-contained.css      |  195 +++++++++--------------------
 3 files changed, 152 insertions(+), 296 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index c211afe..94f5c45 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3870,48 +3870,50 @@ paned {
 /**************
  * GtkInfoBar *
  **************/
-infobar { border-style: none; }
-
-.info,
-.question,
-.warning,
-.error {
-  &:backdrop, & {
-    label, & { color: $selected_fg_color; }
-    background-color: $selected_bg_color;
-    border-color: darken($selected_bg_color, 10%);
-  }
+infobar {
+  border-style: none;
 
-  text-shadow: 0 1px darken($selected_bg_color, 10%);
+  &.info,
+  &.question,
+  &.warning,
+  &.error {
+    &:backdrop, & {
+      label, & { color: $selected_fg_color; }
+      background-color: $selected_bg_color;
+      border-color: darken($selected_bg_color, 10%);
+    }
 
-  &:backdrop { text-shadow: none; }
+    text-shadow: 0 1px darken($selected_bg_color, 10%);
 
-  button {
-    // FIXME: extend selection mode buttons
-    @include button(normal, $selected_bg_color, $selected_fg_color, none);
+    &:backdrop { text-shadow: none; }
 
-    &:hover { @include button(hover, $selected_bg_color, $selected_fg_color, none); }
+    button {
+      // FIXME: extend selection mode buttons
+      @include button(normal, $selected_bg_color, $selected_fg_color, none);
 
-    &:active,
-    &:checked { @include button(active, $selected_bg_color, $selected_fg_color, none); }
+      &:hover { @include button(hover, $selected_bg_color, $selected_fg_color, none); }
 
-    &:disabled { @include button(insensitive,$selected_bg_color,$selected_fg_color,none); }
+      &:active,
+      &:checked { @include button(active, $selected_bg_color, $selected_fg_color, none); }
 
-    &:backdrop {
-      @include button(backdrop, $selected_bg_color, $selected_fg_color, none);
-      border-color: _border_color($selected_bg_color);
+      &:disabled { @include button(insensitive,$selected_bg_color,$selected_fg_color,none); }
 
-      &:disabled {
-        @include button(backdrop-insensitive, $selected_bg_color,
-                        $selected_fg_color, none);
+      &:backdrop {
+        @include button(backdrop, $selected_bg_color, $selected_fg_color, none);
         border-color: _border_color($selected_bg_color);
+
+        &:disabled {
+          @include button(backdrop-insensitive, $selected_bg_color,
+                          $selected_fg_color, none);
+          border-color: _border_color($selected_bg_color);
+        }
       }
     }
-  }
 
-  selection { background-color: darken($selected_bg_color, 10%); }
+    selection { background-color: darken($selected_bg_color, 10%); }
 
-  *:link { @extend %link_selected; }
+    *:link { @extend %link_selected; }
+  }
 }
 
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 257f9a0..9cdf9ba 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1464,17 +1464,11 @@ button:visited {
   button:backdrop:link,
   button:backdrop:visited {
     color: #215d9c; }
-  .info *:link, .info button:link,
-  .info button:visited,
-  .question *:link,
-  .question button:link,
-  .question button:visited,
-  .warning *:link,
-  .warning button:link,
-  .warning button:visited,
-  .error *:link,
-  .error button:link,
-  .error button:visited, button:link > label:selected,
+  infobar.info *:link, infobar.info button:link,
+  infobar.info button:visited, infobar.question *:link, infobar.question button:link,
+  infobar.question button:visited, infobar.warning *:link, infobar.warning button:link,
+  infobar.warning button:visited, infobar.error *:link, infobar.error button:link,
+  infobar.error button:visited, button:link > label:selected,
   button:visited > label:selected, *:selected button:link > label,
   *:selected button:visited > label,
   *:link:selected,
@@ -4259,140 +4253,73 @@ paned.vertical > separator {
  **************/
 infobar {
   border-style: none; }
-
-.info,
-.question,
-.warning,
-.error {
-  text-shadow: 0 1px #184472; }
-  .info:backdrop, .info,
-  .question:backdrop,
-  .question,
-  .warning:backdrop,
-  .warning,
-  .error:backdrop,
-  .error {
-    background-color: #215d9c;
-    border-color: #184472; }
-    .info:backdrop label, .info:backdrop, .info label, .info,
-    .question:backdrop label,
-    .question:backdrop,
-    .question label,
-    .question,
-    .warning:backdrop label,
-    .warning:backdrop,
-    .warning label,
-    .warning,
-    .error:backdrop label,
-    .error:backdrop,
-    .error label,
-    .error {
-      color: #ffffff; }
-  .info:backdrop,
-  .question:backdrop,
-  .warning:backdrop,
-  .error:backdrop {
-    text-shadow: none; }
-  .info button,
-  .question button,
-  .warning button,
-  .error button {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #0f2b48;
-    border-bottom-color: #06121e;
-    background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
-    .info button:hover,
-    .question button:hover,
-    .warning button:hover,
-    .error button:hover {
+  infobar.info, infobar.question, infobar.warning, infobar.error {
+    text-shadow: 0 1px #184472; }
+    infobar.info:backdrop, infobar.info, infobar.question:backdrop, infobar.question, 
infobar.warning:backdrop, infobar.warning, infobar.error:backdrop, infobar.error {
+      background-color: #215d9c;
+      border-color: #184472; }
+      infobar.info:backdrop label, infobar.info:backdrop, infobar.info label, infobar.info, 
infobar.question:backdrop label, infobar.question:backdrop, infobar.question label, infobar.question, 
infobar.warning:backdrop label, infobar.warning:backdrop, infobar.warning label, infobar.warning, 
infobar.error:backdrop label, infobar.error:backdrop, infobar.error label, infobar.error {
+        color: #ffffff; }
+    infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, infobar.error:backdrop {
+      text-shadow: none; }
+    infobar.info button, infobar.question button, infobar.warning button, infobar.error button {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #0f2b48;
       border-bottom-color: #06121e;
-      background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
-      -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
+      background-image: linear-gradient(to bottom, #1f5894, #1d538b 60%, #1b4e83);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
+      -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.70353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
-    .info button:active, .info button:checked,
-    .question button:active,
-    .question button:checked,
-    .warning button:active,
-    .warning button:checked,
-    .error button:active,
-    .error button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #0f2b48;
-      background-image: none;
-      background-color: #1b4e83;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-      text-shadow: none;
-      -gtk-icon-shadow: none; }
-    .info button:disabled,
-    .question button:disabled,
-    .warning button:disabled,
-    .error button:disabled {
-      border-color: #0f2b48;
-      background-color: #21558b;
-      background-image: none;
-      text-shadow: none;
-      -gtk-icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:disabled label, .info button:disabled,
-      .question button:disabled label,
-      .question button:disabled,
-      .warning button:disabled label,
-      .warning button:disabled,
-      .error button:disabled label,
-      .error button:disabled {
-        color: #90aac5; }
-    .info button:backdrop,
-    .question button:backdrop,
-    .warning button:backdrop,
-    .error button:backdrop {
-      border-color: #0f2b48;
-      background-color: transparent;
-      background-image: image(#215d9c);
-      text-shadow: none;
-      -gtk-icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-      border-color: #0f2b48; }
-      .info button:backdrop label, .info button:backdrop,
-      .question button:backdrop label,
-      .question button:backdrop,
-      .warning button:backdrop label,
-      .warning button:backdrop,
-      .error button:backdrop label,
-      .error button:backdrop {
-        color: #d3dfeb; }
-      .info button:backdrop:disabled,
-      .question button:backdrop:disabled,
-      .warning button:backdrop:disabled,
-      .error button:backdrop:disabled {
+      infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover {
+        color: #ffffff;
+        outline-color: rgba(255, 255, 255, 0.3);
+        border-color: #0f2b48;
+        border-bottom-color: #06121e;
+        background-image: linear-gradient(to bottom, #2260a0, #1f5894 60%, #1d538b);
+        text-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
+        -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.65553);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.05); }
+      infobar.info button:active, infobar.info button:checked, infobar.question button:active, 
infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error 
button:active, infobar.error button:checked {
+        color: #ffffff;
+        outline-color: rgba(255, 255, 255, 0.3);
+        border-color: #0f2b48;
+        background-image: none;
+        background-color: #1b4e83;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+        text-shadow: none;
+        -gtk-icon-shadow: none; }
+      infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, 
infobar.error button:disabled {
         border-color: #0f2b48;
         background-color: #21558b;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        infobar.info button:disabled label, infobar.info button:disabled, infobar.question button:disabled 
label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning 
button:disabled, infobar.error button:disabled label, infobar.error button:disabled {
+          color: #90aac5; }
+      infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, 
infobar.error button:backdrop {
+        border-color: #0f2b48;
+        background-color: transparent;
+        background-image: image(#215d9c);
+        text-shadow: none;
+        -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #0f2b48; }
-        .info button:backdrop:disabled label, .info button:backdrop:disabled,
-        .question button:backdrop:disabled label,
-        .question button:backdrop:disabled,
-        .warning button:backdrop:disabled label,
-        .warning button:backdrop:disabled,
-        .error button:backdrop:disabled label,
-        .error button:backdrop:disabled {
-          color: #6f91b4; }
-  .info selection,
-  .question selection,
-  .warning selection,
-  .error selection {
-    background-color: #184472; }
+        infobar.info button:backdrop label, infobar.info button:backdrop, infobar.question button:backdrop 
label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning 
button:backdrop, infobar.error button:backdrop label, infobar.error button:backdrop {
+          color: #d3dfeb; }
+        infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled, infobar.warning 
button:backdrop:disabled, infobar.error button:backdrop:disabled {
+          border-color: #0f2b48;
+          background-color: #21558b;
+          background-image: none;
+          text-shadow: none;
+          -gtk-icon-shadow: none;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+          border-color: #0f2b48; }
+          infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled, 
infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning 
button:backdrop:disabled label, infobar.warning button:backdrop:disabled, infobar.error 
button:backdrop:disabled label, infobar.error button:backdrop:disabled {
+            color: #6f91b4; }
+    infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection {
+      background-color: #184472; }
 
 /************
  * Tooltips *
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 14f2c7c..44932bf 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1473,17 +1473,11 @@ button:visited {
   button:backdrop:link,
   button:backdrop:visited {
     color: #4a90d9; }
-  .info *:link, .info button:link,
-  .info button:visited,
-  .question *:link,
-  .question button:link,
-  .question button:visited,
-  .warning *:link,
-  .warning button:link,
-  .warning button:visited,
-  .error *:link,
-  .error button:link,
-  .error button:visited, button:link > label:selected,
+  infobar.info *:link, infobar.info button:link,
+  infobar.info button:visited, infobar.question *:link, infobar.question button:link,
+  infobar.question button:visited, infobar.warning *:link, infobar.warning button:link,
+  infobar.warning button:visited, infobar.error *:link, infobar.error button:link,
+  infobar.error button:visited, button:link > label:selected,
   button:visited > label:selected, *:selected button:link > label,
   *:selected button:visited > label,
   *:link:selected,
@@ -4290,140 +4284,73 @@ paned.vertical > separator {
  **************/
 infobar {
   border-style: none; }
-
-.info,
-.question,
-.warning,
-.error {
-  text-shadow: 0 1px #2a76c6; }
-  .info:backdrop, .info,
-  .question:backdrop,
-  .question,
-  .warning:backdrop,
-  .warning,
-  .error:backdrop,
-  .error {
-    background-color: #4a90d9;
-    border-color: #2a76c6; }
-    .info:backdrop label, .info:backdrop, .info label, .info,
-    .question:backdrop label,
-    .question:backdrop,
-    .question label,
-    .question,
-    .warning:backdrop label,
-    .warning:backdrop,
-    .warning label,
-    .warning,
-    .error:backdrop label,
-    .error:backdrop,
-    .error label,
-    .error {
-      color: #ffffff; }
-  .info:backdrop,
-  .question:backdrop,
-  .warning:backdrop,
-  .error:backdrop {
-    text-shadow: none; }
-  .info button,
-  .question button,
-  .warning button,
-  .error button {
-    color: #ffffff;
-    outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #215d9c;
-    border-bottom-color: #184472;
-    background-image: linear-gradient(to bottom, #4a90d9, #3986d5 60%, #2a76c6);
-    text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
-    box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); }
-    .info button:hover,
-    .question button:hover,
-    .warning button:hover,
-    .error button:hover {
+  infobar.info, infobar.question, infobar.warning, infobar.error {
+    text-shadow: 0 1px #2a76c6; }
+    infobar.info:backdrop, infobar.info, infobar.question:backdrop, infobar.question, 
infobar.warning:backdrop, infobar.warning, infobar.error:backdrop, infobar.error {
+      background-color: #4a90d9;
+      border-color: #2a76c6; }
+      infobar.info:backdrop label, infobar.info:backdrop, infobar.info label, infobar.info, 
infobar.question:backdrop label, infobar.question:backdrop, infobar.question label, infobar.question, 
infobar.warning:backdrop label, infobar.warning:backdrop, infobar.warning label, infobar.warning, 
infobar.error:backdrop label, infobar.error:backdrop, infobar.error label, infobar.error {
+        color: #ffffff; }
+    infobar.info:backdrop, infobar.question:backdrop, infobar.warning:backdrop, infobar.error:backdrop {
+      text-shadow: none; }
+    infobar.info button, infobar.question button, infobar.warning button, infobar.error button {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #215d9c;
       border-bottom-color: #184472;
-      background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5);
-      text-shadow: 0 -1px rgba(0, 0, 0, 0.49553);
-      -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553);
+      background-image: linear-gradient(to bottom, #4a90d9, #3986d5 60%, #2a76c6);
+      text-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
+      -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.54353);
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); }
-    .info button:active, .info button:checked,
-    .question button:active,
-    .question button:checked,
-    .warning button:active,
-    .warning button:checked,
-    .error button:active,
-    .error button:checked {
-      color: #ffffff;
-      outline-color: rgba(255, 255, 255, 0.3);
-      border-color: #215d9c;
-      background-image: none;
-      background-color: #3180d4;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-      text-shadow: none;
-      -gtk-icon-shadow: none; }
-    .info button:disabled,
-    .question button:disabled,
-    .warning button:disabled,
-    .error button:disabled {
-      border-color: #215d9c;
-      background-color: #65a1df;
-      background-image: none;
-      text-shadow: none;
-      -gtk-icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
-      .info button:disabled label, .info button:disabled,
-      .question button:disabled label,
-      .question button:disabled,
-      .warning button:disabled label,
-      .warning button:disabled,
-      .error button:disabled label,
-      .error button:disabled {
-        color: #b2d0ef; }
-    .info button:backdrop,
-    .question button:backdrop,
-    .warning button:backdrop,
-    .error button:backdrop {
-      border-color: #4a90d9;
-      background-color: transparent;
-      background-image: image(#4a90d9);
-      text-shadow: none;
-      -gtk-icon-shadow: none;
-      box-shadow: inset 0 1px rgba(255, 255, 255, 0);
-      border-color: #215d9c; }
-      .info button:backdrop label, .info button:backdrop,
-      .question button:backdrop label,
-      .question button:backdrop,
-      .warning button:backdrop label,
-      .warning button:backdrop,
-      .error button:backdrop label,
-      .error button:backdrop {
-        color: #dbe9f7; }
-      .info button:backdrop:disabled,
-      .question button:backdrop:disabled,
-      .warning button:backdrop:disabled,
-      .error button:backdrop:disabled {
-        border-color: #65a1df;
+      infobar.info button:hover, infobar.question button:hover, infobar.warning button:hover, infobar.error 
button:hover {
+        color: #ffffff;
+        outline-color: rgba(255, 255, 255, 0.3);
+        border-color: #215d9c;
+        border-bottom-color: #184472;
+        background-image: linear-gradient(to bottom, #63a0de, #4a90d9 60%, #3986d5);
+        text-shadow: 0 -1px rgba(0, 0, 0, 0.49553);
+        -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.49553);
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); }
+      infobar.info button:active, infobar.info button:checked, infobar.question button:active, 
infobar.question button:checked, infobar.warning button:active, infobar.warning button:checked, infobar.error 
button:active, infobar.error button:checked {
+        color: #ffffff;
+        outline-color: rgba(255, 255, 255, 0.3);
+        border-color: #215d9c;
+        background-image: none;
+        background-color: #3180d4;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+        text-shadow: none;
+        -gtk-icon-shadow: none; }
+      infobar.info button:disabled, infobar.question button:disabled, infobar.warning button:disabled, 
infobar.error button:disabled {
+        border-color: #215d9c;
         background-color: #65a1df;
         background-image: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
+        box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
+        infobar.info button:disabled label, infobar.info button:disabled, infobar.question button:disabled 
label, infobar.question button:disabled, infobar.warning button:disabled label, infobar.warning 
button:disabled, infobar.error button:disabled label, infobar.error button:disabled {
+          color: #b2d0ef; }
+      infobar.info button:backdrop, infobar.question button:backdrop, infobar.warning button:backdrop, 
infobar.error button:backdrop {
+        border-color: #4a90d9;
+        background-color: transparent;
+        background-image: image(#4a90d9);
+        text-shadow: none;
+        -gtk-icon-shadow: none;
         box-shadow: inset 0 1px rgba(255, 255, 255, 0);
         border-color: #215d9c; }
-        .info button:backdrop:disabled label, .info button:backdrop:disabled,
-        .question button:backdrop:disabled label,
-        .question button:backdrop:disabled,
-        .warning button:backdrop:disabled label,
-        .warning button:backdrop:disabled,
-        .error button:backdrop:disabled label,
-        .error button:backdrop:disabled {
-          color: #9bc2ea; }
-  .info selection,
-  .question selection,
-  .warning selection,
-  .error selection {
-    background-color: #2a76c6; }
+        infobar.info button:backdrop label, infobar.info button:backdrop, infobar.question button:backdrop 
label, infobar.question button:backdrop, infobar.warning button:backdrop label, infobar.warning 
button:backdrop, infobar.error button:backdrop label, infobar.error button:backdrop {
+          color: #dbe9f7; }
+        infobar.info button:backdrop:disabled, infobar.question button:backdrop:disabled, infobar.warning 
button:backdrop:disabled, infobar.error button:backdrop:disabled {
+          border-color: #65a1df;
+          background-color: #65a1df;
+          background-image: none;
+          text-shadow: none;
+          -gtk-icon-shadow: none;
+          box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+          border-color: #215d9c; }
+          infobar.info button:backdrop:disabled label, infobar.info button:backdrop:disabled, 
infobar.question button:backdrop:disabled label, infobar.question button:backdrop:disabled, infobar.warning 
button:backdrop:disabled label, infobar.warning button:backdrop:disabled, infobar.error 
button:backdrop:disabled label, infobar.error button:backdrop:disabled {
+            color: #9bc2ea; }
+    infobar.info selection, infobar.question selection, infobar.warning selection, infobar.error selection {
+      background-color: #2a76c6; }
 
 /************
  * Tooltips *


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]