[gtk+] Adwaita: really fix solid-csd

[Lapo Calamandrei <lapo src gnome org>]

commit 159c65dcb8d3084dfbc003bb331840e5042c3985
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Apr 15 18:28:26 2016 +0200

    Adwaita: really fix solid-csd
    
    add a specificity bump hack in the titlebar solid-csd styling to
    avoid being overridden by the split titlebar theme logic.

 gtk/theme/Adwaita/_common.scss           |   12 +++++++-----
 gtk/theme/Adwaita/gtk-contained-dark.css |    8 +++++---
 gtk/theme/Adwaita/gtk-contained.css      |    8 +++++---
 3 files changed, 17 insertions(+), 11 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index ed7c82a..4833bd4 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1512,11 +1512,13 @@ headerbar {
 
   .solid-csd & {
     &:backdrop, & {
-      margin-left: -1px;
-      margin-right: -1px;
-      margin-top: -1px;
-      border-radius: 0;
-      box-shadow: none;
+      &:dir(rtl), &:dir(ltr) { // specificity bump
+        margin-left: -1px;
+        margin-right: -1px;
+        margin-top: -1px;
+        border-radius: 0;
+        box-shadow: none;
+      }
     }
   }
 }
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index e159f50..4e647db 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1929,9 +1929,11 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
-  .solid-csd .titlebar:backdrop:not(headerbar), .solid-csd .titlebar:not(headerbar), .solid-csd
-  headerbar:backdrop, .solid-csd
-  headerbar {
+  .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd 
.titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd 
.titlebar:dir(ltr):not(headerbar), .solid-csd
+  headerbar:backdrop:dir(rtl), .solid-csd
+  headerbar:backdrop:dir(ltr), .solid-csd
+  headerbar:dir(rtl), .solid-csd
+  headerbar:dir(ltr) {
     margin-left: -1px;
     margin-right: -1px;
     margin-top: -1px;
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index c8496e8..048cd89 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1936,9 +1936,11 @@ headerbar {
       min-width: 26px;
       margin: 0;
       padding: 0; }
-  .solid-csd .titlebar:backdrop:not(headerbar), .solid-csd .titlebar:not(headerbar), .solid-csd
-  headerbar:backdrop, .solid-csd
-  headerbar {
+  .solid-csd .titlebar:backdrop:dir(rtl):not(headerbar), .solid-csd 
.titlebar:backdrop:dir(ltr):not(headerbar), .solid-csd .titlebar:dir(rtl):not(headerbar), .solid-csd 
.titlebar:dir(ltr):not(headerbar), .solid-csd
+  headerbar:backdrop:dir(rtl), .solid-csd
+  headerbar:backdrop:dir(ltr), .solid-csd
+  headerbar:dir(rtl), .solid-csd
+  headerbar:dir(ltr) {
     margin-left: -1px;
     margin-right: -1px;
     margin-top: -1px;