Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=artwork.git;a=commitdiff;h=a50a29180c614918e222c2fd90f8509f63b65e2a
commit a50a29180c614918e222c2fd90f8509f63b65e2a Author: Devil505 <[email protected]> Date: Tue May 24 08:04:37 2011 +0200 * updating gtk3 theme diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/gedit.rc b/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/gedit.rc index 28c8c38..3012d12 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/gedit.rc +++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/gedit.rc @@ -10,5 +10,5 @@ style "gedit-frame" } widget_class "*Gedit*.<GtkFrame>*" style "gedit-frame" -widget_class "*Gedit*.<GtkScrolledWindow>" style "murrine-thin" +widget_class "*Gedit*.<GtkScrolledWindow>" style "murrine-thin" widget_class "*Gedit*.<GtkArrow>*" style:highest "murrine-default" diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/nautilus.rc b/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/nautilus.rc index 7196fd8..e65f015 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/nautilus.rc +++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/Apps/nautilus.rc @@ -9,12 +9,6 @@ style "nautilus-sidebar" = "murrine-sidebar" GtkTreeView::vertical_separator = 2 } -style "nautilus-sidebar-other" = "nautilus-sidebar" -{ - xthickness = 0 - bg[NORMAL] = @bg_color -} - style "nautilus-extra-view" { @@ -36,40 +30,18 @@ style "nautilus-extra-view" style "nautilus-statusbar" { - xthickness = 4 - - bg[NORMAL] = @base_color - bg[PRELIGHT] = shade (1.16, mix (0.1, @bg_color, @selected_bg_color)) - bg[SELECTED] = @fg_color - - base[SELECTED] = shade (0.8, @selected_bg_color) + bg[NORMAL] = @base_color - fg[NORMAL] = mix (0.4, @base_color, @text_color) + fg[NORMAL] = mix (0.4, @base_color, @text_color) fg[PRELIGHT] = mix (0.4, @base_color, @text_color) fg[SELECTED] = mix (0.4, @base_color, @text_color) - fg[ACTIVE] = mix (0.4, @base_color, @text_color) + fg[ACTIVE] = mix (0.4, @base_color, @text_color) fg[INSENSITIVE] = mix (0.4, @base_color, @text_color) - - engine "pixmap" - { - - image - { - function = RESIZE_GRIP - recolorable = TRUE - detail = "statusbar" - overlay_file = "/Handle/resize_grip.png" - overlay_border = {0,0,0,0 } - overlay_stretch = FALSE - } - } } style "nautilus-scale" { - ythickness = 0 - - GtkRange ::trough-border = 0 + GtkRange ::trough-border = 0 GtkScale ::trough-side-details = 0 engine "pixmap" @@ -187,18 +159,18 @@ style "nautilus-right-slider" } } -widget "*NautilusNavigationWindow" style "nautilus-window-base" -widget "*Nautilus*Splitter" style "pixmap-sidebar-handle-left" -widget_class "*Nautilus*View" style "murrine-thin" -widget_class "*Nautilus*NautilusSidePane*" style "nautilus-sidebar" +widget "*NautilusNavigationWindow" style "nautilus-window-base" +widget "*Nautilus*Splitter" style "pixmap-sidebar-handle-left" +widget_class "*Nautilus*View" style "murrine-thin" +widget_class "*Nautilus*NautilusSidePane*" style "nautilus-sidebar" widget_class "*Nautilus*NautilusSidePane*Scrolled*" style "murrine-scrollbar-sidebar" -widget_class "*Nautilus*Statusbar*" style "nautilus-statusbar" -widget_class "*Nautilus*Scale*" style "nautilus-scale" +widget_class "*Nautilus*Statusbar*" style "nautilus-statusbar" +widget_class "*Nautilus*Scale*" style "nautilus-scale" -widget_class "*Nautilus*Notebook" style "murrine-thin" +widget_class "*Nautilus*Notebook" style "murrine-thin" -widget "*.nautilus-extra-view-widget" style : highest "nautilus-extra-view" +widget "*.nautilus-extra-view-widget" style : highest "nautilus-extra-view" -widget_class "*NautilusPathBar.*ToggleButton*" style "nautilus-breadcrumbs" -widget "Nautilus*left_slider*" style "nautilus-left-slider" -widget "Nautilus*right_slider*" style "nautilus-right-slider" +widget_class "*NautilusPathBar.*ToggleButton*" style "nautilus-breadcrumbs" +widget "Nautilus*left_slider*" style "nautilus-left-slider" +widget "Nautilus*right_slider*" style "nautilus-right-slider" diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/Handle/resize_grip.png b/gnome-frugalware/theme/Frugalware/gtk-2.0/Handle/resize_grip.png index 0dd576b..84d6f93 100755 Binary files a/gnome-frugalware/theme/Frugalware/gtk-2.0/Handle/resize_grip.png and b/gnome-frugalware/theme/Frugalware/gtk-2.0/Handle/resize_grip.png differ diff --git a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc index ee7c97e..ca17941 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc +++ b/gnome-frugalware/theme/Frugalware/gtk-2.0/gtkrc @@ -467,6 +467,12 @@ style "pixmap-mode-button" { } } +style "overlay-scrollbar" { + + base[SELECTED] = shade (0.6, @base_color) + base[INSENSITIVE] = shade (0.85, @base_color) +} + style "pixmap-paned" { GtkPaned::handle_size = 8 @@ -565,6 +571,9 @@ widget_class "*.<GtkCTree>.<GtkButton>" style "murrine-treeview-header" widget_class "*.<GtkList>.<GtkButton>" style "murrine-treeview-header" widget_class "*.<GtkCList>.<GtkButton>" style "murrine-treeview-header" +#Overlay scrollbars +widget_class "*<GtkScrolledWindow>*<OsScrollbar>" style "overlay-scrollbar" + ################################ # FIXME: This will not work if one embeds eg. a button into the tooltip. ################################ @@ -648,4 +657,4 @@ include "Apps/menus-dark.rc" include "Apps/postler.rc" include "Apps/steadyflow.rc" include "Apps/totem.rc" - +include "Apps/xfce-panel.rc" diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/button.css b/gnome-frugalware/theme/Frugalware/gtk-3.0/button.css index a35133d..24f8335 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-3.0/button.css +++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/button.css @@ -9,8 +9,8 @@ background-image: -gtk-gradient (linear, left top, left bottom, - from (@base_color), - to (shade (@base_color, 0.88))); + from (shade (@bg_color, 1.15)), + to (shade (@bg_color, 1.03))); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, @@ -21,11 +21,6 @@ left top, left bottom, from (alpha (#000, 0.00)), to (alpha (#000, 0.10))); - - -unico-focus-border-gradient: -gtk-gradient (linear, - left top, left bottom, - from (alpha (@keyboard_focus_border_a, 0.62)), - to (alpha (@keyboard_focus_border_b, 0.62))); } .button:hover, @@ -43,8 +38,8 @@ background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@base_color, 0.54)), - to (shade (@base_color, 0.76))); + from (shade (@bg_color, 0.54)), + to (shade (@bg_color, 0.76))); -unico-outer-stroke-gradient: -gtk-gradient (linear, left top, left bottom, diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/entry.css b/gnome-frugalware/theme/Frugalware/gtk-3.0/entry.css index 9b6d525..986aa58 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-3.0/entry.css +++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/entry.css @@ -53,9 +53,9 @@ background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@bg_color, 0.90)), - color-stop (0.20, @bg_color), - to (@bg_color)); + from (alpha (#000, 0.10)), + color-stop (0.20, alpha (#000, 0.00)), + to (alpha (#000, 0.00))); -unico-border-gradient: -gtk-gradient (linear, left top, left bottom, diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-dark.css b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-dark.css index e207b75..fc85790 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-dark.css +++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-dark.css @@ -1,71 +1,26 @@ -/* dark colormap */ - -/* FIXME: I made up most of these colors, need proper design */ -@define-color theme_base_color #000000; -@define-color theme_text_color #d1cbc9; -@define-color theme_bg_color #121212; -@define-color theme_fg_color #d1cbc9; -@define-color theme_selected_bg_color alpha (@theme_fg_color, 0.70); -@define-color theme_selected_fg_color #000000; - -@define-color theme_tooltip_bg_color #cbcbcb; -@define-color theme_tooltip_fg_color #000000; - -@define-color button_gradient_color_a #282528; -@define-color button_gradient_color_b #0d0b0d; -@define-color button_border #383438; - -@define-color button_active_gradient_color_a shade (@button_active_gradient_color_b, 0.83); -@define-color button_active_gradient_color_b #5d565d; - -@define-color button_hover_gradient_color_a shade (@button_gradient_color_a, 1.07); -@define-color button_hover_gradient_color_b @theme_base_color; - -@define-color insensitive_bg_color #0b0b0d; -@define-color insensitive_fg_color #585458; - -@define-color inactive_frame_color shade (@theme_bg_color, 1.19); - -@define-color notebook_border #393939; -@define-color notebook_active_tab_border alpha (@theme_base_color, 0.50); -@define-color notebook_selected_tab_color alpha (@theme_fg_color, 0.75); - -@define-color notebook_tab_gradient_a @switch_slider_color; -@define-color notebook_tab_gradient_b @theme_base_color; - -@define-color switch_slider_color #111113; -@define-color switch_slider_border #a5b8cc; - -@define-color highlighted_border #757075; -@define-color internal_element_color #77757a; - -@define-color progressbar_background_a alpha (@theme_fg_color, 0.70); -@define-color progressbar_background_b alpha (@theme_fg_color, 0.45); -@define-color progressbar_border alpha (@theme_fg_color, 0.60); - -@define-color focused_entry_border alpha (@theme_fg_color, 0.95); - -@define-color toolbar_gradient_base #1a1a1d; -@define-color toolbar_gradient_step1 #262628; -@define-color toolbar_gradient_step2 #43434b; -@define-color toolbar_gradient_final #858597; - -@define-color toolbar_active_button_color #6f6f7e; - -@define-color expander_row_selected_color alpha (@theme_base_color, 0.60); - -@define-color menu_controls_color #aaa8ac; - -@define-color keyboard_focus_border_a alpha (@theme_fg_color, 0.80); -@define-color keyboard_focus_border_b alpha (@theme_fg_color, 0.60); - -@define-color trough_bg_color_a #1b1b1e; -@define-color trough_bg_color_b #333338; - -@define-color frame_color #756a7f; - -/* FIXME: needs dark colors from here */ -@define-color link_color #4a90d9; +/* Default color scheme */ +@define-color base_color #FFF; +@define-color bg_color #363636; +@define-color tooltip_bg_color #000; +@define-color selected_bg_color #4a90d9; +@define-color text_color #fff; +@define-color fg_color #fff; +@define-color tooltip_fg_color #FFF; +@define-color selected_fg_color #FFF; + +/* Colormap actually used by the theme, to be overridden in other css files */ +@define-color theme_base_color @base_color; +@define-color theme_text_color @text_color; +@define-color theme_bg_color @bg_color; +@define-color theme_fg_color @fg_color; +@define-color theme_tooltip_bg_color @tooltip_bg_color; +@define-color theme_tooltip_fg_color @tooltip_fg_color; +@define-color theme_selected_bg_color @selected_bg_color; +@define-color theme_selected_fg_color @selected_fg_color; + +@define-color link_color #08C; +@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; @@ -79,18 +34,8 @@ @define-color error_fg_color rgb (166, 38, 38); @define-color error_bg_color rgb (237, 54, 54); -@define-color os_chrome_bg_color black; -@define-color os_chrome_fg_color #ccc; -@define-color os_chrome_selected_bg_color #333; -@define-color os_chrome_selected_fg_color white; - -@define-color chrome_bg_color #1e1a17; -@define-color chrome_fg_color #fff; - -@define-color active_switch_bg_color_a #509ae7; -@define-color active_switch_bg_color_b #84b8ee; -@define-color scale_fill_a #2c85e2; -@define-color scale_fill_b #b8d6f5; +@define-color insensitive_bg_color #f4f4f2; +@define-color insensitive_fg_color #a7aba7; -@import url ("gtk-widgets.css"); +@import url("gtk-widgets.css"); diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css index 6f1c1c0..8bc387c 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css +++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/gtk-widgets.css @@ -96,18 +96,45 @@ GtkSpinButton.button:active { * Notebooks and * * tabs * *****************/ -.notebook { +/* .notebook { + background-color: shade (@bg_color, 1.06); + border-radius: 4; } .notebook tab { + background-color: shade (@bg_color, 0.85); } .notebook tab:active { -} + background-color: shade (@bg_color, 1.06); +}*/ .notebook tab .button, .notebook tab .button:hover, .notebook tab .button:hover:active { + + background-image: none; + background-color: alpha (#000, 0.02); + + -unico-border-gradient: -gtk-gradient (linear, + left top, left bottom, + from (shade (@bg_color, 0.67)), + to (shade (@bg_color, 0.74))); + + -unico-inner-stroke-gradient: -gtk-gradient (linear, + left top, left bottom, + from (alpha (#000, 0.10)), + to (alpha (#000, 0.06))); + + -unico-outer-stroke-gradient: -gtk-gradient (linear, + left top, left bottom, + from (alpha (#fff, 0.00)), + color-stop (0.85, alpha (#fff, 0.00)), + to (alpha (#fff, 0.40))); +} + +.notebook tab .button:hover:active { + background-color: alpha (#000, 0.10); } /************** @@ -370,12 +397,33 @@ column-header { column-header .button { -unico-outer-stroke-style: none; border-radius: 0; + border-width: 0; + -GtkButton-inner-border: 2; + + background-image: -gtk-gradient (linear, + left top, + left bottom, + from (@base_color), + color-stop (0.04, shade (@base_color, 0.88)), + color-stop (0.96, @base_color), + color-stop (0.99, shade (@base_color, 0.50)), + to (shade (@base_color, 0.45))); +} + +column-header .button:hover { + -unico-outer-stroke-style: none; + border-radius: 0; + border-width: 0; + color: @text_color; background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@base_color, 0.88)), - to (@base_color)); + from (shade (@base_color, 0.95)), + color-stop (0.04, shade (@base_color, 0.80)), + color-stop (0.96, @base_color), + color-stop (0.99, shade (@base_color, 0.50)), + to (shade (@base_color, 0.45))); } row:hover { @@ -451,7 +499,9 @@ CheeseThumbView /* Cheese */ /* gnome-terminal */ TerminalScreen { - -TerminalScreen-background-darkness: 0.95; + background-color: #000; + color: #fff; + -TerminalScreen-background-darkness: 0.85; } /********************** diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/menu.css b/gnome-frugalware/theme/Frugalware/gtk-3.0/menu.css index 1bcd2ff..e936f5a 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-3.0/menu.css +++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/menu.css @@ -4,11 +4,6 @@ /* this controls the general appearance of the menubar */ .menubar { - background-image: -gtk-gradient (linear, - left top, left bottom, - from (@theme_bg_color), - color-stop (0.45, shade (@theme_bg_color, 0.97)), - to (shade (@theme_bg_color, 0.99))); border-width: 0; border-style: none; padding: 4; @@ -49,7 +44,7 @@ } -.menuitem { +.menu.menuitem { -unico-menuitem-arrow-color: @menu_controls_color; font: bold; padding: 2; diff --git a/gnome-frugalware/theme/Frugalware/gtk-3.0/toolbar.css b/gnome-frugalware/theme/Frugalware/gtk-3.0/toolbar.css index ee765f8..9982c79 100644 --- a/gnome-frugalware/theme/Frugalware/gtk-3.0/toolbar.css +++ b/gnome-frugalware/theme/Frugalware/gtk-3.0/toolbar.css @@ -11,8 +11,8 @@ color-stop (0.93, shade (@bg_color, 0.82)), color-stop (0.94, shade (@bg_color, 0.89)), color-stop (0.96, shade (@bg_color, 0.89)), - color-stop (0.99, shade (@bg_color, 0.50)), - to (shade (@bg_color, 0.50))); + color-stop (0.99, shade (@bg_color, 0.55)), + to (shade (@bg_color, 0.55))); border-width: 0; padding: 2; -GtkWidget-window-dragging: true; @@ -50,23 +50,8 @@ border-color: shade (@theme_bg_color, 0.91); } -/* progressbars on primary toolbar entries are special */ -.primary-toolbar.toolbar.entry.progressbar { - /* FIXME: need correct colors/gradient */ - background-image: -gtk-gradient (linear, - left top, left bottom, - from (@trough_bg_color_a), - to (@trough_bg_color_b)); - - border-width: 0; - border-radius: 2; - border-color: shade (@inactive_frame_color, 0.925); -} - .primary-toolbar.toolbar.separator { - border-style: solid; - border-width: 1; - border-color: shade (@theme_bg_color, 0.56); + border-width: 0; } /******************* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
