GTK+-3.20 Menta themes: fix for check and radio boxes in firefox

4 files changed, 95 insertions, 63 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
index fe71530b..6451b88d 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
@@ -36,15 +36,18 @@ headerbar > box > separator.vertical {
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
+/* old syntax is for broken firefox */
 
 check,
+.check,
 check .view.cell {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-check:disabled {
+check:disabled,
+.check {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
 }
 
@@ -52,14 +55,11 @@ check row:disabled {
 	background-color: transparent;
 }
 
-check:active,
 check:checked,
-.view.cell check:active,
 .view.cell check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
 }
 
-check:active:disabled,
 check:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
 }
@@ -73,13 +73,15 @@ check:indeterminate:disabled {
 }
 
 radio,
+.radio,
 .view.cell radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-radio:disabled {
+radio:disabled,
+.radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
 }
 
@@ -87,14 +89,11 @@ radio row:disabled {
 	background-color: transparent;
 }
 
-radio:active,
-.view.cell radio:active,
 radio:checked,
 .view.cell radio:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
 }
 
-radio:active:disabled,
 radio:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
 }
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index d42264e8..94036a96 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -2733,6 +2733,7 @@ menubar > menuitem:hover,
                                       shade (@theme_bg_color, 1.0),
                                       shade (@theme_bg_color, 0.82));
 	text-shadow: none;
+	color: @menu_fg_color;
 }
 
 menu > menuitem,
@@ -2932,12 +2933,22 @@ menuitem separator {
 	color: @menu_separator;
 }
 
+/* mix of old and new syntax is for broken firefox */
 menuitem check,
 menuitem radio,
 menuitem check:hover,
 menuitem radio:hover,
+menuitem check:checked,
 menuitem check:disabled,
-menuitem radio:disabled {
+menuitem radio:disabled,
+menu menuitem .check,
+menu menuitem .radio,
+menu menuitem .check:hover,
+menu menuitem .radio:hover,
+menu menuitem .check:checked,
+menu menuitem .radio:checked,
+menu menuitem .check:disabled,
+menu menuitem .radio:disabled {
 	background-image: none;
 	background-color: transparent;
 	min-height: 12px;
@@ -2946,47 +2957,54 @@ menuitem radio:disabled {
 }
 
 menuitem check:checked,
-menuitem radio:checked {
-	background-color: transparent;
-}
-
-menuitem check:checked {
+menu menuitem .check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked.svg"));
 }
 
-menuitem check:checked:hover {
+menuitem check:checked:hover,
+menu menuitem .check:checked:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-selected.svg"));
 }
 
-menuitem check:checked:disabled {
+menuitem check:checked:disabled,
+menu menuitem .check:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-insensitive.svg"));
 }
 
-menuitem check:indeterminate,
-menuitem radio:indeterminate {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed.svg"));
+menuitem radio:checked,
+menu menuitem .radio:checked {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked.svg"));
 }
 
-menuitem check:indeterminate:disabled,
-menuitem radio:indeterminate:disabled {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-insensitive.svg"));
+menuitem radio:checked:hover,
+menu menuitem .radio:checked:hover {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-selected.svg"));
 }
 
-menuitem check:indeterminate:hover,
-menuitem radio:indeterminate:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-selected.svg"));
+menuitem radio:checked:disabled,
+menu menuitem .radio:checked:disabled {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-insensitive.svg"));
 }
 
-menuitem radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked.svg"));
+menuitem check:indeterminate,
+menuitem radio:indeterminate,
+menu menuitem .check:indeterminate,
+menu menuitem .radio:indeterminate {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed.svg"));
 }
 
-menuitem radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-selected.svg"));
+menuitem check:indeterminate:disabled,
+menuitem radio:indeterminate:disabled,
+menu menuitem .check:indeterminate:disabled,
+menu menuitem .radio:indeterminate:disabled {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-insensitive.svg"));
 }
 
-menuitem radio:checked:disabled {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-insensitive.svg"));
+menuitem check:indeterminate:hover,
+menuitem radio:indeterminate:hover,
+menu menuitem .check:indeterminate:hover,
+menu menuitem .radio:indeterminate:hover {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-selected.svg"));
 }
 
 /***************
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
index fe71530b..6451b88d 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-assets.css
@@ -36,15 +36,18 @@ headerbar > box > separator.vertical {
  *************************/
 
 /* draw regular check and radio items using our SVG assets */
+/* old syntax is for broken firefox */
 
 check,
+.check,
 check .view.cell {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-check:disabled {
+check:disabled,
+.check {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-normal-ins.png"));
 }
 
@@ -52,14 +55,11 @@ check row:disabled {
 	background-color: transparent;
 }
 
-check:active,
 check:checked,
-.view.cell check:active,
 .view.cell check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active.png"));
 }
 
-check:active:disabled,
 check:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/check-active-ins.png"));
 }
@@ -73,13 +73,15 @@ check:indeterminate:disabled {
 }
 
 radio,
+.radio,
 .view.cell radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal.png"));
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-radio:disabled {
+radio:disabled,
+.radio {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-normal-ins.png"));
 }
 
@@ -87,14 +89,11 @@ radio row:disabled {
 	background-color: transparent;
 }
 
-radio:active,
-.view.cell radio:active,
 radio:checked,
 .view.cell radio:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active.png"));
 }
 
-radio:active:disabled,
 radio:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/radio-active-ins.png"));
 }
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 4a6d01a8..e7f69284 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -2950,12 +2950,22 @@ menuitem separator {
 	color: @menu_separator;
 }
 
+/* mix of old and new syntax is for broken firefox */
 menuitem check,
 menuitem radio,
 menuitem check:hover,
 menuitem radio:hover,
+menuitem check:checked,
 menuitem check:disabled,
-menuitem radio:disabled {
+menuitem radio:disabled,
+menu menuitem .check,
+menu menuitem .radio,
+menu menuitem .check:hover,
+menu menuitem .radio:hover,
+menu menuitem .check:checked,
+menu menuitem .radio:checked,
+menu menuitem .check:disabled,
+menu menuitem .radio:disabled {
 	background-image: none;
 	background-color: transparent;
 	min-height: 12px;
@@ -2964,49 +2974,55 @@ menuitem radio:disabled {
 }
 
 menuitem check:checked,
-menuitem radio:checked {
-	background-color: transparent;
-}
-
-menuitem check:checked {
+menu menuitem .check:checked {
 	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked.svg"));
 }
 
-menuitem check:checked:hover {
+menuitem check:checked:hover,
+menu menuitem .check:checked:hover {
 	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-selected.svg"));
 }
 
-menuitem check:checked:disabled {
+menuitem check:checked:disabled,
+menu menuitem .check:checked:disabled {
 	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-checked-insensitive.svg"));
 }
 
-menuitem check:indeterminate,
-menuitem radio:indeterminate {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed.svg"));
+menuitem radio:checked,
+menu menuitem .radio:checked {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked.svg"));
 }
 
-menuitem check:indeterminate:disabled,
-menuitem radio:indeterminate:disabled {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-insensitive.svg"));
+menuitem radio:checked:hover,
+menu menuitem .radio:checked:hover {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-selected.svg"));
 }
 
-menuitem check:indeterminate:hover,
-menuitem radio:indeterminate:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-selected.svg"));
+menuitem radio:checked:disabled,
+menu menuitem .radio:checked:disabled {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-insensitive.svg"));
 }
 
-menuitem radio:checked {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked.svg"));
+menuitem check:indeterminate,
+menuitem radio:indeterminate,
+menu menuitem .check:indeterminate,
+menu menuitem .radio:indeterminate {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed.svg"));
 }
 
-menuitem radio:checked:hover {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-selected.svg"));
+menuitem check:indeterminate:disabled,
+menuitem radio:indeterminate:disabled,
+menu menuitem .check:indeterminate:disabled,
+menu menuitem .radio:indeterminate:disabled {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-insensitive.svg"));
 }
 
-menuitem radio:checked:disabled {
-	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-radio-checked-insensitive.svg"));
+menuitem check:indeterminate:hover,
+menuitem radio:indeterminate:hover,
+menu menuitem .check:indeterminate:hover,
+menu menuitem .radio:indeterminate:hover {
+	-gtk-icon-source: -gtk-scaled(url("assets/menuitem-checkbox-mixed-selected.svg"));
 }
-
 /***************
  * Menu Button *
  ***************/