From a5a4911ef7f6359cc3b6e9713e296eec902fcb50 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Mon, 23 Jan 2012 00:00:01 +0100 Subject: [PATCH] Update Ozone3 theme (up-to-date 2012-01-22) --- .../gtk-3.0/gtk-widgets-assets.css | 4 +- .../Lubuntu-default/gtk-3.0/gtk-widgets.css | 318 ++++++------------ .../themes/Lubuntu-default/gtk-3.0/gtk.css | 54 ++- 3 files changed, 148 insertions(+), 228 deletions(-) diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css index 86a08a3..b84fc4e 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets-assets.css @@ -155,11 +155,11 @@ GtkScale.progressbar.vertical { } GtkSwitch.slider { - border-image: url("assets/switch-slider-border.svg") 2 / 2 stretch; + border-image: none; } GtkSwitch.slider:active { - border-image: url("assets/switch-slider-active-border.svg") 2 / 2 stretch; + border-image: none; } .progressbar, diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css index b1da49b..86f8875 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-widgets.css @@ -2,9 +2,7 @@ engine: adwaita; padding: 1; - /* Style properties */ -GtkToolButton-icon-spacing: 4; - -GtkTextView-error-underline-color: @error_color; -GtkPaned-handle-size: 5; @@ -12,12 +10,6 @@ -GtkCheckButton-indicator-size: 16; -GtkCheckMenuItem-indicator-size: 12; - /* The size for scrollbars. The slider is 2px smaller, but we keep it - * up so that the whole area is sensitive to button presses for the - * slider. The stepper button is larger in both directions, the slider - * only in the width - */ - -GtkScrolledWindow-scrollbar-spacing: 0; -GtkScrolledWindow-scrollbars-within-bevel: 1; @@ -311,7 +303,7 @@ GtkProgressBar, * GtkScale * ************/ GtkScale { - -GtkScale-slider-length: 16; + -GtkScale-slider-length: 18; -GtkRange-slider-width: 20; -GtkRange-trough-border: 0; } @@ -342,7 +334,6 @@ GtkScale.trough { GtkScale.trough:insensitive { background-color: @insensitive_bg_color; background-image: none; - border-image: none; border-style: solid; border-color: @insensitive_border_color; @@ -350,12 +341,10 @@ GtkScale.trough:insensitive { GtkScale.progressbar { background-color: @scale_progress_fill; - border-width: 1; border-radius: 2; border-style: none; /* border-image defined in the -assets variants */ - -adwaita-progressbar-pattern: none; } @@ -376,8 +365,7 @@ GtkScrolledWindow.frame { border-style: solid; border-color: darker (@theme_bg_color); border-width: 1; - border-radius: 2; - + border-radius: 0; padding: 0; } @@ -456,13 +444,10 @@ GtkScrolledWindow.frame { *****************/ .notebook { padding: 2; - border-color: @notebook_border; border-style: solid; border-width: 1; - background-color: @theme_base_color; - -GtkNotebook-tab-overlap: 8; -GtkNotebook-tab-curvature: 6; } @@ -511,7 +496,6 @@ GtkComboBox { padding: 0; -GtkWidget-focus-padding: 0; -GtkWidget-focus-line-width: 0; - -GtkComboBox-arrow-scaling: 0.5; -GtkComboBox-shadow-type: none; } @@ -609,82 +593,119 @@ GtkComboBox.combobox-entry .button:hover:active:nth-child(first) { * Scrollbars * **************/ -.scrollbar { - background-image: none; +GtkScrollbar { + -GtkRange-arrow-scaling: 0.6; + -GtkRange-slider-width: 14; + -GtkRange-stepper-size: 14; + -GtkScrollbar-min-slider-length: 16; + -GtkRange-stepper-spacing: 0; + -GtkRange-trough-under-steppers: 0; + -GtkScrollbar-has-backward-stepper: 0; + -GtkScrollbar-has-forward-stepper: 0; + -GtkScrollbar-has-secondary-backward-stepper: 0; + -GtkScrollbar-fill-arrow: 1; border-style: solid; - -GtkRange-trough-border: 2; - -GtkRange-arrow-scaling: 0.444; - -GtkRange-slider-width: 18; - -GtkRange-stepper-size: 18; - -GtkScrollbar-min-slider-length: 30; /* minimum size for the slider. sadly can't be in '.slider' where it belongs */ - - -GtkRange-stepper-spacing: 1; - -GtkRange-trough-under-steppers: 1; + border-radius: 6; } -.scrollbar.trough { - background-image: none; - background-color: shade (@theme_bg_color, 0.882); - border-width: 0; - border-radius: 0; +GtkScrollbar.trough { + border-color: @border_trough_color; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@trough_gr_color_a), + to (@trough_gr_color_b)); } -.scrollbar.slider, -.scrollbar.button { - background-image: none; - background-color: @theme_base_color; - border-color: @button_border; - border-radius: 3; - border-width: 1; - - border-image: none; +GtkScrollbar.slider { + border-color: @border_trough_color; + border-width: 1; + border-style: solid; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@slider_gr_color_a), + to (@slider_gr_color_b)); } -.scrollbar.slider:prelight { - background-image: none; - background-color: @theme_base_color; - border-color: shade (@highlighted_border, 0.964); +GtkScrollbar.slider:hover, +GtkScrollbar.slider:active { + border-color: @border_hover_color; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@slider_hover_gr_color_a), + to (@slider_hover_gr_color_b)); } -.scrollbar.slider:prelight:active { - background-image: none; - background-color: @theme_base_color; - border-color: @theme_selected_bg_color; +GtkScrollbar.trough.vertical { + border-color: @border_trough_color; + background-image: -gtk-gradient (linear, + left top, + right top, + from (@trough_gr_color_a), + to (@trough_gr_color_b)); } -.scrollbar.button { - color: @internal_element_color; +GtkScrollbar.slider.vertical { + border-color: @border_trough_color; + background-image: -gtk-gradient (linear, + left top, + right top, + from (@slider_gr_color_a), + to (@slider_gr_color_b)); } -.scrollbar.button:prelight { - background-image: none; - background-color: @theme_base_color; - border-color: shade (@highlighted_border, 0.964) +GtkScrollbar.slider.vertical:hover, +GtkScrollbar.slider.vertical:active { + border-color: @border_hover_color; + background-image: -gtk-gradient (linear, + left top, + right top, + from (@slider_hover_gr_color_a), + to (@slider_hover_gr_color_b)); } -.scrollbar.button:prelight:active { +GtkSscrollbar.button, +GtkSscrollbar.button:prelight, +GtkSscrollbar.button:active, +GtkSscrollbar.button:insensitive { + background-color: none; + border-style: none; background-image: none; - background-color: @theme_base_color; - border-color: shade (@highlighted_border, 0.964) + border-width: 0; } -.scrollbar.button:insensitive { - color: @internal_element_insensitive; - background-color: @theme_base_color; - border-color: @button_border; +.scrollbar.button { + border-radius: 0; + border-width: 0; } - -.scrollbar.slider:insensitive { - background-color: @theme_base_color; +.scrollbar.button.vertical { + background-image: -gtk-gradient (linear, left top, right top, + from (shade (@bg_color, 0.95)), + to (shade (@bg_color, 0.8))); + border-color: none; + border-radius: 0; + border-width: 0; } -.scrollbar.trough:insensitive { - background-color: shade (@theme_bg_color, 0.882); +.scrollbar.slider.vertical:prelight { + background-image: -gtk-gradient (linear, left top, right top, + from (shade (@bg_color, 0.85)), + to (shade (@bg_color, 0.7))); + border-color: shade (@bg_color, 0.6); } +.scrollbar.slider.vertical:prelight:active { + background-image: -gtk-gradient (linear, left top, right top, + from (shade (@bg_color, 0.85)), + to (shade (@bg_color, 0.7))); + border-color: shade (@bg_color, 0.6); +} /********* * Menus * *********/ + /* combobox menus */ GtkTreeMenu.menu { background-color: @theme_base_color; @@ -692,7 +713,6 @@ GtkTreeMenu.menu { GtkTreeMenu .menuitem { padding: 2; - border-style: solid; border-width: 1 0; border-color: @menu_combobox_border; @@ -723,7 +743,6 @@ GtkTreeMenu .menuitem * { background-image: none; background-color: @theme_base_color; color: @theme_text_color; - border-image: none; border-style: none; border-width: 0; @@ -732,7 +751,6 @@ GtkTreeMenu .menuitem * { .menu.button:insensitive { background-color: @theme_base_color; color: lighter(@internal_element_color); - border-image: none; border-style: none; border-width: 0; @@ -744,7 +762,6 @@ GtkTreeMenu .menuitem * { border-width: 0; border-style: none; padding: 4; - -GtkWidget-window-dragging: true; -GtkMenuBar-internal-padding: 0; } @@ -758,13 +775,12 @@ GtkTreeMenu .menuitem * { /* remove the image from the prelight areas */ .menubar .menuitem:prelight { background-image: none; - background-color: #ffffff; - + background-color: #88ACCA; border-radius: 5 5 0 0; } .menubar .menuitem *:prelight { - color: @menu_fg_color; + color: #ffffff; } .menuitem { @@ -777,7 +793,7 @@ GtkTreeMenu .menuitem * { .menuitem *:active, .menuitem:prelight, .menuitem *:prelight { - background-color: #4A90D9; + background-color: #88ACCA; color: @theme_selected_fg_color; } @@ -1274,7 +1290,7 @@ GtkPathBar .button:active:hover:nth-child(last) { background-color: shade (@theme_bg_color, 1.02); } -.sidebar .scrollbar.trough { +.sidebar GtkSscrollbar.trough { background-color: shade (@theme_bg_color, 1.02); } @@ -1311,64 +1327,27 @@ GtkAssistant .sidebar { *************/ GtkSwitch { - font: bold condensed 10; -} - -GtkSwitch.trough { - color: shade (@internal_element_color, 0.60); - - border-radius: 1; - border-width: 1; - border-style: none; - /* border-image defined in the -assets variant */ - - background-image: -gtk-gradient (linear, - left top, left bottom, - from (@trough_bg_color_a), - to (@trough_bg_color_b)); -} - -GtkSwitch.trough:active { - color: @theme_base_color; - background-image: -gtk-gradient (linear, - left top, left bottom, - from (@active_switch_bg_color_a), - to (@active_switch_bg_color_b)); -} - -GtkSwitch.trough:insensitive { - background-image: none; - background-color: shade (@theme_bg_color, 0.9); - - border-image: none; + padding: 1; + border-radius: 12; border-style: solid; } GtkSwitch.slider { - border-width: 1; - border-radius: 1; - border-style: none; - /* border-image defined in -assets variant */ - - padding: 2; - + border-color: @progressbar_border_active_color; background-image: -gtk-gradient (linear, - left top, left bottom, - from (@theme_base_color), - to (@switch_slider_color)); - - -adwaita-switch-grip-color: shade (@switch_slider_color, 0.97); -} - -GtkSwitch.slider:active { - border-color: @switch_slider_border; + left top, + left bottom, + from (@progressbar_gr_color_a), + to (@progressbar_gr_color_b)); } -GtkSwitch.slider:insensitive { - border-image: none; - - background-image: none; - background-color: @insensitive_bg_color; +GtkSwitch.trough { + border-color: @border_trough_color; + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@trough_gr_color_a), + to (@trough_gr_color_b)); } GtkViewport, @@ -1570,86 +1549,3 @@ GtkCalendar.highlight { color: mix (@theme_selected_fg_color, @theme_base_color, 0.50); } -/********************** - * Fallback Mode Panel - **********************/ - -.gnome-panel-menu-bar, -PanelToplevel, -PanelWidget, -PanelAppletFrame, -PanelApplet { - background-color: @os_chrome_bg_color; - background-image: none; - color: @os_chrome_fg_color; -} - -ClockBox, -.gnome-panel-menu-bar { - font: bold; -} - -.gnome-panel-menu-bar .menuitem:prelight { - background-color: @os_chrome_selected_bg_color; - color: @os_chrome_selected_fg_color; -} - -.gnome-panel-menu-bar .menuitem *:prelight { - color: @os_chrome_selected_fg_color; - text-shadow: @os_chrome_bg_color 0 1; -} - -PanelApplet .button, -PanelApplet .button:prelight { - padding: 4; - - border-image: none; - border-width: 0; - border-radius: 0; - - background-image: none; - background-color: alpha(@theme_base_color, 0.0); - - color: @os_chrome_fg_color; -} - -PanelApplet .button:active:prelight, -PanelApplet .button:active { - border-image: none; - background-image: none; - background-color: @os_chrome_selected_bg_color; - border-width: 0; - border-radius: 0; -} - -PanelApplet *:prelight { - color: @os_chrome_selected_fg_color; -} - -PanelApplet *:active, -PanelApplet *:prelight:active { - color: @os_chrome_selected_fg_color; - text-shadow: @os_chrome_bg_color 0 1; -} - -NaTrayApplet { - -NaTrayApplet-icon-padding: 12; - -NaTrayApplet-icon-size: 16; -} - -WnckPager, WnckTasklist { - background-color: @os_chrome_selected_bg_color; - background-image: none; - color: @os_chrome_fg_color; -} - -GsmFailWhaleDialog { - background-color: @os_chrome_bg_color; - background-image: none; - color: @os_chrome_fg_color; -} - -GsmFailWhaleDialog * { - background-color: @os_chrome_bg_color; - background-image: none; -} diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css index 50d2209..df6e935 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css @@ -2,7 +2,7 @@ @define-color base_color #ffffff; @define-color bg_color #e0e0e0; @define-color tooltip_bg_color #343434; -@define-color selected_bg_color #4a90d9; +@define-color selected_bg_color #88ACCA; @define-color text_color #2e3436; @define-color fg_color #2e3436; @define-color tooltip_fg_color #ffffff; @@ -24,12 +24,12 @@ @define-color menu_combobox_border #3277bf; @define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.9); -@define-color link_color #4a90d9; +@define-color link_color #88ACCA; @define-color frame_color #8a9580; @define-color inactive_frame_color #c7ccc1; @define-color warning_color #f57900; @define-color error_color #cc0000; -@define-color success_color #4e9a06; +@define-color success_color #88ACCA; @define-color info_fg_color rgb (181, 171, 156); @define-color info_bg_color rgb (252, 252, 189); @@ -78,16 +78,19 @@ @define-color trough_bg_color_a #bcbcb7; @define-color trough_bg_color_b #e0e0dd; -@define-color active_switch_bg_color_a #509ae7; -@define-color active_switch_bg_color_b #84b8ee; +@define-color border_color #A3A3A3; +@define-color border_hover_color #B4BDC5; +@define-color border_trough_color #B2B2B2; +@define-color button_gr_color_a #F2F2F2; +@define-color button_gr_color_b #E0E0E0; +@define-color button_hover_gr_color_a #EFF3F6; +@define-color button_hover_gr_color_b #DAE2E9; +@define-color active_switch_bg_color_a #88ACCA; +@define-color active_switch_bg_color_b #84b8ee; @define-color switch_slider_color #eeeeec; @define-color switch_slider_border #2a79cb; -@define-color progressbar_background_a #4a90d9; -@define-color progressbar_background_b #4a90d9; -@define-color progressbar_pattern #000000; - @define-color entry_text_color @theme_text_color; @define-color entry_background_a #e1e1e1; @@ -106,12 +109,19 @@ @define-color scale_progress_border_a #1864b2; @define-color scale_progress_border_b #3e90e5; +@define-color slider_gr_color_a #F9F9F9; +@define-color slider_gr_color_b #C2C2C2; +@define-color slider_hover_gr_color_a #E6F3FF; +@define-color slider_hover_gr_color_b #C8D4DE; + +@define-color trough_gr_color_a #A5A5A5; +@define-color trough_gr_color_b @bg_color; + @define-color highlighted_border #8a8f8a; @define-color notebook_border #a6a6a6; @define-color notebook_active_tab_border #1372d3; @define-color notebook_selected_tab_color #8dc0f3; - @define-color notebook_tab_gradient_a @theme_base_color; @define-color notebook_tab_gradient_b @switch_slider_color; @@ -121,10 +131,8 @@ @define-color toolbar_gradient_final #c0c0c0; @define-color toolbar_border_top shade (@theme_bg_color, 0.56); -@define-color toolbar_border_bottom shade #808080; - +@define-color toolbar_border_bottom_shade #808080; @define-color toolbar_active_button_color #909081; - @define-color primary_toolbar_entry_bg @theme_base_color; @define-color primary_toolbar_entry_fg @theme_text_color; @@ -142,16 +150,32 @@ @define-color wm_button_bg_b shade (@bg_color, 0.85); @define-color wm_button_bg_c shade (@bg_color, 0.8); @define-color wm_button_bg_d shade (@bg_color, 0.9); - @define-color wm_button_bg_hover_a shade (@wm_button_bg_a, 1.1); @define-color wm_button_bg_hover_b shade (@wm_button_bg_b, 1.1); @define-color wm_button_bg_hover_c shade (@wm_button_bg_c, 1.1); @define-color wm_button_bg_hover_d shade (@wm_button_bg_d, 1.1); - @define-color wm_button_bg_active_a shade (@bg_color, 0.7); @define-color wm_button_bg_active_b shade (@bg_color, 0.9); @define-color wm_button_bg_active_c shade (@bg_color, 0.9); +@define-color border_color #A3A3A3; +@define-color border_hover_color #B4BDC5; +@define-color border_trough_color #B2B2B2; +@define-color button_gr_color_a #F2F2F2; +@define-color button_gr_color_b #E0E0E0; +@define-color button_hover_gr_color_a #EFF3F6; +@define-color button_hover_gr_color_b #DAE2E9; +@define-color slider_gr_color_a #F9F9F9; +@define-color slider_gr_color_b #C2C2C2; +@define-color slider_hover_gr_color_a #E6F3FF; +@define-color slider_hover_gr_color_b #C8D4DE; +@define-color progressbar_border_active_color #6594E6; +@define-color progressbar_gr_color_a #88ACCA; +@define-color progressbar_gr_color_b #88ACCA; +@define-color progressbar_pattern #88ACCA; +@define-color trough_gr_color_a #A5A5A5; +@define-color trough_gr_color_b @bg_color; + @import url("gtk-widgets.css"); @import url("gtk-widgets-assets.css");