Restructure and fix up radio and checkbutton asset code

gtk-3.0/gtk-widgets-assets.css

@@ -2,111 +2,93 @@
  * check and radio *
  *******************/
 /* draw regular check and radio items using our assets */
-.check,
-.check row:selected,
-.check row:selected:focus {
+.check {
     -gtk-icon-source: url("assets/checkbox-unchecked.png");
 }
 
-.check:insensitive,
-.check row:selected:insensitive,
-.check row:selected:focus:insensitive {
+.check:insensitive {
     -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.png");
 }
 
-.check:active, .check:checked,
-.check row:selected:active, .check row:selected:checked,
-.check row:selected:focus:active, .check row:selected:focus:checked {
+.check:active,
+.check:checked {
     -gtk-icon-source: url("assets/checkbox-checked.png");
 }
 
-.check:active:hover, .check:checked:hover,
-.check row:selected:active:hover, .check row:selected:checked:hover,
-.check row:selected:focus:active:hover, .check row:selected:focus:checked:hover {
+.check:active:hover,
+.check:checked:hover {
     -gtk-icon-source: url("assets/checkbox-checked-hover.png");
 }
 
-.check:active:insensitive, .check:checked:insensitive,
-.check row:selected:active:insensitive, .check row:selected:checked:insensitive,
-.check row:selected:focus:active:insensitive, .check row:selected:focus:checked:insensitive {
+.check:active:insensitive,
+.check:checked:insensitive {
     -gtk-icon-source: url("assets/checkbox-checked-insensitive.png");
 }
 
-.check:inconsistent,
-.check row:selected:inconsistent,
-.check row:selected:focus:inconsistent {
+.check:inconsistent {
     -gtk-icon-source: url("assets/checkbox-mixed.png");
 }
 
-.check:inconsistent:hover,
-.check row:selected:inconsistent:hover,
-.check row:selected:focus:inconsistent:hover {
+.check:inconsistent:hover {
     -gtk-icon-source: url("assets/checkbox-mixed-hover.png");
 }
 
-.check:inconsistent:insensitive,
-.check row:selected:inconsistent:insensitive,
-.check row:selected:focus:inconsistent:insensitive {
+.check:inconsistent:insensitive {
     -gtk-icon-source: url("assets/checkbox-mixed-insensitive.png");
 }
 
-.radio,
-.radio row:selected,
-.radio row:selected:focus {
+.radio {
     -gtk-icon-source: url("assets/radio-unselected.png");
 }
 
-.radio:insensitive,
-.radio row:selected:insensitive,
-.radio row:selected:focus:insensitive {
+.radio:insensitive {
     -gtk-icon-source: url("assets/radio-unselected-insensitive.png");
 }
 
-.radio:active, .radio:checked,
-.radio row:selected:active, .radio row:selected:checked,
-.radio row:selected:focus:active, .radio row:selected:focus:checked {
+.radio:active,
+.radio:checked {
     -gtk-icon-source: url("assets/radio-selected.png");
 }
 
-.radio:active:hover, .radio:checked:hover,
-.radio row:selected:active:hover, .radio row:selected:checked:hover,
-.radio row:selected:focus:active:hover, .radio row:selected:focus:checked:hover {
+.radio:active:hover,
+.radio:checked:hover {
     -gtk-icon-source: url("assets/radio-selected-hover.png");
 }
 
-.radio:active:insensitive, .radio:checked:insensitive,
-.radio row:selected:active:insensitive, .radio row:selected:checked:insensitive,
-.radio row:selected:focus:active:insensitive, .radio row:selected:focus:checked:insensitive {
+.radio:active:insensitive,
+.radio:checked:insensitive {
     -gtk-icon-source: url("assets/radio-selected-insensitive.png");
 }
 
-.radio:inconsistent,
-.radio row:selected:inconsistent,
-.radio row:selected:focus:inconsistent {
+.radio:inconsistent {
     -gtk-icon-source: url("assets/radio-mixed.png");
 }
 
-.radio:inconsistent:hover,
-.radio row:selected:inconsistent:hover,
-.radio row:selected:focus:inconsistent:hover {
+.radio:inconsistent:hover {
     -gtk-icon-source: url("assets/radio-mixed-hover.png");
 }
 
-.radio:inconsistent:insensitive,
-.radio row:selected:inconsistent:insensitive,
-.radio row:selected:focus:inconsistent:insensitive {
+.radio:inconsistent:insensitive {
     -gtk-icon-source: url("assets/radio-mixed-insensitive.png");
 }
 
-.menuitem.check:active, .menuitem.check:checked {
+.menuitem.check,
+.menuitem.check:insensitive {
+    -gtk-icon-source: none;
+}
+
+.menuitem.check:active,
+.menuitem.check:checked {
     -gtk-icon-source: url("assets/menuitem-checkbox-checked.png");
 }
 
-.menuitem.check:active:hover, .menuitem.check:checked:hover {
+.menuitem.check:active:hover,
+.menuitem.check:checked:hover {
     -gtk-icon-source: url("assets/menuitem-checkbox-checked-hover.png");
 }
 
-.menuitem.check:active:insensitive, .menuitem.check:checked:insensitive {
+.menuitem.check:active:insensitive,
+.menuitem.check:checked:insensitive {
     -gtk-icon-source: url("assets/menuitem-checkbox-checked-insensitive.png");
 }
 
@@ -125,15 +107,23 @@
     -gtk-icon-source: url("assets/menuitem-checkbox-mixed-insensitive.png");
 }
 
-.menuitem.radio:active, .menuitem.radio:checked {
+.menuitem.radio,
+.menuitem.radio:insensitive {
+    -gtk-icon-source: none;
+}
+
+.menuitem.radio:active,
+.menuitem.radio:checked {
     -gtk-icon-source: url("assets/menuitem-radio-checked.png");
 }
 
-.menuitem.radio:active:hover, .menuitem.radio:checked:hover {
+.menuitem.radio:active:hover,
+.menuitem.radio:checked:hover {
     -gtk-icon-source: url("assets/menuitem-radio-checked-hover.png");
 }
 
-.menuitem.radio:active:insensitive, .menuitem.radio:checked:insensitive {
+.menuitem.radio:active:insensitive,
+.menuitem.radio:checked:insensitive {
     -gtk-icon-source: url("assets/menuitem-radio-checked-insensitive.png");
 }