[gtk+] HC: Avoid inflated titlebar separator in GEdit etc



commit 4269ca0bfa0f20b7c60085300fea0e7e3456f611
Author: Daniel Boles <dboles src gnome org>
Date:   Sat Oct 7 01:27:05 2017 +0100

    HC: Avoid inflated titlebar separator in GEdit etc
    
    It was selecting paned separator, which means any separator at any level
    of descent within a paned, including the toplevel container in GEdit.
    
    We need to be more specific and only select the relevant separator that
    is the direct child of the paned. This is what Adwaita does.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=788573

 gtk/theme/HighContrast/_common.scss              |   17 +++++++++++------
 gtk/theme/HighContrast/gtk-contained-inverse.css |   14 +++++++-------
 gtk/theme/HighContrast/gtk-contained.css         |   14 +++++++-------
 3 files changed, 25 insertions(+), 20 deletions(-)
---
diff --git a/gtk/theme/HighContrast/_common.scss b/gtk/theme/HighContrast/_common.scss
index e21a20a..06d78cf 100644
--- a/gtk/theme/HighContrast/_common.scss
+++ b/gtk/theme/HighContrast/_common.scss
@@ -3072,30 +3072,35 @@ placesview {
 
 
 paned {
-  separator {
+  > separator {
     min-width: 1px;
     min-height: 1px;
     background-image: _solid($borders_color);
+
     &:backdrop {
       background-image: _solid($backdrop_borders_color);
     }
   }
-   &:dir(ltr).horizontal separator {
+
+  &:dir(ltr).horizontal > separator {
     margin: 0 -8px 0 0;
     padding: 0 8px 0 0;
   }
-  &:dir(rtl).horizontal separator {
+  &:dir(rtl).horizontal > separator {
     margin: 0 0 0 -8px;
     padding: 0 0 0 8px;
   }
-  &.vertical separator {
+
+  &.vertical > separator {
     margin: 0 0 -8px 0;
     padding: 0 0 8px 0;
   }
-  separator:selected {
+
+  > separator:selected {
     background-color: $selected_bg_color;
   }
-  separator.wide {
+
+  > separator.wide {
     min-width: 5px;
     min-height: 5px;
     background-color: transparent;
diff --git a/gtk/theme/HighContrast/gtk-contained-inverse.css 
b/gtk/theme/HighContrast/gtk-contained-inverse.css
index d1a3a4e..f451e22 100644
--- a/gtk/theme/HighContrast/gtk-contained-inverse.css
+++ b/gtk/theme/HighContrast/gtk-contained-inverse.css
@@ -1371,19 +1371,19 @@ placesview .server-list-button:checked > image { transition: 200ms cubic-bezier(
 placesview row.activatable:hover { background-color: transparent; }
 
 /********* Paned * */
-paned separator { min-width: 1px; min-height: 1px; background-image: linear-gradient(to bottom, gray, gray); 
}
+paned > separator { min-width: 1px; min-height: 1px; background-image: linear-gradient(to bottom, gray, 
gray); }
 
-paned separator:backdrop { background-image: linear-gradient(to bottom, #737373, #737373); }
+paned > separator:backdrop { background-image: linear-gradient(to bottom, #737373, #737373); }
 
-paned:dir(ltr).horizontal separator { margin: 0 -8px 0 0; padding: 0 8px 0 0; }
+paned:dir(ltr).horizontal > separator { margin: 0 -8px 0 0; padding: 0 8px 0 0; }
 
-paned:dir(rtl).horizontal separator { margin: 0 0 0 -8px; padding: 0 0 0 8px; }
+paned:dir(rtl).horizontal > separator { margin: 0 0 0 -8px; padding: 0 0 0 8px; }
 
-paned.vertical separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; }
+paned.vertical > separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; }
 
-paned separator:selected { background-color: #ddd; }
+paned > separator:selected { background-color: #ddd; }
 
-paned separator.wide { min-width: 5px; min-height: 5px; background-color: transparent; border-style: none 
solid; border-color: gray; border-width: 1px; }
+paned > separator.wide { min-width: 5px; min-height: 5px; background-color: transparent; border-style: none 
solid; border-color: gray; border-width: 1px; }
 
 /************** GtkInfoBar * */
 infobar { border-width: 0; border-style: none; }
diff --git a/gtk/theme/HighContrast/gtk-contained.css b/gtk/theme/HighContrast/gtk-contained.css
index fae7eec..5c30e18 100644
--- a/gtk/theme/HighContrast/gtk-contained.css
+++ b/gtk/theme/HighContrast/gtk-contained.css
@@ -1377,19 +1377,19 @@ placesview .server-list-button:checked > image { transition: 200ms cubic-bezier(
 placesview row.activatable:hover { background-color: transparent; }
 
 /********* Paned * */
-paned separator { min-width: 1px; min-height: 1px; background-image: linear-gradient(to bottom, gray, gray); 
}
+paned > separator { min-width: 1px; min-height: 1px; background-image: linear-gradient(to bottom, gray, 
gray); }
 
-paned separator:backdrop { background-image: linear-gradient(to bottom, #8d8d8d, #8d8d8d); }
+paned > separator:backdrop { background-image: linear-gradient(to bottom, #8d8d8d, #8d8d8d); }
 
-paned:dir(ltr).horizontal separator { margin: 0 -8px 0 0; padding: 0 8px 0 0; }
+paned:dir(ltr).horizontal > separator { margin: 0 -8px 0 0; padding: 0 8px 0 0; }
 
-paned:dir(rtl).horizontal separator { margin: 0 0 0 -8px; padding: 0 0 0 8px; }
+paned:dir(rtl).horizontal > separator { margin: 0 0 0 -8px; padding: 0 0 0 8px; }
 
-paned.vertical separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; }
+paned.vertical > separator { margin: 0 0 -8px 0; padding: 0 0 8px 0; }
 
-paned separator:selected { background-color: #000; }
+paned > separator:selected { background-color: #000; }
 
-paned separator.wide { min-width: 5px; min-height: 5px; background-color: transparent; border-style: none 
solid; border-color: gray; border-width: 1px; }
+paned > separator.wide { min-width: 5px; min-height: 5px; background-color: transparent; border-style: none 
solid; border-color: gray; border-width: 1px; }
 
 /************** GtkInfoBar * */
 infobar { border-width: 0; border-style: none; }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]