Fixed checkbox and radio rendering issues, entry insensitive theming …

…and combobox tweaks
juhp · Oct 19, 2014 · 156b9d0 · 156b9d0
1 parent f6c78a5
commit 156b9d0
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 20 deletions.
diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css
@@ -2,76 +2,79 @@
  * 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");
+    -gtk-icon-source: url("assets/checkbox-unchecked.svg");
 }
 
 .check:insensitive,
 .check row:selected:insensitive,
 .check row:selected:focus:insensitive {
-    background-image: url("assets/checkbox-unchecked-insensitive.svg");
+    -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.svg");
 }
 
 .check:active,
+.check:checked,
 .check row:selected:active,
 .check row:selected:focus:active {
-    background-image: url("assets/checkbox-checked.svg");
+    -gtk-icon-source: url("assets/checkbox-checked.svg");
 }
 
 .check:active:insensitive,
 .check row:selected:active:insensitive,
 .check row:selected:focus:active:insensitive {
-    background-image: url("assets/checkbox-checked-insensitive.svg");
+    -gtk-icon-source: url("assets/checkbox-checked-insensitive.svg");
 }
 
 .check:inconsistent,
 .check row:selected:inconsistent,
 .check row:selected:focus:inconsistent {
-    background-image: url("assets/checkbox-mixed.svg");
+    -gtk-icon-source: url("assets/checkbox-mixed.svg");
 }
 
 .check:inconsistent:insensitive,
 .check row:selected:inconsistent:insensitive,
 .check row:selected:focus:inconsistent:insensitive {
-    background-image: url("assets/checkbox-mixed-insensitive.svg");
+    -gtk-icon-source: url("assets/checkbox-mixed-insensitive.svg");
 }
 
 .radio,
 .radio row:selected,
 .radio row:selected:focus {
-    background-image: url("assets/radio-unselected.svg");
+    -gtk-icon-source: url("assets/radio-unselected.svg");
 }
 
 .radio:insensitive,
 .radio row:selected:insensitive,
 .radio row:selected:focus:insensitive {
-    background-image: url("assets/radio-unselected-insensitive.svg");
+    -gtk-icon-source: url("assets/radio-unselected-insensitive.svg");
 }
 
 .radio:active,
+.radio:checked,
 .radio row:selected:active,
 .radio row:selected:focus:active {
-    background-image: url("assets/radio-selected.svg");
+    -gtk-icon-source: url("assets/radio-selected.svg");
 }
 
 .radio:active:insensitive,
 .radio row:selected:active:insensitive,
 .radio row:selected:focus:active:insensitive {
-    background-image: url("assets/radio-selected-insensitive.svg");
+    -gtk-icon-source: url("assets/radio-selected-insensitive.svg");
 }
 
 .radio:inconsistent,
 .radio row:selected:inconsistent,
 .radio row:selected:focus:inconsistent {
-    background-image: url("assets/radio-mixed.svg");
+    -gtk-icon-source: url("assets/radio-mixed.svg");
 }
 
 .radio:inconsistent:insensitive,
 .radio row:selected:inconsistent:insensitive,
 .radio row:selected:focus:inconsistent:insensitive {
-    background-image: url("assets/radio-mixed-insensitive.svg");
+    -gtk-icon-source: url("assets/radio-mixed-insensitive.svg");
 }
 
 .menuitem.check:active {

diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
@@ -102,4 +102,4 @@
 @import url("apps/unity.css");
 @import url("apps/xfce.css");
 @import url("apps/budgie.css");
-@import url("apps/nemo.css");
+@import url("apps/nemo.css");
diff --git a/gtk-3.0/widgets/combobox.css b/gtk-3.0/widgets/combobox.css
@@ -35,6 +35,7 @@ GtkComboBox .button {
 
 GtkComboBox .button:hover,
 GtkComboBox .button:active,
+GtkComboBox .button:checked,
 GtkComboBox .button:active:hover {
     background-color: shade(@theme_bg_color, 0.9);
     color: @theme_selected_fg_color; 

diff --git a/gtk-3.0/widgets/entry.css b/gtk-3.0/widgets/entry.css
@@ -56,14 +56,12 @@
     background-color: shade(@menu_bg_color, 0.75);
 }
 
-.entry:insensitive,
-.primary-toolbar .entry:insensitive {
+.entry:insensitive {
     background-color: shade(@theme_bg_color, 0.95);
     background-image: none;
     color: mix(@theme_text_color, @theme_base_color, 0.5);
 }
 
-.entry:insensitive,
 .primary-toolbar .entry:insensitive {
     background-color: shade(@menu_bg_color, 0.95);
     background-image: none;
@@ -77,4 +75,4 @@
     background-image: none;
     color: @theme_base_color;
     border-color: @theme_selected_fg_color;
-}
+}
diff --git a/gtk-3.0/widgets/separator.css b/gtk-3.0/widgets/separator.css
@@ -5,9 +5,6 @@
 .sidebar.view.separator,
 .view.separator,
 .separator {
-    border-width: 1px;
-    border-style: solid;
-    border-color: shade(@theme_bg_color, 0.9);
     color: shade(@theme_bg_color, 0.9);
 }