[gtk/gtk-3-24: 1/2] Adwaita: Don't round the non-csd menu corners

[Timm Bäder <baedert src gnome org>]

commit d942a31750adf90476e956bcb93406b43938971e
Author: nana-4 <hnmaigo gmail com>
Date:   Sun May 12 17:41:41 2019 +0900

    Adwaita: Don't round the non-csd menu corners
    
    Otherwise, the menu will have ugly black corners.
    
    Fixes https://gitlab.gnome.org/GNOME/gtk/issues/1661

 gtk/theme/Adwaita/_common.scss           | 6 ++++--
 gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++--
 gtk/theme/Adwaita/gtk-contained.css      | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 6dc2bcb7af..828e78c4db 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2166,9 +2166,11 @@ menu,
   padding: 4px 0px;
   background-color: $menu_color;
   border: 1px solid $borders_color; // adds borders in a non composited env
-  border-radius: $menu_radius;
 
-  .csd & { border: none; }  // axes borders in a composited env
+  .csd & {
+    border: none; // axes borders in a composited env
+    border-radius: $menu_radius;
+  }
 
   &:backdrop { background-color: $backdrop_menu_color; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d1f1a905bb..df6b6ab05c 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -821,9 +821,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0
 
 .background.popup { background-color: transparent; }
 
-menu, .menu, .context-menu { margin: 4px; padding: 4px 0px; background-color: #2f2f2f; border: 1px solid 
#1b1b1b; border-radius: 5px; }
+menu, .menu, .context-menu { margin: 4px; padding: 4px 0px; background-color: #2f2f2f; border: 1px solid 
#1b1b1b; }
 
-.csd menu, .csd .menu, .csd .context-menu { border: none; }
+.csd menu, .csd .menu, .csd .context-menu { border: none; border-radius: 5px; }
 
 menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #313131; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 29cf20af36..c8dbbb4961 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -829,9 +829,9 @@ menubar .csd.popup decoration, .menubar .csd.popup decoration { border-radius: 0
 
 .background.popup { background-color: transparent; }
 
-menu, .menu, .context-menu { margin: 4px; padding: 4px 0px; background-color: #ffffff; border: 1px solid 
#cdc7c2; border-radius: 5px; }
+menu, .menu, .context-menu { margin: 4px; padding: 4px 0px; background-color: #ffffff; border: 1px solid 
#cdc7c2; }
 
-.csd menu, .csd .menu, .csd .context-menu { border: none; }
+.csd menu, .csd .menu, .csd .context-menu { border: none; border-radius: 5px; }
 
 menu:backdrop, .menu:backdrop, .context-menu:backdrop { background-color: #fcfcfc; }