[gtk+/wip/cosimoc/menuitem-gadget: 16/21] theme: fix menu check/radio styling

[Cosimo Cecchi <cosimoc src gnome org>]

commit 4302c444a09384eb9920012817fce1e87c96ae0a
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Fri Dec 18 14:20:39 2015 -0800

    theme: fix menu check/radio styling
    
    This is a leftover from the CssNode port of GtkCheckMenuItem and
    GtkRadioMenuItem.

 gtk/theme/Adwaita/_common.scss           |   14 +++++++---
 gtk/theme/Adwaita/gtk-contained-dark.css |   42 ++++++++++++++++++-----------
 gtk/theme/Adwaita/gtk-contained.css      |   42 ++++++++++++++++++-----------
 3 files changed, 62 insertions(+), 36 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index a8f1a27..9ca2bd9 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2097,15 +2097,21 @@ switch {
   }
 
   //menu
-  menu menuitem.#{$w} {
+  menu menuitem #{$w} {
+    color: mix($fg_color, $bg_color, 70%);
     -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic');
-    color: mix($fg_color, $bg_color, 60%);
     -gtk-icon-shadow: none;
-    &:active, &:checked {
+    &:hover, &:insensitive {
+      -gtk-icon-source: -gtk-icontheme('#{$a}-symbolic');
+      -gtk-icon-shadow: none;
+    }
+    &:checked, &:checked:hover, &:checked:insensitive {
       -gtk-icon-source: -gtk-icontheme('#{$a}-checked-symbolic');
+      -gtk-icon-shadow: none;
     }
-    &:inconsistent {
+    &:inconsistent, &:inconsistent:hover, &:inconsistent:insensitive {
       -gtk-icon-source: -gtk-icontheme('#{$a}-mixed-symbolic');
+      -gtk-icon-shadow: none;
     }
     &:hover { color: $selected_fg_color; }
     &:insensitive { color: mix($insensitive_fg_color, $bg_color, 50%); }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 9f13de6..88f326d 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2762,17 +2762,22 @@ check:backdrop:checked:insensitive {
   .titlebar check:backdrop:checked:insensitive button.titlebutton {
     -gtk-icon-shadow: none; }
 
-menu menuitem.check {
+menu menuitem check {
+  color: #b8bab8;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  color: #a6a8a7;
   -gtk-icon-shadow: none; }
-  menu menuitem.check:active, menu menuitem.check:checked {
-    -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
-  menu menuitem.check:inconsistent {
-    -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
-  menu menuitem.check:hover {
+  menu menuitem check:hover, menu menuitem check:insensitive {
+    -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:insensitive {
+    -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem check:inconsistent, menu menuitem check:inconsistent:hover, menu menuitem 
check:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem check:hover {
     color: #ffffff; }
-  menu menuitem.check:insensitive {
+  menu menuitem check:insensitive {
     color: #676b6b; }
 
 radio {
@@ -2919,17 +2924,22 @@ radio:backdrop:checked:insensitive {
   .titlebar radio:backdrop:checked:insensitive button.titlebutton {
     -gtk-icon-shadow: none; }
 
-menu menuitem.radio {
+menu menuitem radio {
+  color: #b8bab8;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  color: #a6a8a7;
   -gtk-icon-shadow: none; }
-  menu menuitem.radio:active, menu menuitem.radio:checked {
-    -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
-  menu menuitem.radio:inconsistent {
-    -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
-  menu menuitem.radio:hover {
+  menu menuitem radio:hover, menu menuitem radio:insensitive {
+    -gtk-icon-source: -gtk-icontheme("radio-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:insensitive {
+    -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem radio:inconsistent, menu menuitem radio:inconsistent:hover, menu menuitem 
radio:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem radio:hover {
     color: #ffffff; }
-  menu menuitem.radio:insensitive {
+  menu menuitem radio:insensitive {
     color: #676b6b; }
 
 .view.check, .view.radio,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b1fa942..f5c48f0 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2852,17 +2852,22 @@ check:backdrop:checked:insensitive {
 row:selected check:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-checkbox-checked-backdrop-insensitive.png"), 
url("assets/selected-checkbox-checked-backdrop-insensitive 2 png")); }
 
-menu menuitem.check {
+menu menuitem check {
+  color: #666a6b;
   -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
-  color: #787c7d;
   -gtk-icon-shadow: none; }
-  menu menuitem.check:active, menu menuitem.check:checked {
-    -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic"); }
-  menu menuitem.check:inconsistent {
-    -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic"); }
-  menu menuitem.check:hover {
+  menu menuitem check:hover, menu menuitem check:insensitive {
+    -gtk-icon-source: -gtk-icontheme("checkbox-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem check:checked, menu menuitem check:checked:hover, menu menuitem check:checked:insensitive {
+    -gtk-icon-source: -gtk-icontheme("checkbox-checked-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem check:inconsistent, menu menuitem check:inconsistent:hover, menu menuitem 
check:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-icontheme("checkbox-mixed-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem check:hover {
     color: #ffffff; }
-  menu menuitem.check:insensitive {
+  menu menuitem check:insensitive {
     color: #babbbb; }
 
 radio {
@@ -3081,17 +3086,22 @@ radio:backdrop:checked:insensitive {
 row:selected radio:backdrop:checked:insensitive {
   -gtk-icon-source: -gtk-scaled(url("assets/selected-radio-checked-backdrop-insensitive.png"), 
url("assets/selected-radio-checked-backdrop-insensitive 2 png")); }
 
-menu menuitem.radio {
+menu menuitem radio {
+  color: #666a6b;
   -gtk-icon-source: -gtk-icontheme("radio-symbolic");
-  color: #787c7d;
   -gtk-icon-shadow: none; }
-  menu menuitem.radio:active, menu menuitem.radio:checked {
-    -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic"); }
-  menu menuitem.radio:inconsistent {
-    -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic"); }
-  menu menuitem.radio:hover {
+  menu menuitem radio:hover, menu menuitem radio:insensitive {
+    -gtk-icon-source: -gtk-icontheme("radio-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem radio:checked, menu menuitem radio:checked:hover, menu menuitem radio:checked:insensitive {
+    -gtk-icon-source: -gtk-icontheme("radio-checked-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem radio:inconsistent, menu menuitem radio:inconsistent:hover, menu menuitem 
radio:inconsistent:insensitive {
+    -gtk-icon-source: -gtk-icontheme("radio-mixed-symbolic");
+    -gtk-icon-shadow: none; }
+  menu menuitem radio:hover {
     color: #ffffff; }
-  menu menuitem.radio:insensitive {
+  menu menuitem radio:insensitive {
     color: #babbbb; }
 
 .view.check, .view.radio,