From c1dbf9641373cfb8dfdbaa27e61c3284bf855a20 Mon Sep 17 00:00:00 2001 From: Jakub Steiner Date: Mon, 22 Oct 2018 10:41:41 +0200 Subject: [PATCH] Adwaita: prevent devel styling break selection mode - Selection mode does not get the special devel styling. - removed teh last-child() selector for it doesn't work anymore. Better style all section of the headerbar than none. Proper fix pending. --- gtk/theme/Adwaita/_common.scss | 2 +- gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++-- gtk/theme/Adwaita/gtk-contained.css | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index cfd272c918..5bf0e958d0 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -1773,7 +1773,7 @@ headerbar { // headerbar border rounding // Development versions of apps to use a differently styled headerbar window.devel { - headerbar:last-child { + headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, mix($selected_bg_color, $bg_color, 10%) 8%, $bg_color 25%); color: transparentize($fg_color,.9); diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index f24eaecf74..58ca68c8ff 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -688,9 +688,9 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .titlebar:not(headerbar) > separator { background-color: #1b1f20; } -window.devel headerbar:last-child { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #313d45 8%, #33393b 25%); color: rgba(238, 238, 236, 0.1); } +window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #313d45 8%, #33393b 25%); color: rgba(238, 238, 236, 0.1); } -window.devel headerbar:last-child label { color: #eeeeec; } +window.devel headerbar.titlebar:not(.selection-mode) label { color: #eeeeec; } /************ Pathbars * */ .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; } diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index b6b2226c5c..912018d595 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -696,9 +696,9 @@ window.csd > .titlebar:not(headerbar) { padding: 0; background-color: transparen .titlebar:not(headerbar) > separator { background-color: #b6b6b3; } -window.devel headerbar:last-child { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #d8dfe6 8%, #e8e8e7 25%); color: rgba(46, 52, 54, 0.1); } +window.devel headerbar.titlebar:not(.selection-mode) { background: transparent -gtk-icontheme("system-run-symbolic") 90% 0/256px 256px no-repeat, linear-gradient(to left, #d8dfe6 8%, #e8e8e7 25%); color: rgba(46, 52, 54, 0.1); } -window.devel headerbar:last-child label { color: #2e3436; } +window.devel headerbar.titlebar:not(.selection-mode) label { color: #2e3436; } /************ Pathbars * */ .path-bar button.text-button, .path-bar button.image-button, .path-bar button { padding-left: 4px; padding-right: 4px; }