Merge pull request #41 from shimmerproject/master

Various fixes

gtk-3.0/apps/gnome-applications.css

@@ -22,10 +22,10 @@ PanelSeparator {
 }
 
 .gnome-panel-menu-bar,
-PanelApplet > Gtkpanel.panel,
+PanelApplet > GtkMenuBar.menubar,
-PanelApplet > Gtkpanel.panel.menuitem,
+PanelApplet > GtkMenuBar.menubar.menuitem,
-Panelpanel.panel,
+PanelMenuBar.menubar,
-Panelpanel.panel.menuitem {
+PanelMenuBar.menubar.menuitem {
     -Panelpanel-icon-visible: true;
 
     border-width: 0;

gtk-3.0/gtk-widgets.css

@@ -56,8 +56,8 @@
  * base states *
  ***************/
 .background {
-    color: @theme_fg_color;
     background-color: @theme_bg_color;
+    color: @theme_fg_color;
 }
 
 .background.client-decorated {
@@ -505,6 +505,9 @@ row:selected:focus {
     background-color: @theme_selected_bg_color;
     background-image: none;
     color: @theme_selected_fg_color;
+
+    -GtkWidget-focus-padding: 1;
+    -GtkWidget-focus-line-width: 0;
 }
 
 /*******************
@@ -1104,29 +1107,34 @@ GtkTreeMenu .menuitem * {
     padding: 0;
     border-width: 1px;
     border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
+    border-color: shade(@theme_base_color, 0.7);
     border-radius: 2px;
-    background-color: shade(@theme_bg_color, 1.08);
+    background-color: @theme_base_color;
     background-image: none;
     background-clip: border-box;
 }
 
+.notebook GtkViewport {
+    background-color: @theme_base_color;
+    color: @theme_text_color;
+}
+
 .notebook tab {
     padding: 3px;
-    border-color: shade(@theme_bg_color, 0.85);
+    border-color: shade(@theme_base_color, 0.75);
     border-radius: 2px;
-    background-color: shade(@theme_bg_color, 0.9);
+    background-color: shade(@theme_base_color, 0.85);
     background-image: none;
 }
 
 .notebook tab:active {
-    border-color: shade(@theme_bg_color, 0.8);
+    border-color: shade(@theme_base_color, 0.7);
-    background-color:shade(@theme_bg_color, 1.08);
+    background-color: @theme_base_color;
     background-image: none;
 }
 
 .notebook tab GtkLabel {
-    color: @theme_fg_color;
+    color: @theme_text_color;
 }
 
 .notebook tab.top {
@@ -1728,6 +1736,7 @@ GtkComboBox .separator {
                       -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
                       -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent)),
                       -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+
     background-position: 14% 14%, 0% 50%, 14% 86%, 50% 100%, 86% 86%, 100% 50%, 86% 14%, 50% 0%;
     background-size: 15% 15%;
     background-repeat: no-repeat;
@@ -1742,6 +1751,7 @@ GtkComboBox .separator {
                       -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.250)), to(transparent)),
                       -gtk-gradient(radial, center center, 0, center center, 0.5, to(alpha(currentColor, 0.125)), to(transparent)),
                       -gtk-gradient(radial, center center, 0, center center, 0.5, to(currentColor), to(transparent));
+
     animation: spinner 1s infinite linear;
 }
 
@@ -1810,8 +1820,8 @@ GtkSwitch.trough {
 }
 
 GtkSwitch.trough:active {
-    border-color: shade(@theme_selected_bg_color, 0.9);
+    border-color: shade(@success_color, 0.9);
-    background-color: @theme_selected_bg_color;
+    background-color: @success_color;
     background-image: none;
     color: @theme_selected_fg_color;
 }
@@ -2261,8 +2271,7 @@ GtkColorButton.button {
  ************/
 GtkTreeView {
     -GtkTreeView-vertical-separator: 0;
-
+    -GtkWidget-focus-line-width: 0;
-    -GtkWidget-focus-line-width: 1;
     -GtkWidget-focus-padding: 1;
 }
 
@@ -2291,6 +2300,12 @@ GtkViewport.frame {
     color: @theme_text_color;
 }
 
+.view:insensitive,
+.view:insensitive:insensitive {
+    background-color: shade(@theme_base_color, 0.9);
+    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
+}
+
 .view:selected,
 .view:selected:focus {
     background-color: @theme_selected_bg_color;

gtk-3.0/gtk.css

@@ -23,16 +23,16 @@
 @define-color dark_shadow #000;
 
 /* misc colors used by gtk+ */
-@define-color info_fg_color rgb (152, 152, 89);
+@define-color info_fg_color rgb (102, 102, 39);
 @define-color info_bg_color rgb (252, 252, 189);
-@define-color warning_fg_color rgb (0, 0, 0);
+@define-color warning_fg_color rgb (102, 35, 0);
 @define-color warning_bg_color rgb (250, 173, 61);
-@define-color question_fg_color rgb (255, 255, 255);
+@define-color question_fg_color rgb (255, 232, 214);
 @define-color question_bg_color rgb (214, 73, 55);
-@define-color error_fg_color rgb (255, 255, 255);
+@define-color error_fg_color rgb (255, 237, 237);
 @define-color error_bg_color rgb (237, 54, 54);
 @define-color link_color #fc6f5d;
-@define-color success_color #4e9a06;
+@define-color success_color #53a93f;
 @define-color error_color #cc0000;
 
 /* widget colors */