[gtk/wip/jimmac/industrial-style-menuitems] WIP: Adwaita: revert edge-to-edge menuitems

[Jakub Steiner <jimmac src gnome org>]

commit b24ebc6ee09d3dc5cb1f3aa76c7a1af491c9c21a
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue Nov 17 01:07:24 2020 +0100

    WIP: Adwaita: revert edge-to-edge menuitems
    
    - use the old Industrial style menuitems to make the design feel purposeful
    - adjust corners to have compatible border-radii of child elements
    
    Implements https://gitlab.gnome.org/GNOME/gtk/-/issues/3366

 gtk/theme/Adwaita/_common.scss | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 68dd817677..3e323c6774 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3445,7 +3445,8 @@ separator.sidebar {
   > row {
     // Needs overriding of the GtkListBoxRow padding
     min-height: 36px;
-    padding: 0px 8px;
+    padding: 0px 2px;
+    margin: $menu_radius;
 
     // Using margins/padding directly in the SidebarRow
     // will make the animation of the new bookmark row jump
@@ -3460,6 +3461,7 @@ separator.sidebar {
     &:selected {
       background-color: $menu_selected_color;
       color: $fg_color;
+      border-radius: $menu_radius - 1;
 
       &:focus-visible:focus-within {
         outline-width: 0;
@@ -4177,7 +4179,7 @@ popover.menu {
   & > arrow,
   &.background > contents {
     background-color: $menu_color;
-    padding: 0;
+    padding: $menu_radius;
   }
 
   &.background separator {
@@ -4221,8 +4223,8 @@ popover.menu {
   modelbutton {
     min-height: 30px;
     min-width: 40px;
-    padding: $_menu-padding/6 $_menu-padding;
-    border-radius: 0;
+    padding: 0 $_menu-padding;
+    border-radius: $menu_radius - 1;
 
     &:selected {
       color: $text-color;
@@ -4262,7 +4264,7 @@ menubar {
   }
 
   & > item popover.menu.background > contents {
-    padding: 0;
+    padding: $menu_radius;
   }
   //nested submenus
   & > item popover.menu popover.menu {