Reworked granite support

gtk-3.0/apps/gnome-applications.css

@@ -261,3 +261,6 @@ GeditFloatingSlider .not-found {
 /***********************
  * gnome control center *
  ***********************/
+CcShellItemView.view {
+    background-color: @theme_bg_color;
+}

gtk-3.0/apps/granite-widgets.css

@@ -1,27 +1,32 @@
-/*********************
+/********************
- * dynamic notebooks *
+ * dynamic notebook *
- *********************/
+ ********************/
 .dynamic-notebook {
     background-color: shade(@theme_bg_color, 1.08);
     background-image: none;
 }
 
+.dynamic-notebook GtkLabel,
+.dynamic-notebook GtkImage {
+    color: alpha(@theme_fg_color, 0.5);
+}
+
 .dynamic-notebook .notebook {
     -GtkNotebook-tab-overlap: 3px;
     -GtkNotebook-initial-gap: 5px;
 
     border-width: 1px 0 0 0;
+    border-color: shade(@theme_bg_color, 0.8);
     border-radius: 0;
+    padding: 1px 0 0 0;
 }
 
 .dynamic-notebook .notebook tab {
-    padding: 2px 3px 0 3px;
+    padding: 3px;
-    border-width: 0 1px 0 0;
+    border-color: shade(@theme_bg_color, 0.85);
-    border-color: shade(@theme_bg_color, 0.8);
+    border-radius: 2px;
-    border-radius: 0;
+    background-color: shade(@theme_bg_color, 0.9);
-    background-color: transparent;
     background-image: none;
-    color: @theme_fg_color;
 }
 
 .dynamic-notebook .notebook tab:nth-child(first) {
@@ -36,26 +41,30 @@
     color: @theme_fg_color;
 }
 
-.dynamic-notebook .button,
+.dynamic-notebook .notebook tab .entry {
+    border-radius: 2px;
+    padding: 4px 3px;
+}
+
 .dynamic-notebook .button:hover,
 .dynamic-notebook .button:hover:active,
 .dynamic-notebook .notebook .button,
 .dynamic-notebook .notebook .button:hover,
 .dynamic-notebook .notebook .button:hover:active {
-    padding: 0;
+    border-color: shade(@theme_bg_color, 0.7);
-    background-color: transparent;
+    background-color: shade(@theme_bg_color, 1.10);
     background-image: none;
 }
 
+.dynamic-notebook .button:hover:active,
+.dynamic-notebook .notebook .button:hover:active {
+    border-color: shade(@theme_bg_color, 0.7);
+    color: shade(@theme_fg_color, 0.7);
+}
+
 /****************
  * content view *
  ****************/
-.content-view,
-.content-view *,
-.content-view GtkViewport {
-    background-color: @theme_base_color;
-}
-
 .content-view-window {
     border-width: 1px;
     border-style: solid;
@@ -65,59 +74,253 @@
     color: @theme_fg_color;
 }
 
+.content-view,
+.content-view GtkViewport {
+    background-color: @theme_base_color;
+}
+
+.content-view * {
+    background-color: transparent;
+    background-image: none;
+}
+
 .content-view .entry {
     background-color: @theme_base_color;
     background-image: none;
     color: @theme_text_color;
 }
 
-.content-view .title,
-.content-view .option-title {
-    color: @theme_text_color;
-}
-
-.content-view .subtitle,
-.content-view .option-description {
-    color: mix(@theme_fg_color, @theme_bg_color, 0.5);
-}
-
 .content-view .button {
     border-style: solid;
+    border-color: shade(@theme_bg_color, 0.8);
     border-radius: 2px;
     background-color: shade(@theme_bg_color, 1.08);
     background-image: none;
     color: @theme_fg_color;
 }
 
-.content-view .button:active,
+.content-view .button:hover {
-.content-view .button:active:hover {
+    border-color: shade(@theme_bg_color, 0.7);
     background-color: shade(@theme_bg_color, 1.10);
     background-image: none;
 }
 
+.content-view .button:active {
+    border-color: shade(@theme_bg_color, 0.8);
+    background-color: shade(@theme_bg_color, 0.95);
+    background-image: none;
+}
+
+.content-view .button:active:hover {
+    border-color: shade(@theme_bg_color, 0.7);
+    color: shade(@theme_fg_color, 0.7);
+}
+
 .content-view .button:insensitive {
     background-color: shade(@theme_bg_color, 0.9);
     background-image: none;
 }
 
 .content-view .help_button * {
-    color: @theme_text_color;
+    color: @theme_fg_color;
 }   
 
 .content-view .toolbar {
+    -GtkWidget-window-dragging: true;
+
     padding: 1px;
     border-width: 0 0 1px 0;
     border-style: solid;
     border-color: shade(@theme_bg_color, 0.8);
     background-color: @theme_bg_color;
     background-image: none;
-
-    -GtkWidget-window-dragging: true;
 }
 
-/*******************
+/**************
- * album list view *
+ * sourcelist *
- *******************/
+ *************/
+.source-list,
+.source-list.view {
+    border-radius: 0;
+    background-color: @theme_bg_color;
+    color: mix(@theme_fg_color, @theme_bg_color, 0.1);
+}
+
+.source-list {
+    -GtkTreeView-horizontal-separator: 1;
+    -GtkTreeView-vertical-separator: 1;
+}
+
+.source-list.view:selected,
+.source-list.view:prelight:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
+.source-list.view:prelight {
+    background-color: shade(@theme_bg_color, 1.08);
+}
+
+.source-list.badge,
+.source-list.badge:prelight,
+.source-list.badge:selected,
+.source-list.badge:prelight:selected {
+    margin: 0 3px;
+    padding: 0 6px;
+    border-width: 0;
+    border-radius: 10px;
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+    color: @theme_selected_fg_color;
+}
+
+/*************
+ * statusbar *
+ *************/
+GraniteWidgetsStatusBar {
+    padding: 1px;
+    background-color: @theme_bg_color;
+    background-image: none;
+    box-shadow: inset 0 1px shade(@theme_bg_color, 0.8);
+}
+
+/***********
+ * popover *
+ **********/
+GraniteWidgetsPopOver {
+    -GraniteWidgetsPopOver-arrow-width: 21;
+    -GraniteWidgetsPopOver-arrow-height: 12;
+    -GraniteWidgetsPopOver-border-radius: 2px;
+    -GraniteWidgetsPopOver-border-width: 1;
+    -GraniteWidgetsPopOver-shadow-size: 12;
+
+    margin: 0;
+    border-style: solid;
+    border-color: shade(@menu_bg_color, 0.8);
+    color: @menu_fg_color;
+}
+
+.popover_bg {
+    background-color: transparent;
+    background-image: -gtk-gradient(linear,
+                     left top, left bottom,
+                     from (@menu_bg_color),
+                     to (@menu_bg_color));
+}
+
+GraniteWidgetsPopOver .sidebar.view,
+GraniteWidgetsPopOver * {
+    background-color: transparent;
+    color: @menu_fg_color;
+}
+
+GraniteWidgetsPopOver .sidebar.view:selected,
+GraniteWidgetsPopOver .sidebar.view:selected:focus,
+GraniteWidgetsPopOver *:selected,
+GraniteWidgetsPopOver *:selected:focus {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+}
+
+GraniteWidgetsPopOver .button {
+    border-color: shade(@menu_bg_color, 0.8);
+    background-color: shade(@menu_bg_color, 1.08);
+    background-image: none;
+    color: @menu_fg_color;
+
+}
+
+GraniteWidgetsPopOver .button:hover {
+    border-color: shade(@menu_bg_color, 0.7);
+    background-color: shade(@menu_bg_color, 1.10);
+    background-image: none;
+    color: shade(@menu_fg_color, 0.7);
+}
+
+GraniteWidgetsPopOver .button:active {
+    border-color: shade(@menu_bg_color, 0.8);
+    background-color: shade(@menu_bg_color, 0.95);
+    background-image: none;
+}
+
+GraniteWidgetsPopOver .button:active:hover {
+    border-color: shade(@menu_bg_color, 0.7);
+    color: shade(@menu_fg_color, 0.7);
+}
+
+GraniteWidgetsPopOver .entry {
+    border-color: shade(@menu_bg_color, 0.7);
+    background-color: @menu_bg_color;
+    background-image: none;
+    color: @menu_fg_color;
+}
+
+GraniteWidgetsPopOver .entry:active,
+GraniteWidgetsPopOver .entry:focus {
+    border-color: shade(@menu_bg_color, 0.7);
+}
+
+GraniteWidgetsPopOver *.separator {
+    border-color: shade(@menu_bg_color, 0.9);
+    color: transparent;
+}
+
+.button.app {
+    border-width: 0;
+    border-radius: 2px;
+    background-color: transparent;
+}
+
+.button.app:hover {
+    border-color: shade(@theme_selected_bg_color, 0.9);
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+    color: @theme_selected_fg_color;
+}
+
+.button.app:focus {
+    border-color: shade(@theme_selected_bg_color, 0.9);
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+    color: @theme_selected_fg_color;
+}
+
+/********
+ * gala *
+ *******/
+.gala-workspaces-background {
+    border-width: 1px 0 0 0;
+    border-color: shade(@panel_bg_color, 0.8);
+    background-color: @panel_bg_color;
+    background-image: none;
+}
+
+.gala-workspace-selected {
+    border-width: 1px;
+    border-radius: 2px;
+    border-color: shade(@theme_selected_bg_color, 0.9);
+    background-color: @theme_selected_bg_color;
+    background-image: none;
+}
+
+/*********
+ * files *
+ ********/
+.files-overlay-bar {
+    margin: 3px;
+    padding: 3px 6px;
+    border-width: 0;
+    border-radius: 2px;
+    background-color: @theme_tooltip_bg_color;
+}
+
+.files-overlay-bar* {
+    color: @theme_tooltip_fg_color;
+}
+
+/*********
+ * noise *
+ ********/
 .album-list-view,
 .album-list-view * {
     border-color: shade(@theme_bg_color, 0.8);
@@ -140,103 +343,42 @@
     background-color: shade(@theme_base_color, 0.97);
 }
 
+
 .album-list-view GtkTreeView row:nth-child(odd) {
     border-width: 0;
     border-style: none;
     background-color: shade(@theme_base_color, 1.0);
 }
 
-/*************
+.album-list-view GtkTreeView row:selected {
- * statusbar *
+    background-color: @selected_bg_color;
- *************/
+	color: @selected_fg_color;
-GraniteWidgetsStatusBar {
-    padding: 1px;
-    background-color: @theme_bg_color;
-    background-image: none;
-    box-shadow: inset 0 1px shade(@theme_bg_color, 0.8);
 }
 
-/***********
+/**********
- * popover *
+ * notify *
- ***********/
+ *********/
-GraniteWidgetsPopOver {
+.notify {
-    -GraniteWidgetsPopOver-arrow-width: 24;
+    border-width: 1px;
-    -GraniteWidgetsPopOver-arrow-height: 12;
-    -GraniteWidgetsPopOver-border-radius: 5px;
-    -GraniteWidgetsPopOver-border-width: 1;
-    -GraniteWidgetsPopOver-shadow-size: 15;
-
-    margin: 0;
     border-style: solid;
-    border-color: shade(@menu_bg_color, 0.8);
+    border-color: shade(@theme_base_color, 0.7);
-    color: @menu_fg_color;
-}
-
-.popover_bg {
-    background-color: transparent;
-    background-image: -gtk-gradient(linear,
-                     left top, left bottom,
-                     from (@menu_bg_color),
-                     to (@menu_bg_color));
-}
-
-GraniteWidgetsPopOver .sidebar.view,
-GraniteWidgetsPopOver * {
-    background-color: transparent;
-    color: @menu_fg_color;
-}
-
-GraniteWidgetsPopOver .button {
-    border-color: shade(@menu_bg_color, 0.8);
-    background-color: shade(@menu_bg_color, 1.08);
-    background-image: none;
-    color: @menu_fg_color;
-}
-
-GraniteWidgetsPopOver .button:hover {
-    border-color: shade(@menu_bg_color, 0.7);
-    background-color: shade(@menu_bg_color, 1.10);
-    background-image: none;
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-    border-color: shade(@menu_bg_color, 0.8);
-    background-color: shade(@menu_bg_color, 0.95);
-    background-image: none;
-}
-
-GraniteWidgetsPopOver .entry {
-    border-color: shade(@menu_bg_color, 0.7);
-    background-color: @menu_bg_color;
-    background-image: none;
-    color: @menu_fg_color;
-}
-
-GraniteWidgetsPopOver .entry:active,
-GraniteWidgetsPopOver .entry:focus {
-    border-color: shade(@menu_bg_color, 0.7);
-}
-
-.button.app {
-    border-width: 0;
     border-radius: 2px;
+    background-color: @theme_base_color;
+    color: @theme_text_color;
 }
 
-.app:hover,
+.notify .low {
-.app:focus {
-    border-color: shade(@theme_selected_bg_color, 0.90);
-    background-color: @theme_selected_bg_color;
-    background-image: none;
-    color: @theme_selected_fg_color;
 }
 
-/*************
+.notify .critical {
- * wingpanel *
+}
- *************/
+
+/*********
+ * panel *
+ ********/
 .panel {
-    background-color: alpha(#000, 0.6);
+    background-color: @panel_bg_color;
-    color: #fff;
+    color: @panel_fg_color;
 }
 
 .shadow {
@@ -252,7 +394,7 @@ GraniteWidgetsPopOver .entry:focus {
 .wingpanel-indicator-button {
     padding: 0 2px;
     background-color: transparent;
-    color: #fff;
+    color: @panel_fg_color;
 }
 
 .composited-indicator.menuitem:active,
@@ -260,21 +402,3 @@ GraniteWidgetsPopOver .entry:focus {
     border-style: none;
     background-image: none;
 }
-
-/**********
- * notify *
- **********/
-.notify {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.8);
-    border-radius: 2px;
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-.notify .low {
-}
-
-.notify .critical {
-}

gtk-3.0/gtk-widgets.css

@@ -424,13 +424,14 @@ column-header .button:active {
 }
 
 column-header .button {
-    border-color: shade(@theme_bg_color, 0.8);
+    border-color: shade(@theme_base_color, 0.8);
-    background-color: shade(@theme_bg_color, 1.08);
+    background-color: shade(@theme_base_color, 0.95);
     background-image: none;
 }
 
 column-header .button:hover {
-    background-color: shade(@theme_bg_color, 1.10);
+    border-color: shade(@theme_base_color, 0.7);
+    background-color: shade(@theme_base_color, 0.97);
     background-image: none;
 }
 
@@ -438,6 +439,49 @@ column-header:last-child .button {
     border-width: 0 0 1px 0;
 }
 
+/****************
+ * content view *
+ ****************/
+.content-view.view {
+    background-color: @theme_base_color;
+}
+
+.content-view.view:prelight {
+    background-color: alpha(@theme_selected_bg_color, 0.6);
+}
+
+.content-view.view:selected,
+.content-view.view:active {
+    background-color: @theme_selected_bg_color;
+}
+
+.content-view.view:insensitive {
+    background-color: shade(@theme_base_color, 0.9);
+}
+
+GdMainIconView.content-view {
+    -GdMainIconView-icon-size: 40;
+}
+
+GtkIconView.content-view.check {
+    background-color: transparent;
+}
+
+GtkIconView.content-view.check:active {
+    background-color: transparent;
+}
+
+.content-view.view.check,
+.content-view.view.check:active {
+    background-color: transparent;
+}
+
+GtkIconView.content-view.check:prelight,
+GtkIconView.content-view.check:insensitive,
+GtkIconView.content-view.check:selected {
+    background-color: transparent;
+}
+
 /****************
  * drawing area *
  ****************/
@@ -496,7 +540,7 @@ GtkCalendar.button:insensitive {
 GtkCalendar.highlight {
     border-width: 0;
     background-color: transparent;
-    color: @selected_bg_color;
+    color: @theme_selected_bg_color;
 }
 
 /******************
@@ -595,8 +639,10 @@ GtkIconView.view.cell:selected:focus {
     border-style: solid;
     border-color: shade(@theme_selected_bg_color, 0.9);
     border-radius: 2px;
-    background-color: @theme_selected_bg_color;
+    background-image: -gtk-gradient(linear, left top, left bottom,
-    background-image: none;
+                                     from (@theme_selected_bg_color),
+                                     to (@theme_selected_bg_color));
+
     color: @theme_selected_fg_color;
 }
 
@@ -774,7 +820,7 @@ GtkInfoBar {
 
 .dim-label:selected,
 .dim-label:selected:focus {
-    color: mix(@theme_selected_fg_color, @theme_bg_color, 0.5);
+    color: mix(@theme_selected_fg_color, @theme_selected_bg_color, 0.5);
 }
 
 .dnd {