From ef837f04151d58a1f7d8bbbf0db5d80549bd6777 Mon Sep 17 00:00:00 2001
From: nana-4 <hnmaigo@gmail.com>
Date: Tue, 25 Aug 2020 21:12:35 +0900
Subject: [PATCH 1/2] Adwaita: Remove a shadow-type leftover

After commit edae2a8dc500b7af29928e5eb6dfc305726ce6e0, frames always
draw frames. So, remove the unused frame.flat styling.
---
 gtk/theme/Adwaita/_common.scss | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 8ab52c8010..64db0790fb 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3010,8 +3010,6 @@ frame,
   padding: 0;
   border-radius: 0;
   border: 1px solid $borders_color;
-
-  &.flat { border-style: none; }
 }
 
 actionbar > revealer >  box {

From c0efadc0f399d87251f236286c4fc602100b6887 Mon Sep 17 00:00:00 2001
From: nana-4 <hnmaigo@gmail.com>
Date: Fri, 7 Aug 2020 00:54:40 +0900
Subject: [PATCH 2/2] Adwaita: Make frames rounded

As per GNOME mockups.

Since GtkFrame now sets GTK_OVERFLOW_HIDDEN, we can round the frame
without corner overlapping.

This also adds some margin to the child label of GtkFrame to ensure it
will not be clipped by the rounded corners of the frame.
---
 gtk/theme/Adwaita/_common.scss | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 64db0790fb..b92747eb5e 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3005,13 +3005,17 @@ window.dialog.print {
  **********/
 frame,
 .frame {
-  box-shadow: none;
-  margin: 0;
-  padding: 0;
-  border-radius: 0;
   border: 1px solid $borders_color;
 }
 
+frame {
+  border-radius: $window_radius;
+
+  > label {
+    margin: 4px;
+  }
+}
+
 actionbar > revealer >  box {
   padding: 6px;
   border-top: 1px solid $borders_color;
@@ -3220,6 +3224,7 @@ expander-widget {
 calendar {
   color: $text_color;
   border: 1px solid $borders_color;
+  border-radius: $window_radius;
 
   > header {
     border-bottom: 1px solid $borders_color;