From aa9095ff7283dc5fcd493d5e9e68a9e3a88bfd4c Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 5 Jan 2016 22:22:47 -0500
Subject: [PATCH] HighContrast: Fix up action bar styling

Since HighContrast is not using different background colors
as much as Adwaita, we need to add borders to prevent things
from running into each other.
---
 gtk/theme/HighContrast/_common.scss           | 13 ++++++++-----
 gtk/theme/HighContrast/gtk-contained-dark.css | 12 +++++++-----
 gtk/theme/HighContrast/gtk-contained.css      | 12 +++++++-----
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index 70d19c2eb7..87c29f53e1 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -1883,7 +1883,7 @@ levelbar {
 }
 
 /**********
- * Frames *
+ * rames *
  **********/
 frame border,
 .frame {
@@ -1891,10 +1891,13 @@ frame border,
   &.flat { border-style: none; }
   &:backdrop { border-color: $backdrop_borders_color; }
   padding: 0;
-  &.action-bar {
-    padding: 6px;
-    border-width: 1px 0 0;
-  }
+}
+
+actionbar box {
+  padding: 6px;
+  border-width: 1px 0 0;
+  border-color: $borders_color;
+  border-style: solid none none;
 }
 
 placessidebar,
diff --git a/gtk/theme/HighContrast/gtk-contained-dark.css b/gtk/theme/HighContrast/gtk-contained-dark.css
index 3a36f70298..e7212dc7d1 100644
--- a/gtk/theme/HighContrast/gtk-contained-dark.css
+++ b/gtk/theme/HighContrast/gtk-contained-dark.css
@@ -2058,7 +2058,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
     color: #fff; }
 
 /**********
- * Frames *
+ * rames *
  **********/
 frame border,
 .frame {
@@ -2070,10 +2070,12 @@ frame border,
   frame border:backdrop,
   .frame:backdrop {
     border-color: #737373; }
-  frame border.action-bar,
-  .frame.action-bar {
-    padding: 6px;
-    border-width: 1px 0 0; }
+
+actionbar box {
+  padding: 6px;
+  border-width: 1px 0 0;
+  border-color: gray;
+  border-style: solid none none; }
 
 placessidebar .frame,
 scrolledwindow .frame {
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index de18c6f7ee..ef465782d6 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -2058,7 +2058,7 @@ spinbutton selection:focus, modelbutton.flat:hover, modelbutton.flat:selected,
     color: #fff; }
 
 /**********
- * Frames *
+ * rames *
  **********/
 frame border,
 .frame {
@@ -2070,10 +2070,12 @@ frame border,
   frame border:backdrop,
   .frame:backdrop {
     border-color: #8d8d8d; }
-  frame border.action-bar,
-  .frame.action-bar {
-    padding: 6px;
-    border-width: 1px 0 0; }
+
+actionbar box {
+  padding: 6px;
+  border-width: 1px 0 0;
+  border-color: gray;
+  border-style: solid none none; }
 
 placessidebar .frame,
 scrolledwindow .frame {