From 9e29302e5c8c21100b79aedfecb1f1e5e9739545 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Mon, 12 Oct 2015 23:07:26 +0200 Subject: GTK3 Submarine themes: adjust osd toolbar --- .../Blue-Submarine/gtk-3.0/gtk-widgets.css | 224 +++++++++++---------- .../Green-Submarine/gtk-3.0/gtk-widgets.css | 223 ++++++++++---------- 2 files changed, 236 insertions(+), 211 deletions(-) (limited to 'desktop-themes') diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css index fddc161f..c62c47e1 100644 --- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css @@ -4753,18 +4753,18 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { *******/ .background.osd { - color: @osd_fg; - background-image: none; - background-color: @osd_bg; + color: @osd_fg; + background-image: none; + background-color: @osd_bg; } GtkOverlay.osd { - background-color: transparent; + background-color: transparent; } .osd.frame { - background-clip: border-box; - background-origin: border-box; + background-clip: border-box; + background-origin: border-box; } .osd.button, @@ -4773,63 +4773,69 @@ GtkOverlay.osd { .osd .button, .osd .button:checked, .osd .button:active { - border-width: 1px; - border-style: solid; - border-image: none; - border-color: @osd_button_border; - border-radius: 5px; + border-width: 1px; + border-style: solid; + border-image: none; + border-color: @osd_button_border; + border-radius: 5px; } .osd.button, .osd .button { - padding: 4px; - background-image: linear-gradient(to bottom, - @osd_button_bg_a, - @osd_button_bg_b 68%, - @osd_button_bg_c); - color: @osd_button_fg; - text-shadow: 0 -1px @osd_button_shadow; - icon-shadow: 0 -1px @osd_button_shadow; + padding: 4px; + background-image: linear-gradient(to bottom, + @osd_button_bg_a, + @osd_button_bg_b 68%, + @osd_button_bg_c); + color: @osd_button_fg; + text-shadow: 0 -1px @osd_button_shadow; + icon-shadow: 0 -1px @osd_button_shadow; } .osd.button, .osd.button:prelight, .osd.button:active, .osd.button:checked { - background-color: shade(@osd_bg, 1.10); + background-color: shade(@osd_bg, 1.10); } .osd .button, .osd .button:prelight, .osd .button:active, .osd .button:checked { - background-color: transparent; + background-color: transparent; } .osd.button:insensitive, .osd .button:insensitive { - background-image: none; - background-color: @osd_button_bg_insensitive; + background-image: none; + background-color: @osd_button_bg_insensitive; } .osd.button:checked:insensitive, .osd .button:checked:insensitive, .osd.button:active:insensitive, .osd .button:active:insensitive { - background-image: none; - background-color: @osd_button_bg_insensitive_active; + background-image: none; + background-color: @osd_button_bg_insensitive_active; } .osd.button:hover, .osd .button:hover { - color: @osd_button_fg_hover; + color: @osd_button_fg_hover; } .osd .linked .button:hover:first-child, .osd .linked .button:hover:last-child, .osd .linked .button:hover:only-child { background-image: none; - padding: 4px; + padding: 6px; +} + +.osd .linked .button:focus:prelight:active:first-child, +.osd .linked .button:focus:prelight:active:last-child, +.osd .linked .button:focus:prelight:active:only-child { + border-color: @osd_button_border; } .osd.button:active, @@ -4840,7 +4846,7 @@ GtkOverlay.osd { .osd.button:hover:checked, .osd .button:checked, .osd .button:hover:checked { - color: @osd_button_fg_active; + color: @osd_button_fg_active; } .osd.button:insensitive, @@ -4849,15 +4855,15 @@ GtkOverlay.osd { .osd .button:insensitive, .osd .button:active *:insensitive, .osd .button:checked *:insensitive { - color: @osd_button_fg_insensitive; + color: @osd_button_fg_insensitive; } .osd.button:hover, .osd .button:hover { - background-image: linear-gradient(to bottom, - @osd_button_bg_hover_a, - @osd_button_bg_hover_b 68%, - @osd_button_bg_hover_c); + background-image: linear-gradient(to bottom, + @osd_button_bg_hover_a, + @osd_button_bg_hover_b 68%, + @osd_button_bg_hover_c); } .osd.button:checked, @@ -4870,10 +4876,10 @@ GtkOverlay.osd { .osd .button:active, .osd .button:active:hover, .osd GtkMenuButton.button:active { - background-image: linear-gradient(to bottom, - @osd_button_bg_active_a, - @osd_button_bg_active_b 68%, - @osd_button_bg_active_c); + background-image: linear-gradient(to bottom, + @osd_button_bg_active_a, + @osd_button_bg_active_b 68%, + @osd_button_bg_active_c); } .osd GtkMenuButton.button:checked, @@ -4889,35 +4895,37 @@ GtkOverlay.osd { } .osd.toolbar { - color: @osd_fg; - text-shadow: 0 1px @osd_text_shadow; - padding: 10px; - border-style: none; - border-radius: 7px; - background-image: linear-gradient(to left, - shade(@theme_selected_bg_color, 1.1), - shade(@theme_selected_bg_color, 0.65)); - background-color: transparent; - -GtkToolbar-button-relief: normal; + color: @osd_fg; + text-shadow: 0 1px @osd_text_shadow; + padding: 10px; + border-style: solid; + border-width: 1px; + border-color: shade (@theme_selected_bg_color, 0.8); + border-radius: 7px; + background-image: linear-gradient(to left, + alpha(shade(@theme_selected_bg_color, 1.2), 0.7), + alpha(shade(@theme_selected_bg_color, 0.95), 0.7)); + background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4); + -GtkToolbar-button-relief: normal; } .osd.toolbar .button, .osd.toolbar .linked .button { - padding: 4px; - border-width: 1px; - border-radius: 5px; + padding: 6px; + border-width: 1px; + border-radius: 5px; } .osd.toolbar .button:first-child { - border-radius: 5px 0 0 5px; - border-width: 1px 0 1px 1px; - box-shadow: inset -1px 0 @osd_button_inset; + border-radius: 5px 0 0 5px; + border-width: 1px 0 1px 1px; + box-shadow: inset -1px 0 @osd_button_inset; } .osd.toolbar .button:last-child { - box-shadow: none; - border-radius: 0 5px 5px 0; - border-width: 1px 1px 1px 0; + box-shadow: none; + border-radius: 0 5px 5px 0; + border-width: 1px 1px 1px 0; } .osd.toolbar .button:only-child, @@ -4925,114 +4933,118 @@ GtkOverlay.osd { .osd.toolbar GtkToolButton:only-child .button, .osd.toolbar GtkToolButton:last-child .button, .osd.toolbar GtkToolButton:first-child .button { - border-width: 1px; - border-radius: 5px; - border-style: solid; - box-shadow: none; + border-width: 1px; + border-radius: 5px; + border-style: solid; + box-shadow: none; +} + +.toolbar.osd GtkVolumeButton.button.flat.image-button:hover:active { + border-color: @osd_button_border; } .osd.toolbar .separator { - color: shade(@osd_lowlight, 0.80); + color: shade(@osd_lowlight, 0.80); } /* used by gnome-settings-daemon's media-keys OSD and Epiphany */ .osd.trough { - background-color: @osd_trough_bg; - border-width: 0; + background-color: @osd_trough_bg; + border-width: 0; } .osd.progressbar { - background-color: @osd_fg; + background-color: @osd_fg; } .osd .scale.trough { - border: 1px solid rgba(0,0,0,0.1); - border-image: none; - background-image: linear-gradient(to bottom, - shade(@osd_button_border, 0.70), - shade(@osd_button_border, 0.90)); - background-color: transparent; + border-color: shade (@theme_selected_bg_color, 0.8); + border-image: none; + background-image: linear-gradient(to bottom, + shade(@osd_button_border, 0.70), + shade(@osd_button_border, 0.90)); + background-color: transparent; } .osd .scale.trough.highlight { - background-image: none; - background-color: @theme_selected_bg_color; + background-image: none; + background-color: @theme_selected_bg_color; + border-color: shade (@theme_selected_bg_color, 0.4); } .osd .scale.trough:insensitive, .osd .scale.trough.highlight:insensitive { - background-image: none; - background-color: transparent; + background-image: none; + background-color: transparent; } .osd GtkProgressBar, GtkProgressBar.osd { - padding: 0; - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 3px; - -GtkProgressBar-min-horizontal-bar-height: 3px; + padding: 0; + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 3px; + -GtkProgressBar-min-horizontal-bar-height: 3px; } .osd GtkProgressBar.trough, GtkProgressBar.osd.trough { - padding: 0; - border-image: none; - border-style: none; - border-width: 0; - background-image: none; - background-color: transparent; - border-radius: 0; + padding: 0; + border-image: none; + border-style: none; + border-width: 0; + background-image: none; + background-color: transparent; + border-radius: 0; } .osd GtkProgressBar.progressbar, GtkProgressBar.osd.progressbar { - border-style: none; - background-color: @theme_selected_bg_color; - background-image: none; - border-radius: 0; + border-style: none; + background-color: @theme_selected_bg_color; + background-image: none; + border-radius: 0; } .osd .view, .osd.view { - background-color: @osd_view_bg; + background-color: @osd_view_bg; } .osd .scrollbar.trough { - background-color: @osd_scrollbar_trough; + background-color: @osd_scrollbar_trough; } .osd .scrollbar.slider { - background-color: @osd_scrollbar_slider; + background-color: @osd_scrollbar_slider; } .osd .scrollbar.slider:hover { - background-color: @osd_scrollbar_slider_prelight; + background-color: @osd_scrollbar_slider_prelight; } .osd .scrollbar.slider:active { - background-color: @osd_scrollbar_slider_active; + background-color: @osd_scrollbar_slider_active; } .osd GtkIconView.cell:selected, .osd GtkIconView.cell:selected:focus { - background-color: transparent; - border-style: solid; - border-radius: 15px; - border-width: 3px; - border-color: @osd_button_fg; - outline-color: transparent; + background-color: transparent; + border-style: solid; + border-radius: 15px; + border-width: 3px; + border-color: @osd_button_fg; + outline-color: transparent; } /* used by Documents */ .osd .page-thumbnail { - border-style: solid; - border-width: 1px; - border-color: @osd_lowlight; - /* when there's no pixbuf yet */ - background-color: @osd_bg; + border-style: solid; + border-width: 1px; + border-color: @osd_lowlight; + /* when there's no pixbuf yet */ + background-color: @osd_bg; } - /************* * Popovers * *************/ diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css index f4376b98..5aa7e10b 100644 --- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css +++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css @@ -4744,18 +4744,18 @@ GtkDialog GtkScrolledWindow.frame GtkViewport .vertical GtkExpander .vertical { *******/ .background.osd { - color: @osd_fg; - background-image: none; - background-color: @osd_bg; + color: @osd_fg; + background-image: none; + background-color: @osd_bg; } GtkOverlay.osd { - background-color: transparent; + background-color: transparent; } .osd.frame { - background-clip: border-box; - background-origin: border-box; + background-clip: border-box; + background-origin: border-box; } .osd.button, @@ -4764,63 +4764,69 @@ GtkOverlay.osd { .osd .button, .osd .button:checked, .osd .button:active { - border-width: 1px; - border-style: solid; - border-image: none; - border-color: @osd_button_border; - border-radius: 5px; + border-width: 1px; + border-style: solid; + border-image: none; + border-color: @osd_button_border; + border-radius: 5px; } .osd.button, .osd .button { - padding: 4px; - background-image: linear-gradient(to bottom, - @osd_button_bg_a, - @osd_button_bg_b 68%, - @osd_button_bg_c); - color: @osd_button_fg; - text-shadow: 0 -1px @osd_button_shadow; - icon-shadow: 0 -1px @osd_button_shadow; + padding: 4px; + background-image: linear-gradient(to bottom, + @osd_button_bg_a, + @osd_button_bg_b 68%, + @osd_button_bg_c); + color: @osd_button_fg; + text-shadow: 0 -1px @osd_button_shadow; + icon-shadow: 0 -1px @osd_button_shadow; } .osd.button, .osd.button:prelight, .osd.button:active, .osd.button:checked { - background-color: shade(@osd_bg, 1.10); + background-color: shade(@osd_bg, 1.10); } .osd .button, .osd .button:prelight, .osd .button:active, .osd .button:checked { - background-color: transparent; + background-color: transparent; } .osd.button:insensitive, .osd .button:insensitive { - background-image: none; - background-color: @osd_button_bg_insensitive; + background-image: none; + background-color: @osd_button_bg_insensitive; } .osd.button:checked:insensitive, .osd .button:checked:insensitive, .osd.button:active:insensitive, .osd .button:active:insensitive { - background-image: none; - background-color: @osd_button_bg_insensitive_active; + background-image: none; + background-color: @osd_button_bg_insensitive_active; } .osd.button:hover, .osd .button:hover { - color: @osd_button_fg_hover; + color: @osd_button_fg_hover; } .osd .linked .button:hover:first-child, .osd .linked .button:hover:last-child, .osd .linked .button:hover:only-child { background-image: none; - padding: 4px; + padding: 6px; +} + +.osd .linked .button:focus:prelight:active:first-child, +.osd .linked .button:focus:prelight:active:last-child, +.osd .linked .button:focus:prelight:active:only-child { + border-color: @osd_button_border; } .osd.button:active, @@ -4831,7 +4837,7 @@ GtkOverlay.osd { .osd.button:hover:checked, .osd .button:checked, .osd .button:hover:checked { - color: @osd_button_fg_active; + color: @osd_button_fg_active; } .osd.button:insensitive, @@ -4840,15 +4846,15 @@ GtkOverlay.osd { .osd .button:insensitive, .osd .button:active *:insensitive, .osd .button:checked *:insensitive { - color: @osd_button_fg_insensitive; + color: @osd_button_fg_insensitive; } .osd.button:hover, .osd .button:hover { - background-image: linear-gradient(to bottom, - @osd_button_bg_hover_a, - @osd_button_bg_hover_b 68%, - @osd_button_bg_hover_c); + background-image: linear-gradient(to bottom, + @osd_button_bg_hover_a, + @osd_button_bg_hover_b 68%, + @osd_button_bg_hover_c); } .osd.button:checked, @@ -4861,10 +4867,10 @@ GtkOverlay.osd { .osd .button:active, .osd .button:active:hover, .osd GtkMenuButton.button:active { - background-image: linear-gradient(to bottom, - @osd_button_bg_active_a, - @osd_button_bg_active_b 68%, - @osd_button_bg_active_c); + background-image: linear-gradient(to bottom, + @osd_button_bg_active_a, + @osd_button_bg_active_b 68%, + @osd_button_bg_active_c); } .osd GtkMenuButton.button:checked, @@ -4880,35 +4886,37 @@ GtkOverlay.osd { } .osd.toolbar { - color: @osd_fg; - text-shadow: 0 1px @osd_text_shadow; - padding: 10px; - border-style: none; - border-radius: 7px; - background-image: linear-gradient(to left, - shade(@theme_selected_bg_color, 1.1), - shade(@theme_selected_bg_color, 0.65)); - background-color: transparent; - -GtkToolbar-button-relief: normal; + color: @osd_fg; + text-shadow: 0 1px @osd_text_shadow; + padding: 10px; + border-style: solid; + border-width: 1px; + border-color: shade (@theme_selected_bg_color, 0.8); + border-radius: 7px; + background-image: linear-gradient(to left, + alpha(shade(@theme_selected_bg_color, 1.2), 0.7), + alpha(shade(@theme_selected_bg_color, 0.95), 0.7)); + background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4); + -GtkToolbar-button-relief: normal; } .osd.toolbar .button, .osd.toolbar .linked .button { - padding: 4px; - border-width: 1px; - border-radius: 5px; + padding: 6px; + border-width: 1px; + border-radius: 5px; } .osd.toolbar .button:first-child { - border-radius: 5px 0 0 5px; - border-width: 1px 0 1px 1px; - box-shadow: inset -1px 0 @osd_button_inset; + border-radius: 5px 0 0 5px; + border-width: 1px 0 1px 1px; + box-shadow: inset -1px 0 @osd_button_inset; } .osd.toolbar .button:last-child { - box-shadow: none; - border-radius: 0 5px 5px 0; - border-width: 1px 1px 1px 0; + box-shadow: none; + border-radius: 0 5px 5px 0; + border-width: 1px 1px 1px 0; } .osd.toolbar .button:only-child, @@ -4916,112 +4924,117 @@ GtkOverlay.osd { .osd.toolbar GtkToolButton:only-child .button, .osd.toolbar GtkToolButton:last-child .button, .osd.toolbar GtkToolButton:first-child .button { - border-width: 1px; - border-radius: 5px; - border-style: solid; - box-shadow: none; + border-width: 1px; + border-radius: 5px; + border-style: solid; + box-shadow: none; +} + +.toolbar.osd GtkVolumeButton.button.flat.image-button:hover:active { + border-color: @osd_button_border; } .osd.toolbar .separator { - color: shade(@osd_lowlight, 0.80); + color: shade(@osd_lowlight, 0.80); } /* used by gnome-settings-daemon's media-keys OSD and Epiphany */ .osd.trough { - background-color: @osd_trough_bg; - border-width: 0; + background-color: @osd_trough_bg; + border-width: 0; } .osd.progressbar { - background-color: @osd_fg; + background-color: @osd_fg; } .osd .scale.trough { - border: 1px solid rgba(0,0,0,0.1); - border-image: none; - background-image: linear-gradient(to bottom, - shade(@osd_button_border, 0.70), - shade(@osd_button_border, 0.90)); - background-color: transparent; + border-color: shade (@theme_selected_bg_color, 0.8); + border-image: none; + background-image: linear-gradient(to bottom, + shade(@osd_button_border, 0.70), + shade(@osd_button_border, 0.90)); + background-color: transparent; } .osd .scale.trough.highlight { - background-image: none; - background-color: @theme_selected_bg_color; + background-image: none; + background-color: @theme_selected_bg_color; + border-color: shade (@theme_selected_bg_color, 0.4); } .osd .scale.trough:insensitive, .osd .scale.trough.highlight:insensitive { - background-image: none; - background-color: transparent; + background-image: none; + background-color: transparent; } .osd GtkProgressBar, GtkProgressBar.osd { - padding: 0; - -GtkProgressBar-xspacing: 0; - -GtkProgressBar-yspacing: 3px; - -GtkProgressBar-min-horizontal-bar-height: 3px; + padding: 0; + -GtkProgressBar-xspacing: 0; + -GtkProgressBar-yspacing: 3px; + -GtkProgressBar-min-horizontal-bar-height: 3px; } .osd GtkProgressBar.trough, GtkProgressBar.osd.trough { - padding: 0; - border-image: none; - border-style: none; - border-width: 0; - background-image: none; - background-color: transparent; - border-radius: 0; + padding: 0; + border-image: none; + border-style: none; + border-width: 0; + background-image: none; + background-color: transparent; + border-radius: 0; } .osd GtkProgressBar.progressbar, GtkProgressBar.osd.progressbar { - border-style: none; - background-color: @theme_selected_bg_color; - background-image: none; - border-radius: 0; + border-style: none; + background-color: @theme_selected_bg_color; + background-image: none; + border-radius: 0; } .osd .view, .osd.view { - background-color: @osd_view_bg; + background-color: @osd_view_bg; } .osd .scrollbar.trough { - background-color: @osd_scrollbar_trough; + background-color: @osd_scrollbar_trough; } .osd .scrollbar.slider { - background-color: @osd_scrollbar_slider; + background-color: @osd_scrollbar_slider; } .osd .scrollbar.slider:hover { - background-color: @osd_scrollbar_slider_prelight; + background-color: @osd_scrollbar_slider_prelight; } .osd .scrollbar.slider:active { - background-color: @osd_scrollbar_slider_active; + background-color: @osd_scrollbar_slider_active; } .osd GtkIconView.cell:selected, .osd GtkIconView.cell:selected:focus { - background-color: transparent; - border-style: solid; - border-radius: 15px; - border-width: 3px; - border-color: @osd_button_fg; - outline-color: transparent; + background-color: transparent; + border-style: solid; + border-radius: 15px; + border-width: 3px; + border-color: @osd_button_fg; + outline-color: transparent; } /* used by Documents */ .osd .page-thumbnail { - border-style: solid; - border-width: 1px; - border-color: @osd_lowlight; - /* when there's no pixbuf yet */ - background-color: @osd_bg; + border-style: solid; + border-width: 1px; + border-color: @osd_lowlight; + /* when there's no pixbuf yet */ + background-color: @osd_bg; } /************* -- cgit v1.2.1