[gtk+] Adwaita: fix treeview dnd column headers

[Lapo Calamandrei <lapo src gnome org>]

commit 915fe87a629319c3a089874c148ec5b4319e3f09
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Sun Feb 14 22:30:32 2016 +0100

    Adwaita: fix treeview dnd column headers

 gtk/theme/Adwaita/_common.scss           |   30 +++++++++++++++---------------
 gtk/theme/Adwaita/gtk-contained-dark.css |   24 +++++++++++++++++-------
 gtk/theme/Adwaita/gtk-contained.css      |   24 +++++++++++++++++-------
 3 files changed, 49 insertions(+), 29 deletions(-)
---
diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 2c8f41a..26bb539 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1586,35 +1586,35 @@ treeview.view {
         transition: none; //I shouldn't need this
       }
 
-      &.dnd { @extend header.button.dnd; }
     }
 
     button:last-child,
     button:last-child:backdrop { border-right-style: none; }
   }
 
+  button.dnd,
   header.button.dnd { // for treeview-like derive widgets
-    transition: none;
-    color: $selected_bg_color;
-    box-shadow: inset 1px 1px 0 1px $selected_bg_color,
-                inset -1px 0 0 1px $selected_bg_color,
-                inset 1px 1px $base_color, inset -1px 0 $base_color;;
-
-    &:active { @extend header.button.dnd; }
-
-    &:selected { @extend header.button.dnd; }
-
-    &:hover { @extend header.button.dnd; }
+    &:active, &:selected, &:hover, & {
+      padding: 0 6px;
+      transition: none;
+      background-image: none;
+      background-color: $selected_bg_color;
+      color: $base_color;
+      border-radius: 0;
+      border-style: none;
+      box-shadow: inset 0 0 0 1px $base_color;
+      text-shadow: none;
+    }
   }
 }
 
 %column_header_button {
-  padding: 3px 6px;
-  border-style: none solid solid none;
+  padding: 0 6px;
   border-radius: 0;
   background-image: none;
-  border-color: $bg_color;
   text-shadow: none;
+  border-style: none solid solid none;
+  border-color: $bg_color;
 
   &:disabled {
     border-color: $bg_color;
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 0df50d0..183156f 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1971,18 +1971,28 @@ treeview.view {
   treeview.view header button:last-child,
   treeview.view header button:last-child:backdrop {
     border-right-style: none; }
-  treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, 
treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover {
+  treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.view button.dnd:hover, 
treeview.view button.dnd,
+  treeview.view header.button.dnd:active,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd {
+    padding: 0 6px;
     transition: none;
-    color: #215d9c;
-    box-shadow: inset 1px 1px 0 1px #215d9c, inset -1px 0 0 1px #215d9c, inset 1px 1px #292929, inset -1px 0 
#292929; }
+    background-image: none;
+    background-color: #215d9c;
+    color: #292929;
+    border-radius: 0;
+    border-style: none;
+    box-shadow: inset 0 0 0 1px #292929;
+    text-shadow: none; }
 
 treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
-  padding: 3px 6px;
-  border-style: none solid solid none;
+  padding: 0 6px;
   border-radius: 0;
   background-image: none;
-  border-color: #393f3f;
-  text-shadow: none; }
+  text-shadow: none;
+  border-style: none solid solid none;
+  border-color: #393f3f; }
   treeview.view header button:disabled {
     border-color: #393f3f;
     background-image: none; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index ff7d32e..a199c62 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1981,18 +1981,28 @@ treeview.view {
   treeview.view header button:last-child,
   treeview.view header button:last-child:backdrop {
     border-right-style: none; }
-  treeview.view header.button.dnd, treeview.view header button.dnd, treeview.view header.button.dnd:active, 
treeview.view header.button.dnd:selected, treeview.view header.button.dnd:hover {
+  treeview.view button.dnd:active, treeview.view button.dnd:selected, treeview.view button.dnd:hover, 
treeview.view button.dnd,
+  treeview.view header.button.dnd:active,
+  treeview.view header.button.dnd:selected,
+  treeview.view header.button.dnd:hover,
+  treeview.view header.button.dnd {
+    padding: 0 6px;
     transition: none;
-    color: #4a90d9;
-    box-shadow: inset 1px 1px 0 1px #4a90d9, inset -1px 0 0 1px #4a90d9, inset 1px 1px #ffffff, inset -1px 0 
#ffffff; }
+    background-image: none;
+    background-color: #4a90d9;
+    color: #ffffff;
+    border-radius: 0;
+    border-style: none;
+    box-shadow: inset 0 0 0 1px #ffffff;
+    text-shadow: none; }
 
 treeview.view header button, treeview.view header button:hover, treeview.view header button:active {
-  padding: 3px 6px;
-  border-style: none solid solid none;
+  padding: 0 6px;
   border-radius: 0;
   background-image: none;
-  border-color: #e8e8e7;
-  text-shadow: none; }
+  text-shadow: none;
+  border-style: none solid solid none;
+  border-color: #e8e8e7; }
   treeview.view header button:disabled {
     border-color: #e8e8e7;
     background-image: none; }