[gtk/gtk-3-24: 1/2] Adwaita: Apply border-radius to .csd popovers

[Jakub Steiner <jimmac src gnome org>]

commit d3cf55a26da880315724d7fddfb19a503fd8e01e
Author: Alex Monday <monday15 gmx com>
Date:   Thu Jun 27 10:53:57 2019 +0500

    Adwaita: Apply border-radius to .csd popovers
    
    Fix popover_radius variable doesn't apply to .csd popover.
    
    Closes https://gitlab.gnome.org/GNOME/gtk/issues/1984

 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 ee2d11d33b..b8801ecce3 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2270,10 +2270,12 @@ menuitem {
 
 popover.background {
   padding: 2px;
-  border-radius: $popover_radius;
   background-color: $popover_bg_color;
 
-  .csd &, & { border: 1px solid $borders_color; }
+  .csd &, & {
+    border: 1px solid $borders_color;
+    border-radius: $popover_radius;
+  }
 
   box-shadow: 0 1px 2px transparentize(black, 0.7);
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 22db0909be..70743d4c5a 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -868,9 +868,9 @@ menuitem check:dir(ltr), menuitem radio:dir(ltr) { margin-right: 7px; }
 menuitem check:dir(rtl), menuitem radio:dir(rtl) { margin-left: 7px; }
 
 /*************** Popovers   * */
-popover.background { padding: 2px; border-radius: 9px; background-color: #353535; box-shadow: 0 1px 2px 
rgba(0, 0, 0, 0.3); }
+popover.background { padding: 2px; background-color: #353535; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
-.csd popover.background, popover.background { border: 1px solid #1b1b1b; }
+.csd popover.background, popover.background { border: 1px solid #1b1b1b; border-radius: 9px; }
 
 popover.background:backdrop { background-color: #353535; box-shadow: none; }
 
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 11b62a8c23..571c7bba20 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -876,9 +876,9 @@ menuitem check:dir(ltr), menuitem radio:dir(ltr) { margin-right: 7px; }
 menuitem check:dir(rtl), menuitem radio:dir(rtl) { margin-left: 7px; }
 
 /*************** Popovers   * */
-popover.background { padding: 2px; border-radius: 9px; background-color: #f6f5f4; box-shadow: 0 1px 2px 
rgba(0, 0, 0, 0.3); }
+popover.background { padding: 2px; background-color: #f6f5f4; box-shadow: 0 1px 2px rgba(0, 0, 0, 0.3); }
 
-.csd popover.background, popover.background { border: 1px solid #cdc7c2; }
+.csd popover.background, popover.background { border: 1px solid #cdc7c2; border-radius: 9px; }
 
 popover.background:backdrop { background-color: #f6f5f4; box-shadow: none; }