From 1a11515118d628f502d663a45694f18b0bf02bc1 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 8 Aug 2014 22:35:48 +0200
Subject: [PATCH] Revert "Adwaita: comment out the header-bar separator"

This reverts commit b4e7ada6ac52b9930ba8d14a5f4d5d3a009cf163.
---
 gtk/resources/theme/Adwaita/_common.scss      |  4 ----
 .../theme/Adwaita/gtk-contained-dark.css      | 21 +++++--------------
 gtk/resources/theme/Adwaita/gtk-contained.css | 21 +++++--------------
 3 files changed, 10 insertions(+), 36 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 54f097776f..829a1f0df2 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -851,9 +851,6 @@ GtkComboBox {
   }
   .header-bar-separator,
   & > GtkBox > .separator.vertical {
-    -GtkWidget-wide-separators: true;
-    -GtkWidget-separator-width: 0;
-    /*
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
@@ -869,7 +866,6 @@ GtkComboBox {
                                                    0.5))
                     0 1 / 1px 1px;  //FIXME use a proper color
     }
-    */
   }
   &.selection-mode {
     color: darken($selected_bg_color, 15%);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 9c224aeddc..69ae7d894a 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -918,25 +918,14 @@ GtkComboBox {
   .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical,
   .header-bar .header-bar-separator,
   .header-bar > GtkBox > .separator.vertical {
-    -GtkWidget-wide-separators: true;
-    -GtkWidget-separator-width: 0;
-    /*
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
-    border-image: linear-gradient(to bottom,
-                                  transparentize($borders_color,1),
-                                  $borders_color 30%,
-                                  $borders_color 70%,
-                                  transparentize($borders_color,1) 100%)
-                  0 1 / 0 1px stretch; //FIXME use a proper color
-    &:backdrop {
-      border-image: linear-gradient(to bottom,
-                                    transparentize($backdrop_borders_color,
-                                                   0.5))
-                    0 1 / 1px 1px;  //FIXME use a proper color
-    }
-    */ }
+    border-image: linear-gradient(to bottom, rgba(28, 31, 31, 0), #1c1f1f 30%, #1c1f1f 70%, rgba(28, 31, 31, 0) 100%) 0 1/0 1px stretch; }
+    .titlebar .header-bar-separator:backdrop, GtkCalendar.header .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, GtkCalendar.header > GtkBox > .separator.vertical:backdrop,
+    .header-bar .header-bar-separator:backdrop,
+    .header-bar > GtkBox > .separator.vertical:backdrop {
+      border-image: linear-gradient(to bottom, rgba(30, 34, 34, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode, GtkCalendar.selection-mode.header,
   .header-bar.selection-mode {
     color: #14375d;
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index d86b062342..73287cca23 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -910,25 +910,14 @@ GtkComboBox {
   .titlebar .header-bar-separator, GtkCalendar.header .header-bar-separator, .titlebar > GtkBox > .separator.vertical, GtkCalendar.header > GtkBox > .separator.vertical,
   .header-bar .header-bar-separator,
   .header-bar > GtkBox > .separator.vertical {
-    -GtkWidget-wide-separators: true;
-    -GtkWidget-separator-width: 0;
-    /*
     -GtkWidget-wide-separators: true;
     -GtkWidget-separator-width: 1px;
     border-width: 0 1px;
-    border-image: linear-gradient(to bottom,
-                                  transparentize($borders_color,1),
-                                  $borders_color 30%,
-                                  $borders_color 70%,
-                                  transparentize($borders_color,1) 100%)
-                  0 1 / 0 1px stretch; //FIXME use a proper color
-    &:backdrop {
-      border-image: linear-gradient(to bottom,
-                                    transparentize($backdrop_borders_color,
-                                                   0.5))
-                    0 1 / 1px 1px;  //FIXME use a proper color
-    }
-    */ }
+    border-image: linear-gradient(to bottom, rgba(161, 161, 161, 0), #a1a1a1 30%, #a1a1a1 70%, rgba(161, 161, 161, 0) 100%) 0 1/0 1px stretch; }
+    .titlebar .header-bar-separator:backdrop, GtkCalendar.header .header-bar-separator:backdrop, .titlebar > GtkBox > .separator.vertical:backdrop, GtkCalendar.header > GtkBox > .separator.vertical:backdrop,
+    .header-bar .header-bar-separator:backdrop,
+    .header-bar > GtkBox > .separator.vertical:backdrop {
+      border-image: linear-gradient(to bottom, rgba(168, 168, 168, 0.5)) 0 1/1px 1px; }
   .titlebar.selection-mode, GtkCalendar.selection-mode.header,
   .header-bar.selection-mode {
     color: #256ab1;