Fixed theme parsing errors. Also began workign on Unity decoration su…

…pport.
tdrewett · Feb 13, 2014 · 748dda7 · 748dda7
1 parent 4747f39
commit 748dda7
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 33 deletions.
diff --git a/gtk-3.0/apps/granite-widgets.css b/gtk-3.0/apps/granite-widgets.css
@@ -24,8 +24,6 @@
 
 
 .dynamic-notebook .notebook {
-    -GtkNotebook-tab-overlap: 3px;
-    -GtkNotebook-initial-gap: 12px;
 
     border-width: 1px 0 0 0;
     border-color: shade(@theme_bg_color, 0.8);
@@ -59,22 +57,6 @@
     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 {
-    border-color: transparent;
-    background-color: transparent;
-    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);
-}
-
 .dynamic-notebook .menu GtkLabel {
     color: @menu_fg_color;
 }
@@ -197,9 +179,9 @@
 /**********************
  * secondary toolbars *
  **********************/
- 
+
 /*Example is the Find toolbar in Scratch
- 
+
 .secondary-toolbar.toolbar {
     padding: 2px;
     border-color: shade(@toolbar_bg_color, 1.0);
@@ -584,7 +566,7 @@ BirdieWidgetsTweetList * {
 }
 
 .composited-indicator,
-.wingpanel-app-button, 
+.wingpanel-app-button,
 .wingpanel-indicator-button {
     padding: 0 2px;
     background-color: transparent;
@@ -596,4 +578,4 @@ BirdieWidgetsTweetList * {
 .composited-indicator.menuitem:prelight {
     border-style: none;
     background-image: none;
-}
+}
diff --git a/gtk-3.0/apps/unity.css b/gtk-3.0/apps/unity.css
@@ -25,3 +25,33 @@ UnityPanelWidget,
     background-image: none;
     color: shade(@panel_fg_color, 1.08);
 }
+
+/*---------------------------------------------------*/
+
+UnityDecoration.top {
+    border: 1px solid @wm_border_focused;
+    border-bottom-width: 0;
+    border-radius: 0 0 0 0; 
+    padding: 1px 8px 0 8px; 
+    background-color: @wm_bg; 
+    color: @wm_title_focused; 
+}
+
+UnityDecoration.top:backdrop {
+    border: 1px solid @wm_border_unfocused;
+    border-bottom-width: 0;
+    background-color: @wm_bg;
+    color: @wm_title_unfocused;
+}
+
+UnityDecoration.left,
+UnityDecoration.right,
+UnityDecoration.bottom {
+    background-color: @wm_border_focused;
+}
+
+UnityDecoration.left:backdrop,
+UnityDecoration.right:backdrop,
+UnityDecoration.bottom:backdrop {
+    background-color: @wm_border_unfocused;
+}
diff --git a/gtk-3.0/gtk-widgets.css b/gtk-3.0/gtk-widgets.css
@@ -20,7 +20,7 @@
     -GtkMenu-horizontal-padding: 0;
     -GtkMenu-vertical-padding: 0;
     -GtkNotebook-initial-gap: 0;
-    -GtkPaned-handle-size: 4;
+    -GtkPaned-handle-size: 2;
     -GtkProgressBar-min-horizontal-bar-height: 12;
     -GtkProgressBar-min-vertical-bar-width: 12;
     -GtkRange-slider-width: 12;
@@ -336,8 +336,7 @@ GtkLabel:insensitive {
  * pane separator *
  ******************/
 .pane-separator {
-    background-color: @theme_bg_color;
-    color: transparent;
+    background-color: shade(@theme_bg_color, 0.87);
 }
 
 /*************
@@ -545,4 +544,4 @@ EggListBox.content-view:active,
 .content-view.cell:active {
     background-color: @theme_selected_fg_color;
     background-image: none;
-}
+}
diff --git a/gtk-3.0/widgets/button.css b/gtk-3.0/widgets/button.css
@@ -24,7 +24,7 @@ BackgroundBox .button:hover {
 }
 
 BackgroundBox .button:active {
-    transition: 100px linear;
+    transition: 100ms linear;
     color: shade(@theme_selected_fg_color, 1.0);
     background-color: @theme_bg_color;
     border-color: @theme_fg_color;

diff --git a/gtk-3.0/widgets/cell-row.css b/gtk-3.0/widgets/cell-row.css
@@ -11,6 +11,7 @@
     background-color: inherit;
     color: @theme_selected_fg_color;
     background-image: none;
+    font-weight: bold;
 }
 
 .cell:selected.image:hover {
@@ -33,4 +34,5 @@ row:selected:focus {
     background-color: transparent;
     color: @theme_selected_fg_color;
     background-image: none;
-}
+    font-weight: bold;
+}
diff --git a/gtk-3.0/widgets/csd.css b/gtk-3.0/widgets/csd.css
@@ -104,7 +104,7 @@
 }
 
 .titlebar .button:active {
-    background-color: wm_bg;
+    background-color: @wm_bg;
     color: @menu_selected_fg_color;
 }
 

diff --git a/gtk-3.0/widgets/sidebar.css b/gtk-3.0/widgets/sidebar.css
@@ -25,4 +25,4 @@
 
 .sidebar .frame {
     border-width: 0;
-}
+}
diff --git a/gtk-3.0/widgets/spinbutton.css b/gtk-3.0/widgets/spinbutton.css
@@ -5,7 +5,7 @@
     padding: 3px 8px;
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
-    border-right-width: transparent;
+    border-right-width: 0;
 }
 
 .spinbutton.button {
@@ -73,4 +73,4 @@
     border-width: 1px;
     border-style: solid;
     border-radius: 0;
-}
+}
diff --git a/gtk-3.0/widgets/toolbar.css b/gtk-3.0/widgets/toolbar.css
@@ -79,7 +79,7 @@ GthEmbeddedDialog .button:active:focus {
 }
 
 .primary-toolbar .raised .button:active,
-.primary-toolbar .raised.button:active,
+.primary-toolbar .raised.button:active
 {
     transition: 200ms linear;
     border-radius: 0px;
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,4 +25,4 @@ @@
     .sidebar .frame {
         border-width: 0;
-    }
+    }