[gtk+/gtk-3-14] Adwaita: don't round scrolled window frame corners

[Lapo Calamandrei <lapo src gnome org>]

commit 7ca79b2ca5df2c3bfb4efb0358cc314fb13ca917
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Oct 8 14:08:04 2014 +0200

    Adwaita: don't round scrolled window frame corners
    
    See https://bugzilla.gnome.org/show_bug.cgi?id=737985

 gtk/resources/theme/Adwaita/_common.scss           |    1 -
 gtk/resources/theme/Adwaita/gtk-contained-dark.css |    7 +++++--
 gtk/resources/theme/Adwaita/gtk-contained.css      |    7 +++++--
 3 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 1de4681..99be694 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -2222,7 +2222,6 @@ GtkLevelBar.vertical {
 }
 
 GtkScrolledWindow {
-  .frame { border-radius: 2px; }
   GtkViewport.frame { // avoid double borders when viewport inside
                       // scrolled window
     border-style: none;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css 
b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 1b08503..b8f431e 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -3368,8 +3368,6 @@ GtkLevelBar.vertical {
     padding: 6px;
     border-width: 1px 0 0; }
 
-GtkScrolledWindow .frame {
-  border-radius: 2px; }
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
@@ -4161,6 +4159,11 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
   GtkCalendar.header .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected {
     color: #c9cbc9; }
 
+/* Decouple the font of context menus from their entry/textview */
+.touch-selection,
+.context-menu {
+  font: initial; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #eeeeec;
 @define-color theme_bg_color #393f3f;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 8b215b7..500bf00 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -3521,8 +3521,6 @@ GtkLevelBar.vertical {
     padding: 6px;
     border-width: 1px 0 0; }
 
-GtkScrolledWindow .frame {
-  border-radius: 2px; }
 GtkScrolledWindow GtkViewport.frame {
   border-style: none; }
 
@@ -4323,6 +4321,11 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
   GtkCalendar.header .menuitem.titlebutton.button:backdrop:selected, .list-row:backdrop:selected {
     color: #fcfcfc; }
 
+/* Decouple the font of context menus from their entry/textview */
+.touch-selection,
+.context-menu {
+  font: initial; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #2e3436;
 @define-color theme_bg_color #ededed;