From d364c55dbf546c8c6d6fe07664de4c2d26bc2ffc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= Date: Wed, 15 Oct 2014 21:31:31 +0200 Subject: [PATCH 3/5] Simplify Adwaita style This brings a more traditional look and feel for the panel with support for light and dark theme variants, and also for the HighContrast theme. --- gnome-panel/Adwaita.css | 181 +++++------------------------------------------- gnome-panel/main.c | 2 +- 2 files changed, 20 insertions(+), 163 deletions(-) diff --git a/gnome-panel/Adwaita.css b/gnome-panel/Adwaita.css index 7c449ff..95b466d 100644 --- a/gnome-panel/Adwaita.css +++ b/gnome-panel/Adwaita.css @@ -1,180 +1,39 @@ - define-color bg_color #000000; - define-color bg_color_selected #333333; - define-color fg_color #cccccc; - define-color fg_color_selected #ffffff; - .gnome-panel-menu-bar, PanelApplet > GtkMenuBar.menubar, -PanelToplevel, -PanelWidget, -PanelAppletFrame, -PanelApplet { - background-color: @bg_color; - background-image: none; - color: @fg_color; -} - -.gnome-panel-menu-bar.menubar, -PanelApplet > GtkMenuBar.menubar { - font: bold; -} - -.gnome-panel-menu-bar.menubar .menuitem *:hover, -PanelApplet > GtkMenuBar.menubar .menuitem *:hover { - text-shadow: 0 1px @bg_color; +PanelWidget { + background-color: @theme_unfocused_bg_color; } -.gnome-panel-menu-bar.menubar .menuitem:prelight, -PanelApplet > GtkMenuBar.menubar .menuitem:prelight { - box-shadow: none; +.gnome-panel-menu-bar, +PanelApplet > GtkMenuBar.menubar, +ClockBox { + font: bold; + color: @theme_unfocused_fg_color; } -.gnome-panel-menu-bar.menubar .menu, +.gnome-panel-menu-bar .menu, PanelApplet > GtkMenuBar.menubar .menu { - font: regular; -} - -.gnome-panel-menu-bar.menubar .menu *:hover, -PanelApplet > GtkMenuBar.menubar .menu *:hover { - text-shadow: none; + font: regular; } .gnome-panel-menu-bar .menuitem:hover, -PanelApplet > GtkMenuBar.menubar .menuitem:hover, -.gnome-panel-menu-bar .menuitem *:hover, -PanelApplet > GtkMenuBar.menubar .menuitem *:hover { - background-color: @bg_color_selected; - color: @fg_color_selected; -} - -.gnome-panel-menu-bar .menuitem *:hover, -PanelApplet > GtkMenuBar.menubar .menuitem *:hover { - color: @fg_color_selected; -} - -NaTrayApplet { - -NaTrayApplet-icon-padding: 12; - -NaTrayApplet-icon-size: 16; -} - -/* - * Applet - * Show Desktop - */ -GtkToggleButton#showdesktop-button { - border: 0px; - border-radius: 0px; - transition: none; - padding: 0px 4px; - color: @fg_color; - outline-color: transparent; - border-color: transparent; - background-image: none; - background-color: @bg_color; - text-shadow: none; - icon-shadow: none; - box-shadow: none; +PanelApplet > GtkMenuBar.menubar .menuitem:hover { + background-color: @theme_selected_bg_color; + color: @theme_selected_fg_color; } -GtkToggleButton#showdesktop-button:hover { - color: @fg_color; - outline-color: transparent; - border-color: transparent; - background-image: none; - text-shadow: none; - icon-shadow: none; - box-shadow: none; - background-color: @bg_color_selected; - -gtk-image-effect: none; -} - -/* - * Applet - * Clock - */ -GtkToggleButton#clock-applet-button { - border: 0px; - border-radius: 0px; - transition: none; +PanelApplet GtkButton#tasklist-button, +PanelApplet GtkButton#clock-applet-button, +PanelApplet GtkButton#showdesktop-button { padding: 0px 4px; - color: @fg_color; - outline-color: transparent; - border-color: transparent; - background-image: none; - background-color: @bg_color; - text-shadow: none; - icon-shadow: none; - box-shadow: none; -} - -GtkToggleButton#clock-applet-button:hover { - color: @fg_color; - outline-color: transparent; - border-color: transparent; - background-image: none; - text-shadow: none; - icon-shadow: none; - box-shadow: none; - background-color: @bg_color_selected; - -gtk-image-effect: none; -} - -GtkToggleButton#clock-applet-button:checked { - color: @fg_color_selected; - background-color: @bg_color_selected; -} - -ClockBox { - font: bold; + color: @theme_unfocused_fg_color; } -/* - * Applet - * Window List - */ -GtkToggleButton#tasklist-button { - border: 0px; - border-radius: 0px; - transition: none; - padding: 4px; - color: @fg_color; - outline-color: transparent; - border-color: transparent; - background-image: none; - background-color: @bg_color; - text-shadow: none; - icon-shadow: none; - box-shadow: none; -} - -GtkToggleButton#tasklist-button:hover { - color: @fg_color; - outline-color: transparent; - border-color: transparent; - background-image: none; - text-shadow: none; - icon-shadow: none; - box-shadow: none; - background-color: @bg_color_selected; -} - -GtkToggleButton#tasklist-button:checked { - color: @fg_color_selected; - background-color: @bg_color_selected; -} - -/* - * Applet - * Workspace Switcher - */ -WnckPager { - background-color: lighter(@bg_color_selected); +WnckPager:selected { + background-color: @theme_selected_bg_color; } -WnckPager:selected { - /* - * Color from screenshot: - * https://wiki.gnome.org/Projects/GnomeFlashback - */ - background-color: #376594; +NaTrayApplet { + -NaTrayApplet-icon-padding: 2; + -NaTrayApplet-icon-size: 16; } diff --git a/gnome-panel/main.c b/gnome-panel/main.c index dbeb19c..ab13ecc 100644 --- a/gnome-panel/main.c +++ b/gnome-panel/main.c @@ -52,7 +52,7 @@ theme_changed (GtkSettings *settings) screen = gdk_screen_get_default (); g_object_get (settings, "gtk-theme-name", &theme, NULL); - if (g_str_equal (theme, "Adwaita")) { + if (g_str_equal (theme, "Adwaita") || g_str_equal (theme, "HighContrast")) { if (provider == NULL) { GFile *file; -- 2.1.2