[gtk+/gtk-3-22] themes: Actually fix the frame.flat style class

[Daniel Boles <dboles src gnome org>]

commit 02b588697569ce60fdef22297fc203200fc51b81
Author: Daniel Boles <dboles src gnome org>
Date:   Fri Mar 3 08:43:26 2017 +0000

    themes: Actually fix the frame.flat style class
    
    by changing the source scss, not just the generated css files.
    
    Thanks to Christoph Reiter for pointing this out!

 gtk/theme/Adwaita/_common.scss                   |    7 +++++--
 gtk/theme/Adwaita/gtk-contained-dark.css         |    7 ++++---
 gtk/theme/Adwaita/gtk-contained.css              |    7 ++++---
 gtk/theme/HighContrast/_common.scss              |    8 ++++++--
 gtk/theme/HighContrast/gtk-contained-inverse.css |   11 ++++++-----
 gtk/theme/HighContrast/gtk-contained.css         |   11 ++++++-----
 6 files changed, 31 insertions(+), 20 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 8c0fd64..a1f3643 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -3388,11 +3388,14 @@ frame > border,
   border-radius: 0;
   border: 1px solid $borders_color;
 
-  &.flat { border-style: none; }
-
   &:backdrop { border-color: $backdrop_borders_color; }
 }
 
+frame.flat > border,
+.frame.flat {
+  border-style: none;
+}
+
 actionbar > revealer >  box {
   padding: 6px;
   border-top: 1px solid $borders_color;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index b575ed0..e9141ed 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3848,13 +3848,14 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #1b1f20; }
-  frame.flat > border,
-  .frame.flat {
-    border-style: none; }
   frame > border:backdrop,
   .frame:backdrop {
     border-color: #202425; }
 
+frame.flat > border,
+.frame.flat {
+  border-style: none; }
+
 actionbar > revealer > box {
   padding: 6px;
   border-top: 1px solid #1b1f20; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index b2633c9..d72e845 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3879,13 +3879,14 @@ frame > border,
   padding: 0;
   border-radius: 0;
   border: 1px solid #b6b6b3; }
-  frame.flat > border,
-  .frame.flat {
-    border-style: none; }
   frame > border:backdrop,
   .frame:backdrop {
     border-color: #c0c0bd; }
 
+frame.flat > border,
+.frame.flat {
+  border-style: none; }
+
 actionbar > revealer > box {
   padding: 6px;
   border-top: 1px solid #b6b6b3; }
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 7788922..09a10be 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -2576,14 +2576,18 @@ levelbar {
 /**********
  * frames *
  **********/
-frame border,
+frame > border,
 .frame {
   border: 1px solid $borders_color;
-  &.flat { border-style: none; }
   &:backdrop { border-color: $backdrop_borders_color; }
   padding: 0;
 }
 
+frame.flat > border,
+.frame.flat {
+  border-style: none;
+}
+
 actionbar > revealer > box {
   padding: 6px;
   border-width: 1px 0 0;
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css 
b/gtk/theme/HighContrast/gtk-contained-inverse.css
index 0a6dea1..b1ead08 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -2612,17 +2612,18 @@ popover.background radiobutton:selected,
 /**********
  * frames *
  **********/
-frame border,
+frame > border,
 .frame {
   border: 1px solid gray;
   padding: 0; }
-  frame.flat > border,
-  .frame.flat {
-    border-style: none; }
-  frame border:backdrop,
+  frame > border:backdrop,
   .frame:backdrop {
     border-color: #737373; }
 
+frame.flat > border,
+.frame.flat {
+  border-style: none; }
+
 actionbar > revealer > box {
   padding: 6px;
   border-width: 1px 0 0;
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index 8adbd5a..71f161f 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -2619,17 +2619,18 @@ popover.background radiobutton:selected,
 /**********
  * frames *
  **********/
-frame border,
+frame > border,
 .frame {
   border: 1px solid gray;
   padding: 0; }
-  frame.flat > border,
-  .frame.flat {
-    border-style: none; }
-  frame border:backdrop,
+  frame > border:backdrop,
   .frame:backdrop {
     border-color: #8d8d8d; }
 
+frame.flat > border,
+.frame.flat {
+  border-style: none; }
+
 actionbar > revealer > box {
   padding: 6px;
   border-width: 1px 0 0;