Fixed Nautilus problems, added flat button class, fixed toolbar butto…

…n border problems
fxnkedup · Sep 26, 2014 · f6c78a5 · f6c78a5
1 parent 1f23eff
commit f6c78a5
Show file tree

Hide file tree

Showing 6 changed files with 70 additions and 41 deletions.
diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css
@@ -2,7 +2,7 @@
  * check and radio *
  *******************/
 /* draw regular check and radio items using our assets */
-.check,
+.check:focus,
 .check row:selected,
 .check row:selected:focus {
     background-image: url("assets/checkbox-unchecked.svg");
@@ -134,4 +134,4 @@ GtkIconView.content-view.cell.check:active {
     background-image: url("assets/pane-handle-vertical.svg");
     background-repeat: no-repeat;
     background-position: center center;
-}
+}
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
@@ -508,40 +508,17 @@ GtkBubbleWindow .toolbar {
 /**************
  * List boxes *
  **************/
-EggListBox {
-    background-color: @base_color;
-}	
-
-EggListBox:hover {
-    background-color: @base_color;
-}
-
-EggListBox:selected {
-    color: @theme_selected_fg_color;
-}
-
-.list {
-    background-color: @base_color;
-}
-
-.list-row:hover {
-    background-color: @base_color;
-}
-
-.list-row:selected {
-    color: @theme_selected_fg_color;
-    background-color: @theme_base_color;
+.list-row,
+.list-row.button {
+    background-color: transparent;
+    border: none;
+    color: @theme_fg_color;
 }
 
-EggListBox.content-view:hover,
-.content-view.cell:hover {
-    background-color: @theme_bg_color;
+/******************
+ * Places Sidebar *
+ ******************/
+
+GtkPlacesSidebar .separator {
+   color: shade (@theme_bg_color, 0.8);
 }
-
-EggListBox.content-view:selected,
-EggListBox.content-view:active,
-.content-view.cell:selected,
-.content-view.cell:active {
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-}
diff --git a/gtk-3.0/widgets/button.css b/gtk-3.0/widgets/button.css
@@ -44,7 +44,8 @@ BackgroundBox .button:active {
     background-image: none;
 }
 
-.button:active {
+.button:active,
+.button:checked {
     background-color: shade(@button_bg_color, 0.9);
     background-image: none;
     color: shade(mix(#ff0000, @theme_selected_fg_color, 0.75), 1.35);
@@ -103,6 +104,50 @@ EvSidebar GtkToggleButton.button:active {
     background-color: @theme_bg_color;
 }
 
+/****************
+* "flat" button *
+*****************/
+
+.button.flat,
+.toolbar .button.flat {
+    border: none;
+    background-color: @theme_base_color;
+    background-image: none;
+    color: @theme_fg_color;
+}
+
+.button.flat:hover {
+    transition: color 150ms ease-in;
+    border: none;
+    color: shade(@theme_selected_fg_color, 1.15);
+}
+
+.toolbar .button.flat:hover {
+    background-color: @toolbar_bg_color; 
+}
+
+.button.flat:active,
+.button.flat:active:focus,
+.button.flat:active:checked,
+.toolbar .button.flat:active,
+.toolbar .button.flat:active:focus,
+.toolbar .button.flat:checked {
+    border: none;
+    color: shade(@theme_selected_fg_color, 0.97);
+}
+
+.button.flat:active:hover,
+.toolbar .button.flat:active:hover {
+    border: none;
+    color: shade (@theme_selected_fg_color, 1.15);
+}
+
+.button.flat:insensitive,
+.toolbar .button.flat:insensitive {
+    border: none;
+    color: shade (@theme_bg_color, 0.5);
+}
+
 /****************
 * linked button *
 *****************/

diff --git a/gtk-3.0/widgets/csd.css b/gtk-3.0/widgets/csd.css
@@ -103,7 +103,8 @@
     color: shade(@menu_selected_fg_color, 0.87);
 }
 
-.titlebar .button:active {
+.titlebar .button:active,
+.titlebar .button:checked {
     background-color: @wm_bg;
     color: @menu_selected_fg_color;
 }

diff --git a/gtk-3.0/widgets/popover.css b/gtk-3.0/widgets/popover.css
@@ -18,6 +18,11 @@ GtkPopover.osd {
     box-shadow: 0 2px 7px 3px alpha(black, 0.5);
 }
 
+.popover .button {
+    background-color: transparent;
+    border-color: shade(@theme_bg_color, 0.8);
+}
+
 GtkPopover > .list,
 GtkPopover > .view,
 GtkPopover > .toolbar {

diff --git a/gtk-3.0/widgets/progress-scale.css b/gtk-3.0/widgets/progress-scale.css
@@ -4,16 +4,17 @@
 GtkScale,
 GtkProgressBar {
     padding: 0;
-    border-width: 0;
+    border-width: 0px;
     border-radius: 0;
+    border-style: solid;
 }
 
 .progressbar,
 .progressbar row,
 .progressbar row:hover,
 .progressbar row:selected,
 .progressbar row:selected:focus {
-    border-width: 3px;
+    border-width: 0px;
     border-style: solid;
     border-color: shade(@theme_base_color, 0.9);
     background-color: shade(@theme_selected_fg_color, 1.15);
@@ -30,7 +31,7 @@ GtkProgressBar {
 .trough row:hover,
 .trough row:selected,
 .trough row:selected:focus {
-    border-width: 1px;
+    border-width: 3px;
     border-style: solid;
     border-color: shade(@theme_base_color, 0.9);
     background-color: shade(@theme_base_color, 0.9);