From 945ab6c5da06cbe0e74901051df62d375d944c76 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Fri, 5 Jun 2015 19:21:22 +0200 Subject: [PATCH] fix transparent titlebars in elementary os --- common/gtk-3.0/3.14/_applications.scss | 2 -- common/gtk-3.0/3.14/_common.scss | 20 +++++++++++++++++++- common/gtk-3.0/3.14/gtk-contained-solid.css | 18 +++++++++++++++--- common/gtk-3.0/3.14/gtk-contained.css | 18 +++++++++++++++--- common/gtk-3.0/3.16/_applications.scss | 1 - common/gtk-3.0/3.16/_common.scss | 19 ++++++++++++++++++- common/gtk-3.0/3.16/gtk-contained-solid.css | 18 +++++++++++++++--- common/gtk-3.0/3.16/gtk-contained.css | 18 +++++++++++++++--- 8 files changed, 97 insertions(+), 17 deletions(-) diff --git a/common/gtk-3.0/3.14/_applications.scss b/common/gtk-3.0/3.14/_applications.scss index 5e2fdf6..6bd23fb 100644 --- a/common/gtk-3.0/3.14/_applications.scss +++ b/common/gtk-3.0/3.14/_applications.scss @@ -638,8 +638,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; - .titlebar { background-color: $header_bg; } - .notebook { &.header.top { diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss index f13e097..9a596e1 100644 --- a/common/gtk-3.0/3.14/_common.scss +++ b/common/gtk-3.0/3.14/_common.scss @@ -1125,11 +1125,29 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: $header_fg; + background-color: opacify($header_bg, 1); box-shadow: inset 0 1px lighten($header_bg, 3%); - &:backdrop { color: transparentize($header_fg, 0.3); } + .csd & { background-color: $header_bg; } + + &:backdrop { + color: transparentize($header_fg, 0.3); + background-color: opacify($header_bg, 1); + + .csd & { background-color: lighten($header_bg, 3%); } + } + + .maximized & { + background-color: opacify($header_bg, 1); + + &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); } + } } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { background-color: transparent; } + // Only extending .header-bar avoids some problems (Gnome Documents searchbar) .header-bar { .header-bar-separator, diff --git a/common/gtk-3.0/3.14/gtk-contained-solid.css b/common/gtk-3.0/3.14/gtk-contained-solid.css index 2619242..1a77432 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -851,9 +851,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px #eff0f2; } + .csd .titlebar { + background-color: #e7e8eb; } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: #eff0f2; } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2815,8 +2829,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: #e7e8eb; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 756f765..a6d47ce 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -851,9 +851,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); } + .csd .titlebar { + background-color: rgba(231, 232, 235, 0.95); } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: rgba(239, 240, 242, 0.95); } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2815,8 +2829,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: rgba(231, 232, 235, 0.95); } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss index dd99e90..6c41b73 100644 --- a/common/gtk-3.0/3.16/_applications.scss +++ b/common/gtk-3.0/3.16/_applications.scss @@ -686,7 +686,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; - .titlebar { background-color: $header_bg; } .notebook { diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index 164ed58..a24947c 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -1134,11 +1134,28 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: $header_fg; + background-color: opacify($header_bg, 1); box-shadow: inset 0 1px lighten($header_bg, 3%); - &:backdrop { color: transparentize($header_fg, 0.3); } + .csd & { background-color: $header_bg; } + + &:backdrop { + color: transparentize($header_fg, 0.3); + background-color: opacify($header_bg, 1); + + .csd & { background-color: lighten($header_bg, 3%); } + } + + .maximized & { + background-color: opacify($header_bg, 1); + + &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); } + } } +.titlebar .titlebar, +.titlebar .titlebar:backdrop { background-color: transparent; } + // Only extending .header-bar avoids some problems (Gnome Documents searchbar) .header-bar { .header-bar-separator, 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 15d5e13..47f31b2 100644 --- a/common/gtk-3.0/3.16/gtk-contained-solid.css +++ b/common/gtk-3.0/3.16/gtk-contained-solid.css @@ -858,9 +858,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px #eff0f2; } + .csd .titlebar { + background-color: #e7e8eb; } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: #eff0f2; } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2760,8 +2774,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: #e7e8eb; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 43e3cb3..3a503e9 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -858,9 +858,23 @@ GtkComboBox { padding-right: 7px; border-radius: 4px 4px 0 0; color: rgba(82, 93, 118, 0.8); + background-color: #e7e8eb; box-shadow: inset 0 1px rgba(239, 240, 242, 0.95); } + .csd .titlebar { + background-color: rgba(231, 232, 235, 0.95); } .titlebar:backdrop { - color: rgba(82, 93, 118, 0.5); } + color: rgba(82, 93, 118, 0.5); + background-color: #e7e8eb; } + .csd .titlebar:backdrop { + background-color: rgba(239, 240, 242, 0.95); } + .maximized .titlebar { + background-color: #e7e8eb; } + .maximized .titlebar:backdrop { + background-color: #eff0f2; } + +.titlebar .titlebar, +.titlebar .titlebar:backdrop { + background-color: transparent; } .primary-toolbar .separator, .primary-toolbar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .primary-toolbar .view.separator, .header-bar .header-bar-separator, .header-bar > GtkBox > .separator.vertical { -GtkWidget-wide-separators: true; @@ -2760,8 +2774,6 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } - PantheonTerminalPantheonTerminalWindow.background .titlebar { - background-color: rgba(231, 232, 235, 0.95); } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; }