From f47cb744c2c0c8795462eda828e6c6636037abb0 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Mon, 6 Jul 2015 17:50:35 +0200 Subject: add new color variable --- common/gtk-3.0/3.16/_applications.scss | 8 ++++---- common/gtk-3.0/3.16/_colors.scss | 2 ++ common/gtk-3.0/3.16/_common.scss | 2 +- common/gtk-3.0/3.16/gtk-contained-dark.css | 2 +- common/gtk-3.0/3.16/gtk-contained-darker.css | 2 +- common/gtk-3.0/3.16/gtk-contained.css | 2 +- 6 files changed, 10 insertions(+), 8 deletions(-) (limited to 'common') diff --git a/common/gtk-3.0/3.16/_applications.scss b/common/gtk-3.0/3.16/_applications.scss index b24f968..66729e7 100644 --- a/common/gtk-3.0/3.16/_applications.scss +++ b/common/gtk-3.0/3.16/_applications.scss @@ -40,7 +40,7 @@ TerminalWindow { .notebook { &.header.top { - box-shadow: inset 0 1px if($variant == 'light', darken(opacify($header_bg, 1), 7%), darken(opacify($header_bg, 1), 5%)), + box-shadow: inset 0 1px opacify($header_border, 1), inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%)); } @@ -54,7 +54,7 @@ TerminalWindow { &.reorderable-page.top:active, &.reorderable-page.top:active:hover { background-color: opacify($header_bg, 1); - border-color: if($variant == 'light', darken(opacify($header_bg, 1), 7%), darken(opacify($header_bg, 1), 5%)); + border-color: opacify($header_border, 1); &:backdrop { background-color: opacify($header_bg_backdrop, 1); } } @@ -163,7 +163,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button { // // Gedit // -.gedit-headerbar-paned { color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); } +.gedit-headerbar-paned { color: $header_border; } .open-document-selector-treeview.view { padding: 3px 6px 3px 6px; @@ -686,7 +686,7 @@ PantheonTerminalPantheonTerminalWindow.background { .notebook { &.header.top { - box-shadow: inset 0 1px if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)), + box-shadow: inset 0 1px opacify($header_border, 1), inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%)); } } diff --git a/common/gtk-3.0/3.16/_colors.scss b/common/gtk-3.0/3.16/_colors.scss index 11152ec..251e2f9 100644 --- a/common/gtk-3.0/3.16/_colors.scss +++ b/common/gtk-3.0/3.16/_colors.scss @@ -56,6 +56,8 @@ $header_bg: if($darker == 'true', transparentize(#2f343b, 0.05), $header_bg); $header_bg_backdrop: if($variant == 'light', lighten($header_bg, 3%), lighten($header_bg, 1.5%)); $header_bg_backdrop: if($darker == 'true', lighten($header_bg, 1.5%), $header_bg_backdrop); +$header_border: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); + $header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%)); $header_fg: if($darker == 'true', saturate(transparentize(#D3DAE3, 0.2), 10%), $header_fg); diff --git a/common/gtk-3.0/3.16/_common.scss b/common/gtk-3.0/3.16/_common.scss index 6b950f7..c0a3fc3 100644 --- a/common/gtk-3.0/3.16/_common.scss +++ b/common/gtk-3.0/3.16/_common.scss @@ -1025,7 +1025,7 @@ GtkComboBox { border-width: 0 0 1px; border-style: solid; border-radius: 0; - border-color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); + border-color: $header_border; color: $header_fg; background-color: opacify($header_bg, 1); 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 06021cf..d310b2f 100644 --- a/common/gtk-3.0/3.16/gtk-contained-dark.css +++ b/common/gtk-3.0/3.16/gtk-contained-dark.css @@ -2855,7 +2855,7 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px rgba(26, 28, 32, 0.96), inset 0 -1px #1f2227; } + box-shadow: inset 0 1px #1a1c20, inset 0 -1px #1f2227; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { 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 364307c..97ea110 100644 --- a/common/gtk-3.0/3.16/gtk-contained-darker.css +++ b/common/gtk-3.0/3.16/gtk-contained-darker.css @@ -2856,7 +2856,7 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px rgba(31, 34, 39, 0.95), inset 0 -1px #edf0f3; } + box-shadow: inset 0 1px #1f2227, inset 0 -1px #edf0f3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css index 216152f..4f38aa1 100644 --- a/common/gtk-3.0/3.16/gtk-contained.css +++ b/common/gtk-3.0/3.16/gtk-contained.css @@ -2855,7 +2855,7 @@ MarlinViewWindow *:selected:focus { PantheonTerminalPantheonTerminalWindow.background { background-color: transparent; } PantheonTerminalPantheonTerminalWindow.background .notebook.header.top { - box-shadow: inset 0 1px rgba(212, 213, 219, 0.95), inset 0 -1px #edf0f3; } + box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; } SwitchboardCategoryView .view:selected, SwitchboardCategoryView .view:selected:focus { -- cgit v1.2.3