From c756cef80a661de0bf33818eb551a04c7fb96b29 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Thu, 6 Nov 2014 17:21:50 +0100
Subject: [PATCH] Adwaita: remove last child border on backdrop column headers

---
 gtk/resources/theme/Adwaita/_common.scss           | 4 +++-
 gtk/resources/theme/Adwaita/gtk-contained-dark.css | 4 ++--
 gtk/resources/theme/Adwaita/gtk-contained.css      | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index d367684f4b..47b993a6a8 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1464,7 +1464,9 @@ column-header {
     }
   }
   &:last-child .button,
-  &:last-child.button { //treeview-like derived widgets in Banshee and Evolution
+  &:last-child .button:backdrop, // set :backdrop too or the border will be visibile there
+  &:last-child.button,
+  &:last-child.button:backdrop { //treeview-like derived widgets in Banshee and Evolution
     border-right-style: none;
   }
 }
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index a31a443df1..c060f65fbf 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1989,8 +1989,8 @@ column-header .titlebar .button.titlebutton,
     transition: none; }
 column-header:last-child .button, column-header:last-child .header-bar .button.titlebutton, .header-bar column-header:last-child .button.titlebutton,
 column-header:last-child .titlebar .button.titlebutton,
-.titlebar column-header:last-child .button.titlebutton, column-header:last-child.button, .header-bar column-header.button.titlebutton:last-child,
-.titlebar column-header.button.titlebutton:last-child {
+.titlebar column-header:last-child .button.titlebutton, column-header:last-child .button:backdrop, column-header:last-child.button, .header-bar column-header.button.titlebutton:last-child,
+.titlebar column-header.button.titlebutton:last-child, column-header:last-child.button:backdrop {
   border-right-style: none; }
 
 column-header.button.dnd, column-header .button.dnd, column-header .header-bar .dnd.button.titlebutton, .header-bar column-header .dnd.button.titlebutton,
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index f9eca09ea9..24b551ac23 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1986,8 +1986,8 @@ column-header .titlebar .button.titlebutton,
     transition: none; }
 column-header:last-child .button, column-header:last-child .header-bar .button.titlebutton, .header-bar column-header:last-child .button.titlebutton,
 column-header:last-child .titlebar .button.titlebutton,
-.titlebar column-header:last-child .button.titlebutton, column-header:last-child.button, .header-bar column-header.button.titlebutton:last-child,
-.titlebar column-header.button.titlebutton:last-child {
+.titlebar column-header:last-child .button.titlebutton, column-header:last-child .button:backdrop, column-header:last-child.button, .header-bar column-header.button.titlebutton:last-child,
+.titlebar column-header.button.titlebutton:last-child, column-header:last-child.button:backdrop {
   border-right-style: none; }
 
 column-header.button.dnd, column-header .button.dnd, column-header .header-bar .dnd.button.titlebutton, .header-bar column-header .dnd.button.titlebutton,