[gnome-themes-standard/wip/sass] frames: avoid double frame

[Jakub Steiner <jimmac src gnome org>]

commit 954c37590e3597f4be920d4b7b2d9a456f1cb387
Author: Jakub Steiner <jimmac gmail com>
Date:   Tue May 27 13:29:42 2014 +0200

    frames: avoid double frame

 themes/Adwaita/gtk-3.0/_common.scss           |    7 +++++--
 themes/Adwaita/gtk-3.0/gtk-contained-dark.css |    4 +++-
 themes/Adwaita/gtk-3.0/gtk-contained.css      |    4 +++-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/themes/Adwaita/gtk-3.0/_common.scss b/themes/Adwaita/gtk-3.0/_common.scss
index daf0552..8d2cfaf 100644
--- a/themes/Adwaita/gtk-3.0/_common.scss
+++ b/themes/Adwaita/gtk-3.0/_common.scss
@@ -719,8 +719,11 @@ GtkPopover {
   &:backdrop { border-color: transparentize($borders_color,0.4); }
 }
 
-GtkScrolledWindow.frame {
-  border-radius: 2px;
+GtkScrolledWindow {
+  .frame { border-radius: 2px; }
+  GtkViewport.frame { // avoid double borders when viewport inside scrolled window
+    border-style: none;
+  }
 }
 
 /**********************
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
index 9e40b0f..2b2471e 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained-dark.css
@@ -750,8 +750,10 @@ GtkPopover {
   .frame:backdrop {
     border-color: rgba(28, 31, 31, 0.6); }
 
-GtkScrolledWindow.frame {
+GtkScrolledWindow .frame {
   border-radius: 2px; }
+GtkScrolledWindow GtkViewport.frame {
+  border-style: none; }
 
 /**********************
  * Window Decorations *
diff --git a/themes/Adwaita/gtk-3.0/gtk-contained.css b/themes/Adwaita/gtk-3.0/gtk-contained.css
index 15932f1..1bc29fe 100644
--- a/themes/Adwaita/gtk-3.0/gtk-contained.css
+++ b/themes/Adwaita/gtk-3.0/gtk-contained.css
@@ -750,8 +750,10 @@ GtkPopover {
   .frame:backdrop {
     border-color: rgba(161, 161, 161, 0.6); }
 
-GtkScrolledWindow.frame {
+GtkScrolledWindow .frame {
   border-radius: 2px; }
+GtkScrolledWindow GtkViewport.frame {
+  border-style: none; }
 
 /**********************
  * Window Decorations *