[gtk/gtk-3-24: 1/2] Adwaita: Fix check/radio styling in menu

[Emmanuele Bassi <ebassi src gnome org>]

commit ef32ba3d6a9ba6ebb018d7893404cc89569c80aa
Author: nana-4 <hnmaigo gmail com>
Date:   Fri Nov 15 23:59:36 2019 +0900

    Adwaita: Fix check/radio styling in menu
    
    The new check/radio style increased their specificity, but it was not
    synchronized in the menu styling.
    
    This commit increases the specificity to match the updated check/radio
    styling.
    
    Fixes https://gitlab.gnome.org/GNOME/gtk/issues/2096

 gtk/theme/Adwaita/_common.scss           | 26 +++++++++++---------------
 gtk/theme/Adwaita/gtk-contained-dark.css |  4 +---
 gtk/theme/Adwaita/gtk-contained.css      |  4 +---
 3 files changed, 13 insertions(+), 21 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index f30cc4776e..59b6ec8455 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2986,21 +2986,17 @@ radio {
   menu menuitem & {
     margin: 0; // this is a workaround for a menu check/radio size allocation issue
 
-    &, &:hover, &:disabled { //FIXME use button reset mixin
-      min-height: 14px;
-      min-width: 14px;
-      background-image: none;
-      background-color: transparent;
-      box-shadow: none;
-      -gtk-icon-shadow: none;
-      color: inherit;
-      border-color: currentColor;
-    }
-    &:indeterminate, &:checked {
-      &:hover {
-        color: $checkradio_fg_color;
-        border-color: darken($checkradio_bg_color, if($variant=='light', 15%, 30%));
-      }      
+    &, &:checked, &:indeterminate {
+      &, &:hover, &:disabled { //FIXME use button reset mixin
+        min-height: 14px;
+        min-width: 14px;
+        background-image: none;
+        background-color: transparent;
+        box-shadow: none;
+        -gtk-icon-shadow: none;
+        color: inherit;
+        border-color: currentColor;
+      }
     }
   }
 }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 1b0b501a94..50eff12866 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1205,9 +1205,7 @@ check:backdrop, radio:backdrop { transition: 200ms ease-out; }
 
 menu menuitem check, menu menuitem radio { margin: 0; }
 
-menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem radio, menu 
menuitem radio:hover, menu menuitem radio:disabled { min-height: 14px; min-width: 14px; background-image: 
none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; border-color: 
currentColor; }
-
-menu menuitem check:indeterminate:hover, menu menuitem check:checked:hover, menu menuitem 
radio:indeterminate:hover, menu menuitem radio:checked:hover { color: #ffffff; border-color: #030c17; }
+menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked, 
menu menuitem check:checked:hover, menu menuitem check:checked:disabled, menu menuitem check:indeterminate, 
menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled, menu menuitem radio, 
menu menuitem radio:hover, menu menuitem radio:disabled, menu menuitem radio:checked, menu menuitem 
radio:checked:hover, menu menuitem radio:checked:disabled, menu menuitem radio:indeterminate, menu menuitem 
radio:indeterminate:hover, menu menuitem radio:indeterminate:disabled { min-height: 14px; min-width: 14px; 
background-image: none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: 
inherit; border-color: currentColor; }
 
 check { border-radius: 3px; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 648602050e..7889f21cd9 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1221,9 +1221,7 @@ row:selected check, row:selected radio { border-color: #185fb4; }
 
 menu menuitem check, menu menuitem radio { margin: 0; }
 
-menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem radio, menu 
menuitem radio:hover, menu menuitem radio:disabled { min-height: 14px; min-width: 14px; background-image: 
none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: inherit; border-color: 
currentColor; }
-
-menu menuitem check:indeterminate:hover, menu menuitem check:checked:hover, menu menuitem 
radio:indeterminate:hover, menu menuitem radio:checked:hover { color: #ffffff; border-color: #185fb4; }
+menu menuitem check, menu menuitem check:hover, menu menuitem check:disabled, menu menuitem check:checked, 
menu menuitem check:checked:hover, menu menuitem check:checked:disabled, menu menuitem check:indeterminate, 
menu menuitem check:indeterminate:hover, menu menuitem check:indeterminate:disabled, menu menuitem radio, 
menu menuitem radio:hover, menu menuitem radio:disabled, menu menuitem radio:checked, menu menuitem 
radio:checked:hover, menu menuitem radio:checked:disabled, menu menuitem radio:indeterminate, menu menuitem 
radio:indeterminate:hover, menu menuitem radio:indeterminate:disabled { min-height: 14px; min-width: 14px; 
background-image: none; background-color: transparent; box-shadow: none; -gtk-icon-shadow: none; color: 
inherit; border-color: currentColor; }
 
 check { border-radius: 3px; }