From 42297dde59fc4420eb5fe0156e3051d2b55b5a0f Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 16 Jul 2015 21:15:41 +0200 Subject: fixes for GtkFileChooser --- common/gtk-3.0/3.14/_transparent_widgets.scss | 65 +++++++++--------- common/gtk-3.0/3.14/gtk-contained-dark.css | 78 ++++++++++++---------- common/gtk-3.0/3.14/gtk-contained-darker.css | 78 ++++++++++++---------- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 78 ++++++++++++---------- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 78 ++++++++++++---------- common/gtk-3.0/3.14/gtk-contained-solid.css | 78 ++++++++++++---------- common/gtk-3.0/3.14/gtk-contained.css | 78 ++++++++++++---------- 7 files changed, 279 insertions(+), 254 deletions(-) (limited to 'common/gtk-3.0/3.14') diff --git a/common/gtk-3.0/3.14/_transparent_widgets.scss b/common/gtk-3.0/3.14/_transparent_widgets.scss index 4d3e220..f288172 100644 --- a/common/gtk-3.0/3.14/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/_transparent_widgets.scss @@ -2,8 +2,6 @@ color: $header_border; //fixes separator in gnome-tweak-tool } -GtkFileChooserDialog .dialog-action-box { background-color: $bg_color } // fix for non gnome environments - NemoWindow GtkEventBox { background-color: $bg_color; } // fixes nemo statusbar GtkFileChooserDialog *, @@ -85,8 +83,33 @@ MarlinViewWindow { .pane-separator { background-color: $dark_sidebar_border; } } -// Yeah, this is ugly, but prevents a transparent background in the image preview box -GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: $bg_color; } +GtkFileChooserDialog { + + &.background.csd { background-color: $dark_sidebar_bg } + .sidebar { background-color: transparent } + + // Yeah, this is ugly, but prevents a transparent background in the image preview box + GtkPaned > .vertical > .horizontal { background-color: $bg_color; } + + // fix for non gnome environments + .dialog-action-box { background-color: $bg_color } + + .dialog-vbox > .frame { + color: $dark_sidebar_fg; + border-color: transparent; + } + .action-bar.frame { + background-color: transparent; + border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); + } + + .action-bar.frame, + .dialog-vbox > .frame { + .button { @extend %dark_sidebar_button; } + + GtkLabel, GtkComboBox { color: $dark_sidebar_fg; } + } +} // Gedit sidebar GeditWindow.background.csd { @@ -180,15 +203,7 @@ GeditWindow.background.csd GeditFileBrowserWidget { background-color: transparent; border-color: darken($dark_sidebar_bg, 7%); - .button { - @include button(undecorated); - color: $dark_sidebar_fg; - border: 1px solid transparent; - - &:hover { border: 1px solid $selected_bg_color; } - &:active, &:checked { @include button(active); } - &:insensitive { color: transparentize($dark_sidebar_fg, 0.6); } - } + .button { @extend %dark_sidebar_button; } GtkComboBox { color: $dark_sidebar_fg; } } } @@ -204,24 +219,10 @@ GeditWindow.background.csd GeditFileBrowserView.view { } } -// Filechooser bottom bar -GtkFileChooserDialog .action-bar.frame { - background-color: darken($dark_sidebar_bg, 2%); - border-color: if($variant =='light', darken($dark_sidebar_bg, 7%), darken($dark_sidebar_bg, 15%)); - - GtkLabel { color: $dark_sidebar_fg; } - - .button { - @include button(undecorated); - - &:hover { border: 1px solid $selected_bg_color; } - &:active, &:checked { - border: 1px solid $selected_bg_color; - color: $selected_fg_color; - background-color: $selected_bg_color; - } - &:insensitive { color: transparentize($dark_sidebar_fg, 0.6); } - } +%dark_sidebar_button { + @include button(osd); - GtkComboBox { color: $dark_sidebar_fg; } + &:hover { @include button(osd-hover) } + &:active, &:checked { @include button(osd-active); } + &:insensitive { @include button(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 c278ae3..bb7de74 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -3360,9 +3360,6 @@ GtkListBox .h4 { .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { color: rgba(36, 39, 45, 0.97); } -GtkFileChooserDialog .dialog-action-box { - background-color: #444852; } - NemoWindow GtkEventBox { background-color: #444852; } @@ -3601,8 +3598,24 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: rgba(46, 49, 56, 0.95); } +GtkFileChooserDialog.background.csd { + background-color: rgba(69, 74, 84, 0.95); } +GtkFileChooserDialog .sidebar { + background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: #444852; } +GtkFileChooserDialog .dialog-action-box { + background-color: #444852; } +GtkFileChooserDialog .dialog-vbox > .frame { + color: #A8ADB5; + border-color: transparent; } +GtkFileChooserDialog .action-bar.frame { + background-color: transparent; + border-color: rgba(35, 37, 42, 0.95); } +GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, +GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, +GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { + color: #A8ADB5; } GeditWindow.background.csd { background-color: transparent; } @@ -3674,21 +3687,6 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; border-color: rgba(53, 57, 65, 0.95); } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - border-color: transparent; - background-color: transparent; - background-image: none; - color: #A8ADB5; - border: 1px solid transparent; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - border: 1px solid #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: rgba(168, 173, 181, 0.4); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #A8ADB5; } @@ -3700,25 +3698,31 @@ GeditWindow.background.csd GeditFileBrowserView.view { GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } -GtkFileChooserDialog .action-bar.frame { - background-color: rgba(65, 69, 79, 0.95); - border-color: rgba(35, 37, 42, 0.95); } - GtkFileChooserDialog .action-bar.frame GtkLabel { - color: #A8ADB5; } - GtkFileChooserDialog .action-bar.frame .button { - border-color: transparent; - background-color: transparent; - background-image: none; } - GtkFileChooserDialog .action-bar.frame .button:hover { - border: 1px solid #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked { - border: 1px solid #5294E2; - color: #ffffff; - background-color: #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:insensitive { - color: rgba(168, 173, 181, 0.4); } - GtkFileChooserDialog .action-bar.frame GtkComboBox { - color: #A8ADB5; } +GtkFileChooserDialog .action-bar.frame .button, +GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { + color: #A8ADB5; + outline-color: rgba(168, 173, 181, 0.3); + 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 .button:hover, + GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { + color: #5294E2; + outline-color: rgba(168, 173, 181, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .button:active, + GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, + GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GtkFileChooserDialog .action-bar.frame .button:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button: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; 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 8efb7d2..8278ebe 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -3361,9 +3361,6 @@ GtkListBox .h4 { .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { color: rgba(31, 34, 39, 0.97); } -GtkFileChooserDialog .dialog-action-box { - background-color: #F5F6F7; } - NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3593,8 +3590,24 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: rgba(60, 64, 73, 0.95); } +GtkFileChooserDialog.background.csd { + background-color: rgba(60, 64, 73, 0.95); } +GtkFileChooserDialog .sidebar { + background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-action-box { + background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-vbox > .frame { + color: #A8ADB5; + border-color: transparent; } +GtkFileChooserDialog .action-bar.frame { + background-color: transparent; + border-color: rgba(44, 47, 53, 0.95); } +GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, +GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, +GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { + color: #A8ADB5; } GeditWindow.background.csd { background-color: transparent; } @@ -3666,21 +3679,6 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - border-color: transparent; - background-color: transparent; - background-image: none; - color: #A8ADB5; - border: 1px solid transparent; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - border: 1px solid #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: rgba(168, 173, 181, 0.4); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #A8ADB5; } @@ -3692,25 +3690,31 @@ GeditWindow.background.csd GeditFileBrowserView.view { GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } -GtkFileChooserDialog .action-bar.frame { - background-color: rgba(55, 59, 67, 0.95); - border-color: rgba(44, 47, 53, 0.95); } - GtkFileChooserDialog .action-bar.frame GtkLabel { - color: #A8ADB5; } - GtkFileChooserDialog .action-bar.frame .button { - border-color: transparent; - background-color: transparent; - background-image: none; } - GtkFileChooserDialog .action-bar.frame .button:hover { - border: 1px solid #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked { - border: 1px solid #5294E2; - color: #ffffff; - background-color: #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:insensitive { - color: rgba(168, 173, 181, 0.4); } - GtkFileChooserDialog .action-bar.frame GtkComboBox { - color: #A8ADB5; } +GtkFileChooserDialog .action-bar.frame .button, +GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { + color: #A8ADB5; + outline-color: rgba(168, 173, 181, 0.3); + 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 .button:hover, + GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { + color: #5294E2; + outline-color: rgba(168, 173, 181, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .button:active, + GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, + GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GtkFileChooserDialog .action-bar.frame .button:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button: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; 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 ce02657..3acc54e 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 @@ -3360,9 +3360,6 @@ GtkListBox .h4 { .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { color: #24272d; } -GtkFileChooserDialog .dialog-action-box { - background-color: #444852; } - NemoWindow GtkEventBox { background-color: #444852; } @@ -3601,8 +3598,24 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: #2e3138; } +GtkFileChooserDialog.background.csd { + background-color: #454a54; } +GtkFileChooserDialog .sidebar { + background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: #444852; } +GtkFileChooserDialog .dialog-action-box { + background-color: #444852; } +GtkFileChooserDialog .dialog-vbox > .frame { + color: #A8ADB5; + border-color: transparent; } +GtkFileChooserDialog .action-bar.frame { + background-color: transparent; + border-color: #23252a; } +GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, +GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, +GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { + color: #A8ADB5; } GeditWindow.background.csd { background-color: transparent; } @@ -3674,21 +3687,6 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; border-color: #353941; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - border-color: transparent; - background-color: transparent; - background-image: none; - color: #A8ADB5; - border: 1px solid transparent; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - border: 1px solid #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: rgba(168, 173, 181, 0.4); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #A8ADB5; } @@ -3700,25 +3698,31 @@ GeditWindow.background.csd GeditFileBrowserView.view { GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } -GtkFileChooserDialog .action-bar.frame { - background-color: #41454f; - border-color: #23252a; } - GtkFileChooserDialog .action-bar.frame GtkLabel { - color: #A8ADB5; } - GtkFileChooserDialog .action-bar.frame .button { - border-color: transparent; - background-color: transparent; - background-image: none; } - GtkFileChooserDialog .action-bar.frame .button:hover { - border: 1px solid #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked { - border: 1px solid #5294E2; - color: #ffffff; - background-color: #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:insensitive { - color: rgba(168, 173, 181, 0.4); } - GtkFileChooserDialog .action-bar.frame GtkComboBox { - color: #A8ADB5; } +GtkFileChooserDialog .action-bar.frame .button, +GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { + color: #A8ADB5; + outline-color: rgba(168, 173, 181, 0.3); + 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 .button:hover, + GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { + color: #5294E2; + outline-color: rgba(168, 173, 181, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .button:active, + GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, + GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GtkFileChooserDialog .action-bar.frame .button:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button: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; 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 99c4e75..e007472 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 @@ -3361,9 +3361,6 @@ GtkListBox .h4 { .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { color: #1f2227; } -GtkFileChooserDialog .dialog-action-box { - background-color: #F5F6F7; } - NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3593,8 +3590,24 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: #3c4049; } +GtkFileChooserDialog.background.csd { + background-color: #3c4049; } +GtkFileChooserDialog .sidebar { + background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-action-box { + background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-vbox > .frame { + color: #A8ADB5; + border-color: transparent; } +GtkFileChooserDialog .action-bar.frame { + background-color: transparent; + border-color: #2c2f35; } +GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, +GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, +GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { + color: #A8ADB5; } GeditWindow.background.csd { background-color: transparent; } @@ -3666,21 +3679,6 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; border-color: #2c2f35; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - border-color: transparent; - background-color: transparent; - background-image: none; - color: #A8ADB5; - border: 1px solid transparent; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - border: 1px solid #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: rgba(168, 173, 181, 0.4); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #A8ADB5; } @@ -3692,25 +3690,31 @@ GeditWindow.background.csd GeditFileBrowserView.view { GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } -GtkFileChooserDialog .action-bar.frame { - background-color: #373b43; - border-color: #2c2f35; } - GtkFileChooserDialog .action-bar.frame GtkLabel { - color: #A8ADB5; } - GtkFileChooserDialog .action-bar.frame .button { - border-color: transparent; - background-color: transparent; - background-image: none; } - GtkFileChooserDialog .action-bar.frame .button:hover { - border: 1px solid #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked { - border: 1px solid #5294E2; - color: #ffffff; - background-color: #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:insensitive { - color: rgba(168, 173, 181, 0.4); } - GtkFileChooserDialog .action-bar.frame GtkComboBox { - color: #A8ADB5; } +GtkFileChooserDialog .action-bar.frame .button, +GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { + color: #A8ADB5; + outline-color: rgba(168, 173, 181, 0.3); + 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 .button:hover, + GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { + color: #5294E2; + outline-color: rgba(168, 173, 181, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .button:active, + GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, + GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GtkFileChooserDialog .action-bar.frame .button:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button: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; 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 05f86bf..d256fc3 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -3360,9 +3360,6 @@ GtkListBox .h4 { .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { color: #d4d5db; } -GtkFileChooserDialog .dialog-action-box { - background-color: #F5F6F7; } - NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3592,8 +3589,24 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: #3c4049; } +GtkFileChooserDialog.background.csd { + background-color: #3c4049; } +GtkFileChooserDialog .sidebar { + background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-action-box { + background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-vbox > .frame { + color: #A8ADB5; + border-color: transparent; } +GtkFileChooserDialog .action-bar.frame { + background-color: transparent; + border-color: #2c2f35; } +GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, +GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, +GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { + color: #A8ADB5; } GeditWindow.background.csd { background-color: transparent; } @@ -3665,21 +3678,6 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; border-color: #2c2f35; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - border-color: transparent; - background-color: transparent; - background-image: none; - color: #A8ADB5; - border: 1px solid transparent; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - border: 1px solid #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: rgba(168, 173, 181, 0.4); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #A8ADB5; } @@ -3691,25 +3689,31 @@ GeditWindow.background.csd GeditFileBrowserView.view { GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } -GtkFileChooserDialog .action-bar.frame { - background-color: #373b43; - border-color: #2c2f35; } - GtkFileChooserDialog .action-bar.frame GtkLabel { - color: #A8ADB5; } - GtkFileChooserDialog .action-bar.frame .button { - border-color: transparent; - background-color: transparent; - background-image: none; } - GtkFileChooserDialog .action-bar.frame .button:hover { - border: 1px solid #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked { - border: 1px solid #5294E2; - color: #ffffff; - background-color: #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:insensitive { - color: rgba(168, 173, 181, 0.4); } - GtkFileChooserDialog .action-bar.frame GtkComboBox { - color: #A8ADB5; } +GtkFileChooserDialog .action-bar.frame .button, +GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { + color: #A8ADB5; + outline-color: rgba(168, 173, 181, 0.3); + 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 .button:hover, + GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { + color: #5294E2; + outline-color: rgba(168, 173, 181, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .button:active, + GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, + GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GtkFileChooserDialog .action-bar.frame .button:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button: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; diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index daa2d38..90f2fbd 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -3360,9 +3360,6 @@ GtkListBox .h4 { .titlebar .separator, .titlebar GtkPlacesSidebar.sidebar .view.separator, GtkPlacesSidebar.sidebar .titlebar .view.separator { color: rgba(212, 213, 219, 0.95); } -GtkFileChooserDialog .dialog-action-box { - background-color: #F5F6F7; } - NemoWindow GtkEventBox { background-color: #F5F6F7; } @@ -3592,8 +3589,24 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: rgba(60, 64, 73, 0.95); } +GtkFileChooserDialog.background.csd { + background-color: rgba(60, 64, 73, 0.95); } +GtkFileChooserDialog .sidebar { + background-color: transparent; } GtkFileChooserDialog GtkPaned > .vertical > .horizontal { background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-action-box { + background-color: #F5F6F7; } +GtkFileChooserDialog .dialog-vbox > .frame { + color: #A8ADB5; + border-color: transparent; } +GtkFileChooserDialog .action-bar.frame { + background-color: transparent; + border-color: rgba(44, 47, 53, 0.95); } +GtkFileChooserDialog .action-bar.frame GtkLabel, GtkFileChooserDialog .action-bar.frame GtkComboBox, +GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, +GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox { + color: #A8ADB5; } GeditWindow.background.csd { background-color: transparent; } @@ -3665,21 +3678,6 @@ GeditWindow.background.csd GeditFileBrowserWidget { GeditWindow.background.csd GeditFileBrowserWidget .horizontal { background-color: transparent; border-color: rgba(44, 47, 53, 0.95); } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { - border-color: transparent; - background-color: transparent; - background-image: none; - color: #A8ADB5; - border: 1px solid transparent; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { - border: 1px solid #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { - color: #ffffff; - outline-color: rgba(255, 255, 255, 0.3); - border-color: #5294E2; - background-color: #5294E2; } - GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive { - color: rgba(168, 173, 181, 0.4); } GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox { color: #A8ADB5; } @@ -3691,25 +3689,31 @@ GeditWindow.background.csd GeditFileBrowserView.view { GeditWindow.background.csd GeditFileBrowserView.view.expander:hover { color: #5294E2; } -GtkFileChooserDialog .action-bar.frame { - background-color: rgba(55, 59, 67, 0.95); - border-color: rgba(44, 47, 53, 0.95); } - GtkFileChooserDialog .action-bar.frame GtkLabel { - color: #A8ADB5; } - GtkFileChooserDialog .action-bar.frame .button { - border-color: transparent; - background-color: transparent; - background-image: none; } - GtkFileChooserDialog .action-bar.frame .button:hover { - border: 1px solid #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:active, GtkFileChooserDialog .action-bar.frame .button:checked { - border: 1px solid #5294E2; - color: #ffffff; - background-color: #5294E2; } - GtkFileChooserDialog .action-bar.frame .button:insensitive { - color: rgba(168, 173, 181, 0.4); } - GtkFileChooserDialog .action-bar.frame GtkComboBox { - color: #A8ADB5; } +GtkFileChooserDialog .action-bar.frame .button, +GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button { + color: #A8ADB5; + outline-color: rgba(168, 173, 181, 0.3); + 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 .button:hover, + GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover { + color: #5294E2; + outline-color: rgba(168, 173, 181, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + GtkFileChooserDialog .action-bar.frame .button:active, + GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked, + GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked { + color: #ffffff; + outline-color: rgba(255, 255, 255, 0.3); + border-color: #5294E2; + background-image: linear-gradient(to bottom, #5294E2); } + GtkFileChooserDialog .action-bar.frame .button:insensitive, + GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button: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; -- cgit v1.2.3 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 From 78c13218f1322ee8a8a0c10d169662eb4dbd2b42 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 16 Jul 2015 22:04:26 +0200 Subject: fix filechooser for non-csd winows --- common/gtk-3.0/3.14/_transparent_widgets.scss | 2 +- common/gtk-3.0/3.14/gtk-contained-dark.css | 15 ++++++++++++++- common/gtk-3.0/3.14/gtk-contained-darker.css | 15 ++++++++++++++- common/gtk-3.0/3.14/gtk-contained-solid-dark.css | 15 ++++++++++++++- common/gtk-3.0/3.14/gtk-contained-solid-darker.css | 15 ++++++++++++++- common/gtk-3.0/3.14/gtk-contained-solid.css | 15 ++++++++++++++- common/gtk-3.0/3.14/gtk-contained.css | 15 ++++++++++++++- 7 files changed, 85 insertions(+), 7 deletions(-) (limited to 'common/gtk-3.0/3.14') diff --git a/common/gtk-3.0/3.14/_transparent_widgets.scss b/common/gtk-3.0/3.14/_transparent_widgets.scss index 13f303d..16bf819 100644 --- a/common/gtk-3.0/3.14/_transparent_widgets.scss +++ b/common/gtk-3.0/3.14/_transparent_widgets.scss @@ -85,7 +85,7 @@ MarlinViewWindow { GtkFileChooserDialog { - &.background.csd { background-color: $dark_sidebar_bg } + &.background.csd, .background { background-color: $dark_sidebar_bg } .sidebar { background-color: transparent } // Yeah, this is ugly, but prevents a transparent background in the image preview box 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 be4942c..8e50123 100644 --- a/common/gtk-3.0/3.14/gtk-contained-dark.css +++ b/common/gtk-3.0/3.14/gtk-contained-dark.css @@ -238,6 +238,19 @@ GtkFlowBox .grid-child { box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } + .osd .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)); } + .osd .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + .osd .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } /*********** * Buttons * @@ -3598,7 +3611,7 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: rgba(46, 49, 56, 0.95); } -GtkFileChooserDialog.background.csd { +GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background { background-color: rgba(69, 74, 84, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } 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 cb834ad..2c64d5b 100644 --- a/common/gtk-3.0/3.14/gtk-contained-darker.css +++ b/common/gtk-3.0/3.14/gtk-contained-darker.css @@ -238,6 +238,19 @@ GtkFlowBox .grid-child { box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } + .osd .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)); } + .osd .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + .osd .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } /*********** * Buttons * @@ -3590,7 +3603,7 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: rgba(60, 64, 73, 0.95); } -GtkFileChooserDialog.background.csd { +GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background { background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } 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 4ebbdc1..e6d5c87 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 @@ -238,6 +238,19 @@ GtkFlowBox .grid-child { box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } + .osd .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)); } + .osd .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + .osd .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } /*********** * Buttons * @@ -3598,7 +3611,7 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: #2e3138; } -GtkFileChooserDialog.background.csd { +GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background { background-color: #454a54; } GtkFileChooserDialog .sidebar { background-color: transparent; } 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 c5a8b42..7314c0d 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 @@ -238,6 +238,19 @@ GtkFlowBox .grid-child { box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } + .osd .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)); } + .osd .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + .osd .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } /*********** * Buttons * @@ -3590,7 +3603,7 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: #3c4049; } -GtkFileChooserDialog.background.csd { +GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background { background-color: #3c4049; } GtkFileChooserDialog .sidebar { background-color: transparent; } 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 25b5acb..746dca6 100644 --- a/common/gtk-3.0/3.14/gtk-contained-solid.css +++ b/common/gtk-3.0/3.14/gtk-contained-solid.css @@ -238,6 +238,19 @@ GtkFlowBox .grid-child { box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } + .osd .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)); } + .osd .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + .osd .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } /*********** * Buttons * @@ -3589,7 +3602,7 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: #3c4049; } -GtkFileChooserDialog.background.csd { +GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background { background-color: #3c4049; } GtkFileChooserDialog .sidebar { background-color: transparent; } diff --git a/common/gtk-3.0/3.14/gtk-contained.css b/common/gtk-3.0/3.14/gtk-contained.css index 2c3248d..786052f 100644 --- a/common/gtk-3.0/3.14/gtk-contained.css +++ b/common/gtk-3.0/3.14/gtk-contained.css @@ -238,6 +238,19 @@ GtkFlowBox .grid-child { box-shadow: 0 -1px 0 0 #5294E2; } .linked.vertical > .entry:last-child:insensitive { border-bottom-color: rgba(0, 0, 0, 0.14); } + .osd .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)); } + .osd .entry:focus { + color: #5294E2; + border-color: #5294E2; + background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); } + .osd .entry:insensitive { + color: #5c6069; + border-color: rgba(168, 173, 181, 0.2); + background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); } /*********** * Buttons * @@ -3589,7 +3602,7 @@ NemoWindow .pane-separator, MarlinViewWindow .pane-separator { background-color: rgba(60, 64, 73, 0.95); } -GtkFileChooserDialog.background.csd { +GtkFileChooserDialog.background.csd, GtkFileChooserDialog .background { background-color: rgba(60, 64, 73, 0.95); } GtkFileChooserDialog .sidebar { background-color: transparent; } -- cgit v1.2.3