From 88a12fe777ba3cc0ff8c8c13bf0c3b990408c6be Mon Sep 17 00:00:00 2001
From: Jakub Steiner <jimmac@gmail.com>
Date: Tue, 2 Dec 2014 15:00:30 +0100
Subject: [PATCH] HC: sidebars and vertical toolbars with borders

- the assumption for vertical toolbar being on the left is perhaps
  a little daring, but...

https://bugzilla.gnome.org/show_bug.cgi?id=740859
---
 gtk/theme/HighContrast/_common.scss | 20 ++++++++++++++++----
 gtk/theme/HighContrast/gtk.css      | 16 +++++++++++-----
 2 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 9a7c212f08..3fff4f72be 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -828,6 +828,13 @@ GtkComboBox {
     border-width: 0 0 1px;
     padding: 3px;
   }
+  &.vertical {
+    border-right: 1px solid $borders_color;
+    &:dir(rtl) {
+      border-right: none;
+      border-left: 1px solid $borders_color;
+    }
+  }
 }
 
 %inset-bar {
@@ -1990,10 +1997,7 @@ GtkFileChooserDialog {
  ***********/
 
 .sidebar {
-  border-width: 1px 0 0 0;
-  border-style: solid;
-  border-color: $borders_color;
-  &:dir(rtl) { border-width: 0 0 0 1px; }
+  border: none;
   &:backdrop {
     background-color: $bg_color;
   }
@@ -2001,6 +2005,14 @@ GtkFileChooserDialog {
   &:selected {
     @extend %selected_items;
   }
+
+  & > GtkScrolledWindow > .frame {
+    border-right: 1px solid $borders_color;
+    &:dir(rtl) {
+      border-right: none;
+      border-left: 1px solid $borders_color;
+    }
+  }
 }
 
 // Places sidebar is a special case, since the view here have to look like chrome not content, so we override text color
diff --git a/gtk/theme/HighContrast/gtk.css b/gtk/theme/HighContrast/gtk.css
index aa534bc512..41ec487019 100644
--- a/gtk/theme/HighContrast/gtk.css
+++ b/gtk/theme/HighContrast/gtk.css
@@ -946,6 +946,11 @@ GtkComboBox {
   .toolbar.search-bar {
     border-width: 0 0 1px;
     padding: 3px; }
+  .toolbar.vertical {
+    border-right: 1px solid #7f7f7f; }
+    .toolbar.vertical:dir(rtl) {
+      border-right: none;
+      border-left: 1px solid #7f7f7f; }
 
 .toolbar.inline-toolbar, .toolbar.search-bar {
   border-style: solid;
@@ -2173,13 +2178,14 @@ GtkFileChooserDialog .dialog-action-box {
  * Sidebar *
  ***********/
 .sidebar {
-  border-width: 1px 0 0 0;
-  border-style: solid;
-  border-color: #7f7f7f; }
-  .sidebar:dir(rtl) {
-    border-width: 0 0 0 1px; }
+  border: none; }
   .sidebar:backdrop {
     background-color: #fff; }
+  .sidebar > GtkScrolledWindow > .frame {
+    border-right: 1px solid #7f7f7f; }
+    .sidebar > GtkScrolledWindow > .frame:dir(rtl) {
+      border-right: none;
+      border-left: 1px solid #7f7f7f; }
 
 GtkPlacesSidebar.sidebar .view {
   color: #000;