From d21b205fc07d677063be6e6b257b7cad6de8d4c6 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 16 Jul 2015 21:24:51 +0200 Subject: style osd entries --- common/gtk-3.0/3.14/_common.scss | 10 +++--- common/gtk-3.0/3.14/_drawing.scss | 40 ++++++++++------------ common/gtk-3.0/3.14/_transparent_widgets.scss | 9 +++++ common/gtk-3.0/3.14/gtk-contained-dark.css | 17 +++++++++ common/gtk-3.0/3.14/gtk-contained-darker.css | 17 +++++++++ common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 17 +++++++++ common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 17 +++++++++ common/gtk-3.0/3.14/gtk-contained-solid.css | 17 +++++++++ common/gtk-3.0/3.14/gtk-contained.css | 17 +++++++++ 9 files changed, 135 insertions(+), 26 deletions(-) (limited to 'common/gtk-3.0/3.14') diff --git a/common/gtk-3.0/3.14/_common.scss b/common/gtk-3.0/3.14/_common.scss index 69830e2..9d858a1 100644 --- a/common/gtk-3.0/3.14/_common.scss +++ b/common/gtk-3.0/3.14/_common.scss @@ -350,11 +350,11 @@ GtkFlowBox .grid-child { } } -// .osd & { -// @include entry(osd); -// &:focus { @include entry(osd-focus); } -// &:insensitive { @include entry(osd-insensitive); } -// } + .osd & { + @include entry(osd); + &:focus { @include entry(osd-focus); } + &:insensitive { @include entry(osd-insensitive); } + } } /*********** diff --git a/common/gtk-3.0/3.14/_drawing.scss b/common/gtk-3.0/3.14/_drawing.scss index dd32535..378e5d9 100644 --- a/common/gtk-3.0/3.14/_drawing.scss +++ b/common/gtk-3.0/3.14/_drawing.scss @@ -85,34 +85,32 @@ background-image: linear-gradient(to bottom, transparentize($_header_entry_bg, 0.35)); } - @if $t==osd { - color: $osd_text_color; - border-color: $osd_borders_color; - background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5)); - background-clip: padding-box; - - text-shadow: 0 1px black; - icon-shadow: 0 1px black; + @else if $t==osd { + // + // normal osd button + // + color: $osd_fg_color; + border-color: transparentize($osd_fg_color, 0.7); + background-color: transparent; + background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); } - @if $t==osd-focus { - color: $osd_text_color; + @else if $t==osd-focus { + // + // active osd button + // + color: $selected_bg_color; border-color: $selected_bg_color; - background-image: linear-gradient(to bottom, transparentize(opacify($osd_borders_color, 1), 0.5)); - background-clip: padding-box; - - text-shadow: 0 1px black; - icon-shadow: 0 1px black; + background-image: linear-gradient(to bottom, darken($osd_bg_color, 5%)); } - @if $t==osd-insensitive { + @else if $t==osd-insensitive { + // + // insensitive osd button + // color: $osd_insensitive_fg_color; - border-color: $osd_borders_color; + border-color: transparentize($osd_fg_color, 0.8); background-image: linear-gradient(to bottom, $osd_insensitive_bg_color); - background-clip: padding-box; - - text-shadow: none; - icon-shadow: none; } } diff --git a/common/gtk-3.0/3.14/_transparent_widgets.scss b/common/gtk-3.0/3.14/_transparent_widgets.scss index f288172..13f303d 100644 --- a/common/gtk-3.0/3.14/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/_transparent_widgets.scss @@ -105,7 +105,9 @@ GtkFileChooserDialog { .action-bar.frame, .dialog-vbox > .frame { + .button { @extend %dark_sidebar_button; } + .entry { @extend %dark_sidebar_entry; } GtkLabel, GtkComboBox { color: $dark_sidebar_fg; } } @@ -226,3 +228,10 @@ GeditWindow.background.csd GeditFileBrowserView.view { &:active, &:checked { @include button(osd-active); } &:insensitive { @include button(osd-insensitive); } } + +%dark_sidebar_entry { + @include entry(osd); + + &:focus { @include entry(osd-focus) } + &:insensitive { @include entry(osd-insensitive); } +} diff --git a/common/gtk-3.0/3.14/gtk-contained-dark.css b/common/gtk-3.0/3.14/gtk-contained-dark.css index bb7de74..be4942c 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -3724,6 +3724,23 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G border-color: rgba(168, 173, 181, 0.2); background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } +GtkFileChooserDialog .action-bar.frame .entry, +GtkFileChooserDialog .dialog-vbox > .frame .entry { + color: #A8ADB5; + border-color: rgba(168, 173, 181, 0.3); + background-color: transparent; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:focus, + GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; diff --git a/common/gtk-3.0/3.14/gtk-contained-darker.css b/common/gtk-3.0/3.14/gtk-contained-darker.css index 8278ebe..cb834ad 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -3716,6 +3716,23 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G border-color: rgba(168, 173, 181, 0.2); background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } +GtkFileChooserDialog .action-bar.frame .entry, +GtkFileChooserDialog .dialog-vbox > .frame .entry { + color: #A8ADB5; + border-color: rgba(168, 173, 181, 0.3); + background-color: transparent; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:focus, + GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css index 3acc54e..4ebbdc1 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-dark.css @@ -3724,6 +3724,23 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G border-color: rgba(168, 173, 181, 0.2); background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } +GtkFileChooserDialog .action-bar.frame .entry, +GtkFileChooserDialog .dialog-vbox > .frame .entry { + color: #A8ADB5; + border-color: rgba(168, 173, 181, 0.3); + background-color: transparent; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:focus, + GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + /* GTK NAMED COLORS */ @define-color theme_fg_color #D3DAE3; @define-color theme_text_color #D3DAE3; diff --git a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css index e007472..c5a8b42 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid-darker.css @@ -3716,6 +3716,23 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G border-color: rgba(168, 173, 181, 0.2); background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } +GtkFileChooserDialog .action-bar.frame .entry, +GtkFileChooserDialog .dialog-vbox > .frame .entry { + color: #A8ADB5; + border-color: rgba(168, 173, 181, 0.3); + background-color: transparent; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:focus, + GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; 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 d256fc3..25b5acb 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -3715,6 +3715,23 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G border-color: rgba(168, 173, 181, 0.2); background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } +GtkFileChooserDialog .action-bar.frame .entry, +GtkFileChooserDialog .dialog-vbox > .frame .entry { + color: #A8ADB5; + border-color: rgba(168, 173, 181, 0.3); + background-color: transparent; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:focus, + GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 90f2fbd..2c3248d 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -3715,6 +3715,23 @@ GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd G border-color: rgba(168, 173, 181, 0.2); background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } +GtkFileChooserDialog .action-bar.frame .entry, +GtkFileChooserDialog .dialog-vbox > .frame .entry { + color: #A8ADB5; + border-color: rgba(168, 173, 181, 0.3); + background-color: transparent; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:focus, + GtkFileChooserDialog .dialog-vbox > .frame .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .entry:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } + /* GTK NAMED COLORS */ @define-color theme_fg_color #5c616c; @define-color theme_text_color #5c616c; -- cgit v1.2.3