From aa339ee30ca1420217e772ce3a5eedb507bf9d67 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Mon, 16 Jun 2014 16:45:24 +0200
Subject: [PATCH] Adwaita: column headers visual simplification

---
 gtk/resources/theme/Adwaita/_common.scss      | 55 +++++++++++++------
 .../theme/Adwaita/gtk-contained-dark.css      | 38 +++++++++----
 gtk/resources/theme/Adwaita/gtk-contained.css | 38 +++++++++----
 3 files changed, 89 insertions(+), 42 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index c8bd130292..d382b09563 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -651,25 +651,44 @@ GtkComboBox {
 /**************
  * Tree Views *
  **************/
-
-column-header { // FIXME: something better
-  .button,
-  .button:hover,
-  .button:active,
-  .button:backdrop {
-    border-width: 0 1px 1px 0;
-    border-color: transparent;
-    box-shadow: none;
-    border-radius: 0;
-    border-image: linear-gradient(to top,
-                              mix($borders_color, $base_color, 50%),
-                              $base_color
-                              ) 0 1 1 0;
-    background-image: none;
-    background-color: $base_color;
-    color: mix($fg_color,$base_color,50%);
-    text-shadow: none;
+column-header {
+  .button {
+    @extend %column_header_button;
+    $_column_header_color: mix($fg_color,$base_color,50%);
+    color: $_column_header_color;
     font-weight: bold;
+    text-shadow: none;
+    box-shadow: none;
+    &:hover {
+      @extend %column_header_button;
+      color: mix($_column_header_color,$fg_color,50%);
+      box-shadow: none;
+    }
+    &:active {
+      @extend %column_header_button;
+      color: $fg_color;
+    }
+  }
+  &:last-child .button { border-right-style: none;  }
+}
+
+%column_header_button {
+  border-width: 0 1px 1px 0;
+  border-radius: 0;
+  background-image: none;
+  border-color: $bg_color;
+  text-shadow: none;
+  &:insensitive {
+    border-color: $bg_color;
+    background-image: none;
+  }
+  &:backdrop {
+    border-color: $backdrop_bg_color;
+    background-image: none;
+    &:insensitive {
+      border-color: $backdrop_bg_color;
+      background-image: none;
+    }
   }
 }
 
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index ba4a9ac16b..bd2e573966 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -843,20 +843,34 @@ GtkComboBox {
 /**************
  * Tree Views *
  **************/
-column-header .button,
-column-header .button:hover,
-column-header .button:active,
-column-header .button:backdrop {
-  border-width: 0 1px 1px 0;
-  border-color: transparent;
-  box-shadow: none;
-  border-radius: 0;
-  border-image: linear-gradient(to top, #222424, #292929) 0 1 1 0;
-  background-image: none;
-  background-color: #292929;
+column-header .button {
   color: #8b8b8a;
+  font-weight: bold;
   text-shadow: none;
-  font-weight: bold; }
+  box-shadow: none; }
+  column-header .button:hover {
+    color: #bcbcbb;
+    box-shadow: none; }
+  column-header .button:active {
+    color: #eeeeec; }
+column-header:last-child .button {
+  border-right-style: none; }
+
+column-header .button, column-header .button:hover, column-header .button:active {
+  border-width: 0 1px 1px 0;
+  border-radius: 0;
+  background-image: none;
+  border-color: #393f3f;
+  text-shadow: none; }
+  column-header .button:insensitive {
+    border-color: #393f3f;
+    background-image: none; }
+  column-header .button:backdrop {
+    border-color: #393f3f;
+    background-image: none; }
+    column-header .button:backdrop:insensitive {
+      border-color: #393f3f;
+      background-image: none; }
 
 /*********
  * Menus *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 13a1947a8e..3e5c8ba05b 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -843,20 +843,34 @@ GtkComboBox {
 /**************
  * Tree Views *
  **************/
-column-header .button,
-column-header .button:hover,
-column-header .button:active,
-column-header .button:backdrop {
-  border-width: 0 1px 1px 0;
-  border-color: transparent;
-  box-shadow: none;
-  border-radius: 0;
-  border-image: linear-gradient(to top, #d0d0d0, white) 0 1 1 0;
-  background-image: none;
-  background-color: white;
+column-header .button {
   color: #96999a;
+  font-weight: bold;
   text-shadow: none;
-  font-weight: bold; }
+  box-shadow: none; }
+  column-header .button:hover {
+    color: #626668;
+    box-shadow: none; }
+  column-header .button:active {
+    color: #2e3436; }
+column-header:last-child .button {
+  border-right-style: none; }
+
+column-header .button, column-header .button:hover, column-header .button:active {
+  border-width: 0 1px 1px 0;
+  border-radius: 0;
+  background-image: none;
+  border-color: #ededed;
+  text-shadow: none; }
+  column-header .button:insensitive {
+    border-color: #ededed;
+    background-image: none; }
+  column-header .button:backdrop {
+    border-color: #ededed;
+    background-image: none; }
+    column-header .button:backdrop:insensitive {
+      border-color: #ededed;
+      background-image: none; }
 
 /*********
  * Menus *