aboutsummaryrefslogtreecommitdiff
path: root/common/gtk-3.0/3.16
diff options
context:
space:
mode:
authorHorst31802015-06-06 10:54:13 +0200
committerHorst31802015-06-06 10:54:13 +0200
commit3b0d4c586ccac246aae773298ba3f3b13d213818 (patch)
tree9b7eddb727d8b73518a6b7d30440abfd5270cf7b /common/gtk-3.0/3.16
parenteafa0fc568311f8fd08bbfd33e9e74f8c0d5cf26 (diff)
parent945ab6c5da06cbe0e74901051df62d375d944c76 (diff)
downloadsolarc-theme-3b0d4c586ccac246aae773298ba3f3b13d213818.tar.gz
solarc-theme-3b0d4c586ccac246aae773298ba3f3b13d213818.tar.xz
solarc-theme-3b0d4c586ccac246aae773298ba3f3b13d213818.zip
Merge branch 'master' into dark_variant
Diffstat (limited to 'common/gtk-3.0/3.16')
-rw-r--r--common/gtk-3.0/3.16/_applications.scss1
-rw-r--r--common/gtk-3.0/3.16/_common.scss19
-rw-r--r--common/gtk-3.0/3.16/gtk-contained-solid.css18
-rw-r--r--common/gtk-3.0/3.16/gtk-contained.css18
4 files changed, 48 insertions, 8 deletions
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 a919e8c..40181b2 100644
--- a/common/gtk-3.0/3.16/_common.scss
+++ b/common/gtk-3.0/3.16/_common.scss
@@ -1135,11 +1135,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 abe2177..e46b99d 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; }