[libhandy] themes: Reshuffle window outline



commit afd86e336fe88577daefb2b0cb6c4ae4106d2892
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Sat Aug 1 05:46:33 2020 +0500

    themes: Reshuffle window outline
    
    Make it work better for selection mode and colorful content in light mode.
    
    Fixes https://gitlab.gnome.org/GNOME/libhandy/-/issues/322
    
    Signed-off-by: Alexander Mikhaylenko <alexm gnome org>

 src/themes/Adwaita-dark.css        | 4 +++-
 src/themes/Adwaita.css             | 6 ++++--
 src/themes/HighContrast.css        | 6 ++++--
 src/themes/HighContrastInverse.css | 4 +++-
 src/themes/_Adwaita-base.scss      | 8 ++++++--
 5 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/src/themes/Adwaita-dark.css b/src/themes/Adwaita-dark.css
index 5fbb0dd2..772ba5aa 100644
--- a/src/themes/Adwaita-dark.css
+++ b/src/themes/Adwaita-dark.css
@@ -174,7 +174,9 @@ list.content > row.expander:checked:not(:first-child), list.content > row.expand
 
 button.list-button:not(:active):not(:checked):not(:hover) { background: none; border: 1px solid 
alpha(#1b1b1b, 0.5); box-shadow: none; }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none; }
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: inset 0 1px rgba(255, 255, 255, 
0); }
+
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar.selection-mode { box-shadow: none; }
 
 window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.065); }
 
diff --git a/src/themes/Adwaita.css b/src/themes/Adwaita.css
index 77dd0b75..476b451b 100644
--- a/src/themes/Adwaita.css
+++ b/src/themes/Adwaita.css
@@ -174,8 +174,10 @@ list.content > row.expander:checked:not(:first-child), list.content > row.expand
 
 button.list-button:not(:active):not(:checked):not(:hover) { background: none; border: 1px solid 
alpha(#cdc7c2, 0.5); box-shadow: none; }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none; }
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: inset 0 1px rgba(255, 255, 255, 
0.7); }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.8); }
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar.selection-mode { box-shadow: none; }
+
+window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.34); }
 
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized),
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
diff --git a/src/themes/HighContrast.css b/src/themes/HighContrast.css
index 19540e60..8a967d4b 100644
--- a/src/themes/HighContrast.css
+++ b/src/themes/HighContrast.css
@@ -174,8 +174,10 @@ list.content > row.expander:checked:not(:first-child), list.content > row.expand
 
 button.list-button:not(:active):not(:checked):not(:hover) { background: none; border: 1px solid 
alpha(#877b6e, 0.5); box-shadow: none; }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none; }
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: inset 0 1px rgba(255, 255, 255, 
0.7); }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.8); }
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar.selection-mode { box-shadow: none; }
+
+window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.34); }
 
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized),
 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration, 
window.csd.unified:not(.solid-csd):not(.fullscreen):not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized)
decoration-overlay { border-radius: 8px; }
diff --git a/src/themes/HighContrastInverse.css b/src/themes/HighContrastInverse.css
index af19c664..74d7b423 100644
--- a/src/themes/HighContrastInverse.css
+++ b/src/themes/HighContrastInverse.css
@@ -174,7 +174,9 @@ list.content > row.expander:checked:not(:first-child), list.content > row.expand
 
 button.list-button:not(:active):not(:checked):not(:hover) { background: none; border: 1px solid 
alpha(#686868, 0.5); box-shadow: none; }
 
-window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: none; }
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar { box-shadow: inset 0 1px rgba(255, 255, 255, 
0); }
+
+window.csd.unified:not(.solid-csd):not(.fullscreen) headerbar.selection-mode { box-shadow: none; }
 
 window.csd.unified:not(.solid-csd):not(.fullscreen) > decoration-overlay { box-shadow: inset 0 1px rgba(255, 
255, 255, 0.065); }
 
diff --git a/src/themes/_Adwaita-base.scss b/src/themes/_Adwaita-base.scss
index ebaa9d11..cc0b7542 100644
--- a/src/themes/_Adwaita-base.scss
+++ b/src/themes/_Adwaita-base.scss
@@ -312,14 +312,18 @@ button.list-button:not(:active):not(:checked):not(:hover) {
 window.csd.unified:not(.solid-csd):not(.fullscreen) {
   // Remove the sheen on headerbar...
   headerbar {
-    box-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, if($variant == 'light', 0.7, 0));
+
+    &.selection-mode {
+      box-shadow: none;
+    }
   }
 
   // ...and add it on the window itself
   > decoration-overlay {
     // Use a white sheen instead of @borders, as it has to be neutral enough
     // for any content and not just headerbar background
-    box-shadow: inset 0 1px rgba(255, 255, 255, if($variant == 'light', 0.8, 0.065));
+    box-shadow: inset 0 1px rgba(255, 255, 255, if($variant == 'light', 0.34, 0.065));
   }
 
   &:not(.tiled):not(.tiled-top):not(.tiled-bottom):not(.tiled-left):not(.tiled-right):not(.maximized) {


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