From 364462182f7485f58a516593295b6b0cc6fca484 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 6 Jul 2015 18:32:40 +0200 Subject: [PATCH] more gedit fixes --- common/gtk-3.0/3.16/_transparent_widgets.scss | 15 ++++++++++++--- common/gtk-3.0/3.16/gtk-contained-dark.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained-darker.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained-solid-dark.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained-solid.css | 7 ++++++- common/gtk-3.0/3.16/gtk-contained.css | 7 ++++++- 6 files changed, 42 insertions(+), 8 deletions(-) diff --git a/common/gtk-3.0/3.16/_transparent_widgets.scss b/common/gtk-3.0/3.16/_transparent_widgets.scss index 1085db6..cea767d 100644 --- a/common/gtk-3.0/3.16/_transparent_widgets.scss +++ b/common/gtk-3.0/3.16/_transparent_widgets.scss @@ -1,5 +1,5 @@ .titlebar .separator { - color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); //fixes separator in gnome-tweak-tool + color: $header_border; //fixes separator in gnome-tweak-tool } GtkFileChooserDialog .dialog-action-box { background-color: $bg_color } // fix for non gnome environments @@ -94,9 +94,18 @@ GeditWindow.background.csd { .pane-separator, .pane-separator:hover { background-color: $dark_sidebar_border; } - .titlebar .pane-separator { background-color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); } + .titlebar .pane-separator, + &.maximized .titlebar .pane-separator, + .titlebar .pane-separator:backdrop, + &.maximized .titlebar .pane-separator:backdrop { background-color: $header_border; } - .titlebar { background-color: transparent } + .titlebar { background-color: transparent; } + + &.maximized .titlebar { + background-color: opacify($header_bg, 1); + + &:backdrop { background-color: $header_bg_backdrop; } + } .gedit-titlebar-left.titlebar, .gedit-titlebar-right.titlebar { diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css index f47ab43..3928299 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -3235,10 +3235,15 @@ GeditWindow.background.csd { GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { background-color: rgba(32, 35, 39, 0.95); } - GeditWindow.background.csd .titlebar .pane-separator { + GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, + GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { background-color: rgba(26, 28, 32, 0.96); } GeditWindow.background.csd .titlebar { background-color: transparent; } + GeditWindow.background.csd.maximized .titlebar { + background-color: #25282e; } + GeditWindow.background.csd.maximized .titlebar:backdrop { + background-color: rgba(40, 44, 50, 0.96); } GeditWindow.background.csd .gedit-titlebar-left.titlebar, GeditWindow.background.csd .gedit-titlebar-right.titlebar { background-color: rgba(37, 40, 46, 0.96); } diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css index 7b8fac4..7e94cdb 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -3227,10 +3227,15 @@ GeditWindow.background.csd { GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { background-color: rgba(60, 64, 73, 0.95); } - GeditWindow.background.csd .titlebar .pane-separator { + GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, + GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { background-color: rgba(31, 34, 39, 0.95); } GeditWindow.background.csd .titlebar { background-color: transparent; } + GeditWindow.background.csd.maximized .titlebar { + background-color: #2f343b; } + GeditWindow.background.csd.maximized .titlebar:backdrop { + background-color: rgba(50, 56, 63, 0.95); } GeditWindow.background.csd .gedit-titlebar-left.titlebar, GeditWindow.background.csd .gedit-titlebar-right.titlebar { background-color: rgba(47, 52, 59, 0.95); } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css index 2ec8dc4..31815a3 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css @@ -3235,10 +3235,15 @@ GeditWindow.background.csd { GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { background-color: #202327; } - GeditWindow.background.csd .titlebar .pane-separator { + GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, + GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { background-color: #1a1c20; } GeditWindow.background.csd .titlebar { background-color: transparent; } + GeditWindow.background.csd.maximized .titlebar { + background-color: #25282e; } + GeditWindow.background.csd.maximized .titlebar:backdrop { + background-color: #282c32; } GeditWindow.background.csd .gedit-titlebar-left.titlebar, GeditWindow.background.csd .gedit-titlebar-right.titlebar { background-color: #25282E; } diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css index 60f2847..ef97677 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -3226,10 +3226,15 @@ GeditWindow.background.csd { GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { background-color: #3c4049; } - GeditWindow.background.csd .titlebar .pane-separator { + GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, + GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { background-color: #d4d5db; } GeditWindow.background.csd .titlebar { background-color: transparent; } + GeditWindow.background.csd.maximized .titlebar { + background-color: #e7e8eb; } + GeditWindow.background.csd.maximized .titlebar:backdrop { + background-color: #eff0f2; } GeditWindow.background.csd .gedit-titlebar-left.titlebar, GeditWindow.background.csd .gedit-titlebar-right.titlebar { background-color: #e7e8eb; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 49793e9..d8a5ac1 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -3226,10 +3226,15 @@ GeditWindow.background.csd { GeditWindow.background.csd .pane-separator, GeditWindow.background.csd .pane-separator:hover { background-color: rgba(60, 64, 73, 0.95); } - GeditWindow.background.csd .titlebar .pane-separator { + GeditWindow.background.csd .titlebar .pane-separator, GeditWindow.background.csd.maximized .titlebar .pane-separator, + GeditWindow.background.csd .titlebar .pane-separator:backdrop, GeditWindow.background.csd.maximized .titlebar .pane-separator:backdrop { background-color: rgba(212, 213, 219, 0.95); } GeditWindow.background.csd .titlebar { background-color: transparent; } + GeditWindow.background.csd.maximized .titlebar { + background-color: #e7e8eb; } + GeditWindow.background.csd.maximized .titlebar:backdrop { + background-color: rgba(239, 240, 242, 0.95); } GeditWindow.background.csd .gedit-titlebar-left.titlebar, GeditWindow.background.csd .gedit-titlebar-right.titlebar { background-color: rgba(231, 232, 235, 0.95); }