[gtk+/gtk-3-14] Adwaita: add back text color

From: Lapo Calamandrei <lapo src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk+/gtk-3-14] Adwaita: add back text color
Date: Fri, 31 Oct 2014 14:33:51 +0000 (UTC)
commit c01578284dbdc8c22ed06b392c1c1308962f4ed6
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Oct 31 15:32:56 2014 +0100

    Adwaita: add back text color
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=726316 for details.

 gtk/resources/theme/Adwaita/_colors-public.scss    |    2 +
 gtk/resources/theme/Adwaita/_colors.scss           |    2 +
 gtk/resources/theme/Adwaita/_common.scss           |   41 +++++++++--
 gtk/resources/theme/Adwaita/_drawing.scss          |    3 +-
 gtk/resources/theme/Adwaita/gtk-contained-dark.css |   75 ++++++++++----------
 gtk/resources/theme/Adwaita/gtk-contained.css      |   75 ++++++++++----------
 6 files changed, 116 insertions(+), 82 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_colors-public.scss b/gtk/resources/theme/Adwaita/_colors-public.scss
index 2a6454f..80de64d 100644
--- a/gtk/resources/theme/Adwaita/_colors-public.scss
+++ b/gtk/resources/theme/Adwaita/_colors-public.scss
@@ -4,6 +4,7 @@
 // Sass thinks we're using the colors in the variables as strings and may shoot
 // warning, it's innocuous and can be defeated by using "" + $var
 @define-color theme_fg_color #{$fg_color};
+ define-color theme_text_color #{"" + $text_color};
 @define-color theme_bg_color #{$bg_color};
 @define-color theme_base_color #{"" + $base_color};
 @define-color theme_selected_bg_color #{$selected_bg_color};
@@ -12,6 +13,7 @@
 @define-color insensitive_fg_color #{$insensitive_fg_color};
 @define-color insensitive_base_color #{"" + $base_color};
 @define-color theme_unfocused_fg_color #{$backdrop_fg_color};
+ define-color theme_unfocused_text_color #{$backdrop_text_color};
 @define-color theme_unfocused_bg_color #{$backdrop_bg_color};
 @define-color theme_unfocused_base_color #{$backdrop_base_color};
 @define-color theme_unfocused_selected_bg_color #{$selected_bg_color};
diff --git a/gtk/resources/theme/Adwaita/_colors.scss b/gtk/resources/theme/Adwaita/_colors.scss
index cf9ab2d..f57f00f 100644
--- a/gtk/resources/theme/Adwaita/_colors.scss
+++ b/gtk/resources/theme/Adwaita/_colors.scss
@@ -3,6 +3,7 @@
 
 
 $base_color: if($variant =='light', #ffffff, #292929);
+$text_color: if($variant == 'light', black, white);
 $bg_color: if($variant =='light', #ededed, #393f3f);
 $fg_color: if($variant =='light', #2e3436, #eeeeec);
 
@@ -37,6 +38,7 @@ $insensitive_borders_color: $borders_color;
 
 //colors for the backdrop state, derived from the main colors.
 $backdrop_base_color: if($variant =='light', darken($base_color,1%), lighten($base_color,1%));
+$backdrop_text_color: mix($text_color, $backdrop_base_color, 80%);
 $backdrop_bg_color: $bg_color;
 $backdrop_fg_color: mix($fg_color, $backdrop_bg_color, 50%);
 $backdrop_insensitive_color: if($variant =='light', darken($backdrop_bg_color,15%), 
lighten($backdrop_bg_color,15%));
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 7915782..6b33c51 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -100,10 +100,10 @@
 }
 
 .view {
-  color: $fg_color;
+  color: $text_color;
   background-color: $base_color;
   &:backdrop {
-    color: $backdrop_fg_color;
+    color: $backdrop_text_color;
     background-color: $backdrop_base_color;
   }
   &:selected,
@@ -2417,12 +2417,16 @@ GtkCalendar {
   }
   &.header {
     @extend .titlebar;
+    color: $fg_color;
     box-shadow: inset 0 -1px mix($borders_color, $bg_color, 30%),
                 inset 0px 1px $top_hilight,
                 0 1px 2px transparentize(black,0.9);
     border: 1px solid $borders_color;
     border-radius: 0;
-    &:backdrop { box-shadow: none; }
+    &:backdrop {
+      color: $backdrop_fg_color;
+      box-shadow: none;
+    }
   }
   &.button {
     @extend %undecorated_button;
@@ -2433,8 +2437,13 @@ GtkCalendar {
     }
     &:backdrop { color: transparentize($backdrop_fg_color,0.55); }
   }
-  &.highlight { color: gtkalpha(currentColor,0.55); }
-  &:backdrop { border-color: $backdrop_borders_color; }
+  &.highlight,
+  &.highlight:backdrop { color: gtkalpha(currentColor,0.55); }
+
+  &:backdrop {
+    color: $backdrop_text_color;
+    border-color: $backdrop_borders_color;
+  }
 }
 
 /***********
@@ -2547,8 +2556,7 @@ GtkFileChooserDialog {
  * Sidebar *
  ***********/
 
-.sidebar,
-.sidebar .view {
+.sidebar {
   border: none;
   $_sidebar_bg: lighten($bg_color,5%);
   background-color: $_sidebar_bg;
@@ -2573,6 +2581,25 @@ GtkFileChooserDialog {
   .separator:backdrop { @extend .separator; } // overriden w/o this
 }
 
+// Places sidebar is a special case, since the view here have to look like chrome not content, so we 
override text color
+GtkPlacesSidebar.sidebar .view {
+
+  color: $fg_color;
+  background-color: transparent;
+
+  &:backdrop { color: $backdrop_fg_color; }
+
+  &:selected {
+    color: $selected_fg_color;
+    background-color: $selected_bg_color;
+
+    &:backdrop { color: if($variant == 'light', $backdrop_base_color, $selected_bg_color); }
+  }
+
+  &.separator,
+  &.separator:backdrop { @extend .separator; }
+}
+
 GtkPaned {
   // This is actually the invisible area of the paned separator, not a margin...
   margin: 0 8px 8px 0; //drag area of the separator
diff --git a/gtk/resources/theme/Adwaita/_drawing.scss b/gtk/resources/theme/Adwaita/_drawing.scss
index fac477f..937192f 100644
--- a/gtk/resources/theme/Adwaita/_drawing.scss
+++ b/gtk/resources/theme/Adwaita/_drawing.scss
@@ -52,6 +52,7 @@
                                             transparentize($fc,0.3));
 
   @if $t==normal {
+    color: $text-color;
     border-color: $borders_color;
     @include _shadows($_inner_shadows,
                       inset 0 0 0 1px transparentize($fc,1),
@@ -77,7 +78,7 @@
 
   }
   @if $t==backdrop {
-    color: $backdrop_fg_color;
+    color: $backdrop_text_color;
     border-color: $backdrop_borders_color;
     background-image: linear-gradient(to bottom, $backdrop_base_color);
     @include _shadows($_blank_inner_shadows, $_blank_edge);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css 
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 2752263..648ed3f 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -64,10 +64,10 @@
     color: #ffffff; }
 
 .view {
-  color: #eeeeec;
+  color: white;
   background-color: #292929; }
   .view:backdrop {
-    color: #939695;
+    color: #d4d4d4;
     background-color: #2c2c2c; }
 
 .rubberband {
@@ -77,19 +77,16 @@
 .overshoot {
   background-color: rgba(33, 93, 156, 0.2); }
 
-GtkLabel.separator, .sidebar GtkLabel.separator:backdrop,
-.sidebar .view GtkLabel.separator:backdrop {
+GtkLabel.separator, .sidebar GtkLabel.separator:backdrop, GtkPlacesSidebar.sidebar GtkLabel.view.separator, 
GtkPlacesSidebar.sidebar GtkLabel.view.separator:backdrop {
   color: #eeeeec; }
-  GtkLabel.separator:backdrop, .sidebar GtkLabel.separator:backdrop,
-  .sidebar .view GtkLabel.separator:backdrop {
+  GtkLabel.separator:backdrop, .sidebar GtkLabel.separator:backdrop {
     color: #939695; }
 GtkLabel:insensitive {
   color: #939695; }
   GtkLabel:insensitive:backdrop {
     color: #5d6767; }
 
-.dim-label, GtkLabel.separator, .sidebar GtkLabel.separator:backdrop,
-.sidebar .view GtkLabel.separator:backdrop, .titlebar .subtitle, GtkCalendar.header .subtitle,
+.dim-label, GtkLabel.separator, .sidebar GtkLabel.separator:backdrop, GtkPlacesSidebar.sidebar 
GtkLabel.view.separator, GtkPlacesSidebar.sidebar GtkLabel.view.separator:backdrop, .titlebar .subtitle, 
GtkCalendar.header .subtitle,
 .header-bar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
@@ -158,6 +155,7 @@ GtkFlowBox .grid-child {
   transition: all 200ms ease-out;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #212121, #292929 90%);
+  color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 
0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
   .entry.image.left {
@@ -168,6 +166,7 @@ GtkFlowBox .grid-child {
     padding: 2px;
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
+    color: white;
     border-color: #1c1f1f;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 
0.08), inset 0 0 0 1px rgba(33, 93, 156, 0);
     border: none;
@@ -187,7 +186,7 @@ GtkFlowBox .grid-child {
   .entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    color: #939695;
+    color: #d4d4d4;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 
238, 236, 0); }
@@ -1399,9 +1398,7 @@ GtkComboBox {
     color: #5d6767; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator, GtkComboBox .sidebar .separator:backdrop, .sidebar GtkComboBox .separator:backdrop,
-  GtkComboBox .sidebar .view .separator:backdrop,
-  .sidebar .view GtkComboBox .separator:backdrop {
+  GtkComboBox .separator, GtkComboBox .sidebar .separator:backdrop, .sidebar GtkComboBox 
.separator:backdrop, GtkComboBox GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar 
GtkComboBox .view.separator, GtkComboBox GtkPlacesSidebar.sidebar .view.separator:backdrop, 
GtkPlacesSidebar.sidebar GtkComboBox .view.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -1466,12 +1463,10 @@ GtkComboBox {
   .header-bar .subtitle {
     font-size: smaller;
     padding: 0 12px; }
-  .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > 
.separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical,
-  .sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
-  .sidebar .view GtkCalendar.header > GtkBox > .vertical.separator:backdrop,
+  .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > 
.separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical, GtkPlacesSidebar.sidebar .titlebar > 
GtkBox > .vertical.view.separator:backdrop, GtkPlacesSidebar.sidebar GtkCalendar.header > GtkBox > 
.vertical.view.separator:backdrop,
   .header-bar .header-bar-separator,
   .header-bar > GtkBox > .separator.vertical,
-  .sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
+  GtkPlacesSidebar.sidebar .header-bar > GtkBox > .vertical.view.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -3340,12 +3335,13 @@ GtkLevelBar.vertical {
   border-radius: 3px;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #212121, #292929 90%);
+  color: white;
   border-color: #1c1f1f;
   box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 
0.08), inset 0 0 0 1px rgba(33, 93, 156, 0), 0 1px rgba(238, 238, 236, 0.1); }
   .level-bar.trough:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #212121, #292929 90%);
-    color: #939695;
+    color: #d4d4d4;
     border-color: #1e2222;
     background-image: linear-gradient(to bottom, #2c2c2c);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(238, 
238, 236, 0); }
@@ -3395,14 +3391,9 @@ GtkLevelBar.vertical {
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator, .sidebar .separator:backdrop,
-.sidebar .view .separator:backdrop {
+.separator, .sidebar .separator:backdrop, GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar 
.view.separator:backdrop {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator, GtkFileChooserButton .sidebar .separator:backdrop, .sidebar 
GtkFileChooserButton .separator:backdrop,
-  GtkFileChooserButton .sidebar .view .separator:backdrop,
-  .sidebar .view GtkFileChooserButton .separator:backdrop, GtkFontButton .separator, GtkFontButton .sidebar 
.separator:backdrop, .sidebar GtkFontButton .separator:backdrop,
-  GtkFontButton .sidebar .view .separator:backdrop,
-  .sidebar .view GtkFontButton .separator:backdrop {
+  GtkFileChooserButton .separator, GtkFileChooserButton .sidebar .separator:backdrop, .sidebar 
GtkFileChooserButton .separator:backdrop, GtkFileChooserButton GtkPlacesSidebar.sidebar .view.separator, 
GtkPlacesSidebar.sidebar GtkFileChooserButton .view.separator, GtkFileChooserButton GtkPlacesSidebar.sidebar 
.view.separator:backdrop, GtkPlacesSidebar.sidebar GtkFileChooserButton .view.separator:backdrop, 
GtkFontButton .separator, GtkFontButton .sidebar .separator:backdrop, .sidebar GtkFontButton 
.separator:backdrop, GtkFontButton GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar 
GtkFontButton .view.separator, GtkFontButton GtkPlacesSidebar.sidebar .view.separator:backdrop, 
GtkPlacesSidebar.sidebar GtkFontButton .view.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -3677,10 +3668,12 @@ GtkCalendar {
     GtkCalendar:selected:backdrop {
       color: #939695; }
   GtkCalendar.header {
+    color: #eeeeec;
     box-shadow: inset 0 -1px #303535, inset 0px 1px rgba(238, 238, 236, 0.1), 0 1px 2px rgba(0, 0, 0, 0.1);
     border: 1px solid #1c1f1f;
     border-radius: 0; }
     GtkCalendar.header:backdrop {
+      color: #939695;
       box-shadow: none; }
   GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
   .titlebar GtkCalendar.button.titlebutton,
@@ -3694,9 +3687,10 @@ GtkCalendar {
     .titlebar GtkCalendar.button.titlebutton:backdrop,
     GtkCalendar.header GtkCalendar.button.titlebutton:backdrop {
       color: rgba(147, 150, 149, 0.45); }
-  GtkCalendar.highlight {
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar:backdrop {
+    color: #d4d4d4;
     border-color: #1e2222; }
 
 /***********
@@ -3887,28 +3881,33 @@ GtkFileChooserDialog .dialog-action-box {
 /***********
  * Sidebar *
  ***********/
-.sidebar,
-.sidebar .view {
+.sidebar {
   border: none;
   background-color: #454c4c; }
-  .sidebar .scrollbar.trough,
-  .sidebar .view .scrollbar.trough {
+  .sidebar .scrollbar.trough {
     background-color: #212424;
     border-radius: 6px;
     border-width: 2px;
     border-color: transparent; }
-  .sidebar .scrollbar.slider,
-  .sidebar .view .scrollbar.slider {
+  .sidebar .scrollbar.slider {
     background-color: #454c4c; }
-    .sidebar .scrollbar.slider:hover,
-    .sidebar .view .scrollbar.slider:hover {
+    .sidebar .scrollbar.slider:hover {
       background-color: #515a5a; }
-  .sidebar:backdrop,
-  .sidebar .view:backdrop {
+  .sidebar:backdrop {
     background-color: #454c4c; }
-  .sidebar:selected,
-  .sidebar .view:selected {
+  .sidebar:selected {
+    background-color: #215d9c; }
+
+GtkPlacesSidebar.sidebar .view {
+  color: #eeeeec;
+  background-color: transparent; }
+  GtkPlacesSidebar.sidebar .view:backdrop {
+    color: #939695; }
+  GtkPlacesSidebar.sidebar .view:selected {
+    color: #ffffff;
     background-color: #215d9c; }
+    GtkPlacesSidebar.sidebar .view:selected:backdrop {
+      color: #215d9c; }
 
 GtkPaned {
   margin: 0 8px 8px 0; }
@@ -4190,6 +4189,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #eeeeec;
+ define-color theme_text_color white;
 @define-color theme_bg_color #393f3f;
 @define-color theme_base_color #292929;
 @define-color theme_selected_bg_color #215d9c;
@@ -4198,6 +4198,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color insensitive_fg_color #939695;
 @define-color insensitive_base_color #292929;
 @define-color theme_unfocused_fg_color #939695;
+ define-color theme_unfocused_text_color #d4d4d4;
 @define-color theme_unfocused_bg_color #393f3f;
 @define-color theme_unfocused_base_color #2c2c2c;
 @define-color theme_unfocused_selected_bg_color #215d9c;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index e22903b..db76312 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -64,10 +64,10 @@
     color: #ffffff; }
 
 .view {
-  color: #2e3436;
+  color: black;
   background-color: #ffffff; }
   .view:backdrop {
-    color: #8d9091;
+    color: #323232;
     background-color: #fcfcfc; }
 
 .rubberband {
@@ -77,19 +77,16 @@
 .overshoot {
   background-color: rgba(74, 144, 217, 0.2); }
 
-GtkLabel.separator, .sidebar GtkLabel.separator:backdrop,
-.sidebar .view GtkLabel.separator:backdrop {
+GtkLabel.separator, .sidebar GtkLabel.separator:backdrop, GtkPlacesSidebar.sidebar GtkLabel.view.separator, 
GtkPlacesSidebar.sidebar GtkLabel.view.separator:backdrop {
   color: #2e3436; }
-  GtkLabel.separator:backdrop, .sidebar GtkLabel.separator:backdrop,
-  .sidebar .view GtkLabel.separator:backdrop {
+  GtkLabel.separator:backdrop, .sidebar GtkLabel.separator:backdrop {
     color: #8d9091; }
 GtkLabel:insensitive {
   color: #8d9091; }
   GtkLabel:insensitive:backdrop {
     color: #c7c7c7; }
 
-.dim-label, GtkLabel.separator, .sidebar GtkLabel.separator:backdrop,
-.sidebar .view GtkLabel.separator:backdrop, .titlebar .subtitle, GtkCalendar.header .subtitle,
+.dim-label, GtkLabel.separator, .sidebar GtkLabel.separator:backdrop, GtkPlacesSidebar.sidebar 
GtkLabel.view.separator, GtkPlacesSidebar.sidebar GtkLabel.view.separator:backdrop, .titlebar .subtitle, 
GtkCalendar.header .subtitle,
 .header-bar .subtitle {
   opacity: 0.55;
   text-shadow: none; }
@@ -158,6 +155,7 @@ GtkFlowBox .grid-child {
   transition: all 200ms ease-out;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+  color: black;
   border-color: #a1a1a1;
   box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 
0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
   .entry.image.left {
@@ -168,6 +166,7 @@ GtkFlowBox .grid-child {
     padding: 2px;
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+    color: black;
     border-color: #a1a1a1;
     box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 
0.08), inset 0 0 0 1px rgba(74, 144, 217, 0);
     border: none;
@@ -187,7 +186,7 @@ GtkFlowBox .grid-child {
   .entry:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-    color: #8d9091;
+    color: #323232;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #fcfcfc);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 
255, 255, 0); }
@@ -1391,9 +1390,7 @@ GtkComboBox {
     color: #c7c7c7; }
   GtkComboBox .menuitem {
     text-shadow: none; }
-  GtkComboBox .separator, GtkComboBox .sidebar .separator:backdrop, .sidebar GtkComboBox .separator:backdrop,
-  GtkComboBox .sidebar .view .separator:backdrop,
-  .sidebar .view GtkComboBox .separator:backdrop {
+  GtkComboBox .separator, GtkComboBox .sidebar .separator:backdrop, .sidebar GtkComboBox 
.separator:backdrop, GtkComboBox GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar 
GtkComboBox .view.separator, GtkComboBox GtkPlacesSidebar.sidebar .view.separator:backdrop, 
GtkPlacesSidebar.sidebar GtkComboBox .view.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -1458,12 +1455,10 @@ GtkComboBox {
   .header-bar .subtitle {
     font-size: smaller;
     padding: 0 12px; }
-  .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > 
.separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical,
-  .sidebar .view .titlebar > GtkBox > .vertical.separator:backdrop,
-  .sidebar .view GtkCalendar.header > GtkBox > .vertical.separator:backdrop,
+  .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > 
.separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical, GtkPlacesSidebar.sidebar .titlebar > 
GtkBox > .vertical.view.separator:backdrop, GtkPlacesSidebar.sidebar GtkCalendar.header > GtkBox > 
.vertical.view.separator:backdrop,
   .header-bar .header-bar-separator,
   .header-bar > GtkBox > .separator.vertical,
-  .sidebar .view .header-bar > GtkBox > .vertical.separator:backdrop {
+  GtkPlacesSidebar.sidebar .header-bar > GtkBox > .vertical.view.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -3493,12 +3488,13 @@ GtkLevelBar.vertical {
   border-radius: 3px;
   background-color: transparent;
   background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
+  color: black;
   border-color: #a1a1a1;
   box-shadow: inset 0 3px rgba(0, 0, 0, 0.02), inset 0 2px rgba(0, 0, 0, 0.03), inset 0 1px rgba(0, 0, 0, 
0.08), inset 0 0 0 1px rgba(74, 144, 217, 0), 0 1px white; }
   .level-bar.trough:backdrop {
     background-color: transparent;
     background-image: linear-gradient(to bottom, #f7f7f7, #ffffff 90%);
-    color: #8d9091;
+    color: #323232;
     border-color: #a8a8a8;
     background-image: linear-gradient(to bottom, #fcfcfc);
     box-shadow: inset 0 3px transparent, inset 0 2px transparent, inset 0 1px transparent, 0 1px rgba(255, 
255, 255, 0); }
@@ -3548,14 +3544,9 @@ GtkLevelBar.vertical {
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
-.separator, .sidebar .separator:backdrop,
-.sidebar .view .separator:backdrop {
+.separator, .sidebar .separator:backdrop, GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar 
.view.separator:backdrop {
   color: rgba(0, 0, 0, 0.1); }
-  GtkFileChooserButton .separator, GtkFileChooserButton .sidebar .separator:backdrop, .sidebar 
GtkFileChooserButton .separator:backdrop,
-  GtkFileChooserButton .sidebar .view .separator:backdrop,
-  .sidebar .view GtkFileChooserButton .separator:backdrop, GtkFontButton .separator, GtkFontButton .sidebar 
.separator:backdrop, .sidebar GtkFontButton .separator:backdrop,
-  GtkFontButton .sidebar .view .separator:backdrop,
-  .sidebar .view GtkFontButton .separator:backdrop {
+  GtkFileChooserButton .separator, GtkFileChooserButton .sidebar .separator:backdrop, .sidebar 
GtkFileChooserButton .separator:backdrop, GtkFileChooserButton GtkPlacesSidebar.sidebar .view.separator, 
GtkPlacesSidebar.sidebar GtkFileChooserButton .view.separator, GtkFileChooserButton GtkPlacesSidebar.sidebar 
.view.separator:backdrop, GtkPlacesSidebar.sidebar GtkFileChooserButton .view.separator:backdrop, 
GtkFontButton .separator, GtkFontButton .sidebar .separator:backdrop, .sidebar GtkFontButton 
.separator:backdrop, GtkFontButton GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar 
GtkFontButton .view.separator, GtkFontButton GtkPlacesSidebar.sidebar .view.separator:backdrop, 
GtkPlacesSidebar.sidebar GtkFontButton .view.separator:backdrop {
     -GtkWidget-wide-separators: true;
     -GtkWidget-horizontal-separator: 0;
     -GtkWidget-vertical-separator: 0; }
@@ -3838,10 +3829,12 @@ GtkCalendar {
     GtkCalendar:selected:backdrop {
       color: #fcfcfc; }
   GtkCalendar.header {
+    color: #2e3436;
     box-shadow: inset 0 -1px #d6d6d6, inset 0px 1px white, 0 1px 2px rgba(0, 0, 0, 0.1);
     border: 1px solid #a1a1a1;
     border-radius: 0; }
     GtkCalendar.header:backdrop {
+      color: #8d9091;
       box-shadow: none; }
   GtkCalendar.button, .header-bar GtkCalendar.button.titlebutton,
   .titlebar GtkCalendar.button.titlebutton,
@@ -3855,9 +3848,10 @@ GtkCalendar {
     .titlebar GtkCalendar.button.titlebutton:backdrop,
     GtkCalendar.header GtkCalendar.button.titlebutton:backdrop {
       color: rgba(141, 144, 145, 0.45); }
-  GtkCalendar.highlight {
+  GtkCalendar.highlight, GtkCalendar.highlight:backdrop {
     color: alpha(currentColor,0.55); }
   GtkCalendar:backdrop {
+    color: #323232;
     border-color: #a8a8a8; }
 
 /***********
@@ -4048,29 +4042,34 @@ GtkFileChooserDialog .dialog-action-box {
 /***********
  * Sidebar *
  ***********/
-.sidebar,
-.sidebar .view {
+.sidebar {
   border: none;
   background-color: #fafafa; }
-  .sidebar .scrollbar.trough,
-  .sidebar .view .scrollbar.trough {
+  .sidebar .scrollbar.trough {
     background-color: lightgray;
     border-radius: 6px;
     border-width: 2px;
     border-color: transparent; }
-  .sidebar .scrollbar.slider,
-  .sidebar .view .scrollbar.slider {
+  .sidebar .scrollbar.slider {
     background-color: #fafafa; }
-    .sidebar .scrollbar.slider:hover,
-    .sidebar .view .scrollbar.slider:hover {
+    .sidebar .scrollbar.slider:hover {
       background-color: white; }
-  .sidebar:backdrop,
-  .sidebar .view:backdrop {
+  .sidebar:backdrop {
     background-color: #fafafa; }
-  .sidebar:selected,
-  .sidebar .view:selected {
+  .sidebar:selected {
     background-color: #4a90d9; }
 
+GtkPlacesSidebar.sidebar .view {
+  color: #2e3436;
+  background-color: transparent; }
+  GtkPlacesSidebar.sidebar .view:backdrop {
+    color: #8d9091; }
+  GtkPlacesSidebar.sidebar .view:selected {
+    color: #ffffff;
+    background-color: #4a90d9; }
+    GtkPlacesSidebar.sidebar .view:selected:backdrop {
+      color: #fcfcfc; }
+
 GtkPaned {
   margin: 0 8px 8px 0; }
   GtkPaned:dir(rtl) {
@@ -4352,6 +4351,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #2e3436;
+ define-color theme_text_color black;
 @define-color theme_bg_color #ededed;
 @define-color theme_base_color #ffffff;
 @define-color theme_selected_bg_color #4a90d9;
@@ -4360,6 +4360,7 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color insensitive_fg_color #8d9091;
 @define-color insensitive_base_color #ffffff;
 @define-color theme_unfocused_fg_color #8d9091;
+ define-color theme_unfocused_text_color #323232;
 @define-color theme_unfocused_bg_color #ededed;
 @define-color theme_unfocused_base_color #fcfcfc;
 @define-color theme_unfocused_selected_bg_color #4a90d9;
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]