From cb052ab86ae5d6174b0bee691e153eeca42b61c0 Mon Sep 17 00:00:00 2001 From: Rafael Laguna Date: Sat, 12 Apr 2014 15:42:20 +0200 Subject: [PATCH] re-sync gtk2 with light themes --- .../gtk-2.0/apps/banshee.rc | 23 +++ .../gtk-2.0/{assets => apps}/chromium.rc | 0 .../gtk-2.0/{assets => apps}/ff.rc | 3 - .../{assets => apps}/gnome-terminal.rc | 2 +- .../entry.rc => apps/lubuntu_entry.rc} | 0 .../lxpanel.rc => apps/lubuntu_lxpanel.rc} | 0 .../gtk-2.0/apps/lubuntu_menu.rc | 36 +++++ .../toolbar.rc => apps/lubuntu_toolbar.rc} | 0 .../gtk-2.0/apps}/nautilus.rc | 102 ------------- .../gtk-2.0/{assets => apps/old}/notebook.rc | 0 .../gtk-2.0/{assets => apps}/pcmanfm.rc | 0 .../gtk-2.0/{assets => apps}/thunar.rc | 0 .../gtk-2.0/{assets => apps}/xfce4-notifyd.rc | 0 .../gtk-2.0/assets/statusbar.rc | 35 ----- .../themes/Lubuntu-dark-panel/gtk-2.0/gtkrc | 134 ++++++++---------- .../gtk-2.0/images/notebook-bottom-gap.png | Bin 188 -> 0 bytes .../gtk-2.0/images/notebook-left-gap.png | Bin 194 -> 0 bytes .../gtk-2.0/images/notebook-right-gap.png | Bin 193 -> 0 bytes .../images/notebook-tab-bottom-active.png | Bin 334 -> 0 bytes .../gtk-2.0/images/notebook-tab-bottom.png | Bin 286 -> 0 bytes .../images/notebook-tab-left-active.png | Bin 309 -> 0 bytes .../gtk-2.0/images/notebook-tab-left.png | Bin 246 -> 0 bytes .../images/notebook-tab-right-active.png | Bin 308 -> 0 bytes .../gtk-2.0/images/notebook-tab-right.png | Bin 244 -> 0 bytes .../images/notebook-tab-top-active.png | Bin 342 -> 0 bytes .../gtk-2.0/images/notebook-tab-top.png | Bin 287 -> 0 bytes .../gtk-2.0/images/notebook-top-gap.png | Bin 193 -> 0 bytes .../gtk-2.0/images/notebook.png | Bin 235 -> 0 bytes .../gtk-2.0/images/null.png | Bin 77 -> 0 bytes .../gtk-2.0/images/panel-bg.png | Bin 0 -> 234 bytes .../Lubuntu-default/gtk-2.0/apps/banshee.rc | 23 +++ .../gtk-2.0/{assets => apps}/chromium.rc | 0 .../gtk-2.0/{assets => apps}/ff.rc | 3 - .../{assets => apps}/gnome-terminal.rc | 2 +- .../entry.rc => apps/lubuntu_entry.rc} | 0 .../lxpanel.rc => apps/lubuntu_lxpanel.rc} | 2 +- .../gtk-2.0/apps/lubuntu_menu.rc | 36 +++++ .../toolbar.rc => apps/lubuntu_toolbar.rc} | 0 .../gtk-2.0/apps}/nautilus.rc | 102 ------------- .../gtk-2.0/{assets => apps/old}/notebook.rc | 0 .../gtk-2.0/{assets => apps}/pcmanfm.rc | 0 .../gtk-2.0/{assets => apps}/thunar.rc | 0 .../gtk-2.0/{assets => apps}/xfce4-notifyd.rc | 0 .../gtk-2.0/assets/statusbar.rc | 35 ----- .../themes/Lubuntu-default/gtk-2.0/gtkrc | 134 ++++++++---------- .../gtk-2.0/images/notebook-bottom-gap.png | Bin 188 -> 0 bytes .../gtk-2.0/images/notebook-left-gap.png | Bin 194 -> 0 bytes .../gtk-2.0/images/notebook-right-gap.png | Bin 193 -> 0 bytes .../images/notebook-tab-bottom-active.png | Bin 334 -> 0 bytes .../gtk-2.0/images/notebook-tab-bottom.png | Bin 286 -> 0 bytes .../images/notebook-tab-left-active.png | Bin 309 -> 0 bytes .../gtk-2.0/images/notebook-tab-left.png | Bin 246 -> 0 bytes .../images/notebook-tab-right-active.png | Bin 308 -> 0 bytes .../gtk-2.0/images/notebook-tab-right.png | Bin 244 -> 0 bytes .../images/notebook-tab-top-active.png | Bin 342 -> 0 bytes .../gtk-2.0/images/notebook-tab-top.png | Bin 287 -> 0 bytes .../gtk-2.0/images/notebook-top-gap.png | Bin 193 -> 0 bytes .../gtk-2.0/images/notebook.png | Bin 235 -> 0 bytes .../Lubuntu-default/gtk-2.0/images/null.png | Bin 77 -> 0 bytes .../gtk-2.0/images/panel-bg.png | Bin 0 -> 234 bytes 60 files changed, 243 insertions(+), 429 deletions(-) create mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/banshee.rc rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets => apps}/chromium.rc (100%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets => apps}/ff.rc (97%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets => apps}/gnome-terminal.rc (97%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets/entry.rc => apps/lubuntu_entry.rc} (100%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets/lxpanel.rc => apps/lubuntu_lxpanel.rc} (100%) create mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_menu.rc rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets/toolbar.rc => apps/lubuntu_toolbar.rc} (100%) rename usr/share/themes/{Lubuntu-default/gtk-2.0/assets => Lubuntu-dark-panel/gtk-2.0/apps}/nautilus.rc (68%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets => apps/old}/notebook.rc (100%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets => apps}/pcmanfm.rc (100%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets => apps}/thunar.rc (100%) rename usr/share/themes/Lubuntu-dark-panel/gtk-2.0/{assets => apps}/xfce4-notifyd.rc (100%) delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/statusbar.rc delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-bottom-gap.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-left-gap.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-right-gap.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-bottom-active.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-bottom.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-left-active.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-left.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-right-active.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-right.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-top-active.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-top.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-top-gap.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook.png delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/null.png create mode 100755 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/panel-bg.png create mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets => apps}/chromium.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets => apps}/ff.rc (97%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets => apps}/gnome-terminal.rc (97%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets/entry.rc => apps/lubuntu_entry.rc} (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets/lxpanel.rc => apps/lubuntu_lxpanel.rc} (98%) create mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_menu.rc rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets/toolbar.rc => apps/lubuntu_toolbar.rc} (100%) rename usr/share/themes/{Lubuntu-dark-panel/gtk-2.0/assets => Lubuntu-default/gtk-2.0/apps}/nautilus.rc (68%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets => apps/old}/notebook.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets => apps}/pcmanfm.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets => apps}/thunar.rc (100%) rename usr/share/themes/Lubuntu-default/gtk-2.0/{assets => apps}/xfce4-notifyd.rc (100%) delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/assets/statusbar.rc delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-bottom-gap.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-left-gap.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-right-gap.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-bottom-active.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-bottom.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-left-active.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-left.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-right-active.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-right.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-top-active.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-top.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-top-gap.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook.png delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/images/null.png create mode 100755 usr/share/themes/Lubuntu-default/gtk-2.0/images/panel-bg.png diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/banshee.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/banshee.rc new file mode 100644 index 0000000..d49aaf7 --- /dev/null +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/banshee.rc @@ -0,0 +1,23 @@ +# ============================================================================== +# BANSHEE SPECIFIC SETTINGS +# ============================================================================== + +style "banshee_scrollbar" { + engine "murrine" { + roundness = 20 + } +} + +widget "__gtksharp_1*SeekSlider*" style "scale" +widget "__gtksharp_1*Player*croll*" style "banshee_scrollbar" + +widget_class "__gtksharp_1**" style "default" +widget_class "__gtksharp_1**" style "button" +#widget_class "__gtksharp_1**" style "scale" + + + + + + + diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/chromium.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/chromium.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/chromium.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/chromium.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/ff.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/ff.rc similarity index 97% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/ff.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/ff.rc index e9b1c0c..def64aa 100644 --- a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/ff.rc +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/ff.rc @@ -10,9 +10,6 @@ style "ff-default" { } } -style "ff-statusbar" { -} - #widget "MozillaGtkWidget*Toolbar*" style "theme-toolbar" #widget "MozillaGtkWidget*Statusbar*" style "ff-statusbar" diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/gnome-terminal.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/gnome-terminal.rc similarity index 97% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/gnome-terminal.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/gnome-terminal.rc index 336eb9e..b9242d3 100644 --- a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/gnome-terminal.rc +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/gnome-terminal.rc @@ -24,7 +24,7 @@ style "terminal_scrollbar" = "scrollbar" style "terminal_screen" { text[NORMAL] = "#ffffff" - base[NORMAL] = "#300a24" + base[NORMAL] = "#300A24" TerminalScreen::background-darkness = 0.95 } diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/entry.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_entry.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/entry.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_entry.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/lxpanel.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_lxpanel.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/lxpanel.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_lxpanel.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_menu.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_menu.rc new file mode 100644 index 0000000..bc50a5d --- /dev/null +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_menu.rc @@ -0,0 +1,36 @@ +style "dark" +{ + bg[NORMAL] = "#e0e0e0" + bg[PRELIGHT] = shade (1.05, "#e0e0e0") + bg[SELECTED] = @selected_bg_color + bg[ACTIVE] = shade (0.95, "#e0e0e0") + bg[INSENSITIVE] = "#e0e0e0" +} + +style "menubar" = "dark" { + # those two lines were added to fix firefox's menubar item text + bg[SELECTED] = "#8FB2CF" + fg[SELECTED] = @selected_fg_color + + engine "murrine" { + textstyle = 1 + text_shade = 1.23 + gradient_shades = {1.0, 1.0, 1.0, 1.0} + lightborder_shade = 1.0 + } +} + +style "menubar_item" = "menu_item" { + bg[PRELIGHT] = "#8FB2CF" + fg[PRELIGHT] = @selected_fg_color + + engine "murrine" { + gradient_shades = {1.00, 1.0, 1.0, 1.0} +# glowstyle = 5 + border_shades = { 1.0, 1.0 } + glow_shade = 1.00 + lightborderstyle = 3 + lightborder_shade = 1.2 + roundness = 4 + } +} diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/toolbar.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_toolbar.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/toolbar.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_toolbar.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/nautilus.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/nautilus.rc similarity index 68% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/nautilus.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/nautilus.rc index de29185..1c69c1a 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/nautilus.rc +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/nautilus.rc @@ -169,108 +169,6 @@ style "nautilus-mode-button" } -style "nautilus-breadcrumbs" -{ - xthickness = 3 - ythickness = 0 - - GtkButton::child-displacement-y = 0 - GtkButton::inner-border = { 0, 8, 0, 0} - - engine "pixmap" - { - image - { - function = BOX - shadow = OUT - recolorable = TRUE - state = PRELIGHT - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - shadow = IN - state = PRELIGHT - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "/nautilus/breadcrumb_normal.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = INSENSITIVE - file = "/nautilus/breadcrumb_normal.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = SELECTED - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - } -} - -style "nautilus-left-slider" -{ - xthickness = 0 - ythickness = 0 - - engine "pixmap" - { - image { - function = BOX - file = "/nautilus/left_slider_normal.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } - -} - style "nautilus-right-slider" { xthickness = 0 diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/notebook.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/old/notebook.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/notebook.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/old/notebook.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/pcmanfm.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/pcmanfm.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/pcmanfm.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/pcmanfm.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/thunar.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/thunar.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/thunar.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/thunar.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/xfce4-notifyd.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/xfce4-notifyd.rc similarity index 100% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/xfce4-notifyd.rc rename to usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/xfce4-notifyd.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/statusbar.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/statusbar.rc deleted file mode 100644 index 2ed51bc..0000000 --- a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/statusbar.rc +++ /dev/null @@ -1,35 +0,0 @@ -######################################################################## -# Statusbar -######################################################################## - -style "statusbar" { - GtkStatusbar::shadow_type = GTK_SHADOW_NONE - engine "pixmap" - { - image - { - function = RESIZE_GRIP - detail = "statusbar" - overlay_file = "images/resizer.png" - overlay_stretch = FALSE - } - - image - { - function = SHADOW - file = "images/null.png" - } - } -} - -style "smaller-text" -{ - font_name = "8" -} - -widget_class "**" style "statusbar" -widget_class "*Statusbar*" style "smaller-text" -widget_class "*ToolButton*" style "smaller-text" -class "GtkStatusbar*" style "statusbar" -widget_class "*GtkStatusbar*.*" style "statusbar" - diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc index ad45a42..0cd941d 100644 --- a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc @@ -1,19 +1,11 @@ -gtk_color_scheme = "fg_color:#333333" -gtk_color_scheme = "bg_color:#e0e0e0" -gtk_color_scheme = "base_color:#ffffff" -gtk_color_scheme = "text_color:#333333" -gtk_color_scheme = "selected_bg_color:#8FB2CF" -gtk_color_scheme = "selected_fg_color:#ffffff" -gtk_color_scheme = "tooltip_bg_color:#303334" -gtk_color_scheme = "tooltip_fg_color:#E6E6E6" -gtk_color_scheme = "link_color:#148add" +gtk-color-scheme = "base_color:#ffffff\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_bg_color:#8FB2CF\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#148add" gtk_color_scheme = "sidepane_color:#dae0e6" gtk_color_scheme = "sidebar_color:#dae0e6" gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16" + gtk-auto-mnemonics = 1 -gtk-font-name = "Ubuntu 9" -gtk-icon-theme-name = "Lubuntu-dark-panel" +gtk-alternative-sort-arrows = 1 style "default" { xthickness = 1 @@ -25,30 +17,26 @@ style "default" { GtkButton::child-displacement-x = 1 GtkButton::child-displacement-y = 1 GtkButton::default-border = { 0, 0, 0, 0 } + GtkCheckButton::indicator-size = 16 + GtkPaned::handle-size = 6 + GtkRange::trough-border = 0 GtkRange::slider-width = 14 GtkRange::stepper-size = 13 - GtkRange::resize-grip = 13 GtkRange::trough-under-steppers = 1 + GtkScale::trough-border = 0 GtkScale::slider-width = 23 GtkScale::slider-length = 14 - GtkScale::trough-side-details = 0 - - GtkScrollbar ::has-backward-stepper = 0 - GtkScrollbar ::has-forward-stepper = 1 - GtkScrollbar ::min-slider-length = 30 - GtkScrollbar ::slider-width = 9 - GtkScrollbar ::trough-border = 3 - GtkScrollbar ::activate-slider = FALSE - GtkScrollbar ::trough-side-details = 0 - GtkScrollbar ::stepper-size = 1 - - GtkScrolledWindow ::scrollbar-spacing = 0 - GtkScrolledWindow ::scrollbars-within-bevel = 1 - + GtkScale::trough-side-details = 1 + + GtkScrollbar::activate-slider = 1 + GtkScrollbar::trough-border = 0 + GtkScrollbar::slider-width = 13 + GtkScrollbar::min-slider-length = 31 + GtkMenuBar::internal-padding = 0 GtkMenuBar::shadow-type = GTK_SHADOW_NONE GtkExpander::expander-size = 11 @@ -120,27 +108,26 @@ style "default" { lightborderstyle = 1 listviewstyle = 2 progressbarstyle = 0 - colorize_scrollbar = TRUE + colorize_scrollbar = FALSE menubaritemstyle = 1 menubarstyle = 1 menustyle = 0 focusstyle = 3 handlestyle = 1 sliderstyle = 3 - scrollbarstyle = 0 + scrollbarstyle = 2 stepperstyle = 3 - #rgba = TRUE - #trough_shades = {0.98, 1.06} +# rgba = TRUE } } style "dark" { - bg[NORMAL] = @bg_color - bg[PRELIGHT] = shade (1.05, @bg_color) + bg[NORMAL] = "#dfd7cf" + bg[PRELIGHT] = shade (1.05, "#dfd7cf") bg[SELECTED] = @selected_bg_color - bg[ACTIVE] = shade (0.95, @bg_color) - bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = shade (0.95, "#dfd7cf") + bg[INSENSITIVE] = "#dfd7cf" } style "wide" { @@ -202,30 +189,25 @@ style "spinbutton" = "notebook_button" { } } -style "scrollbar" { - bg[SELECTED] = shade (0.70, @base_color) # color indicador - bg[NORMAL] = shade (0.90, @bg_color) # color borde indicador +style "scrollbar" = "button" { + xthickness = 2 + ythickness = 2 - # color flechas (stepper) - fg[NORMAL] = shade (1.00, @base_color) - fg[PRELIGHT] = shade (1.00, @base_color) - fg[ACTIVE] = shade (1.00, @base_color) - fg[SELECTED] = shade (1.00, @base_color) - fg[INSENSITIVE] = shade (1.00, @base_color) - - engine "murrine" { - roundness = 10 - gradient_shades = {1.0,1.0,1.0,1.0} - highlight_shade = 1.0 - glow_shade = 1.0 - #reliefstyle = 0 - prelight_shade = .75 - gradient_colors = FALSE - lightborder_shade = 1.0 - lightborderstyle = 0 - trough_shades = {1.05, 1.13} - border_shades = {1.32, 1.32} - contrast = 0.00 + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade (1.04, @bg_color) + bg[ACTIVE] = shade (0.96, @bg_color) + + engine "murrine" + { + border_shades = {0.95, 0.90} + roundness = 20 + contrast = 1.0 + trough_shades = {0.92, 0.98} + lightborder_shade = 1.3 + glowstyle = 5 + glow_shade = 1.02 + gradient_shades = {1.2, 1.0, 1.0, 0.86} + trough_border_shades = {0.9, 0.98} } } @@ -301,7 +283,7 @@ style "comboboxentry" = "notebook_button" { style "menubar" = "dark" { # those two lines were added to fix firefox's menubar item text - bg[SELECTED] = @bg_color + bg[SELECTED] = "#ece7e2" fg[SELECTED] = @fg_color engine "murrine" { @@ -328,7 +310,7 @@ style "toolbar-button" = "notebook_button" { style "menu" { xthickness = 0 ythickness = 0 - bg[NORMAL] = @base_color + engine "murrine" { reliefstyle = 0 @@ -353,8 +335,8 @@ style "menu_item" = "menu" { } style "menubar_item" = "menu_item" { - bg[PRELIGHT] = @selected_bg_color - fg[PRELIGHT] = @selected_fg_color + bg[PRELIGHT] = "#ece7e2" + fg[PRELIGHT] = @fg_color engine "murrine" { gradient_shades = {1.00, 1.0, 1.0, 1.0} @@ -540,7 +522,7 @@ style "menuitem_text_is_fg_color_workaround" { text[PRELIGHT] = @selected_fg_color text[SELECTED] = @selected_fg_color text[ACTIVE] = @fg_color - text[INSENSITIVE] = @fg_color + text[INSENSITIVE] = "#99958b" } # Workaround style for places where the fg color is used instead of the text color. @@ -684,14 +666,20 @@ widget "*IdoEntryMenuItem*" style "wide" widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" # Includes -include "assets/ff.rc" -include "assets/chromium.rc" -include "assets/gnome-terminal.rc" -#include "assets/nautilus.rc" -include "assets/lxpanel.rc" -include "assets/entry.rc" -include "assets/statusbar.rc" -include "assets/toolbar.rc" -include "assets/pcmanfm.rc" -include "assets/xfce4-notifyd.rc" -include "assets/thunar.rc" +#include "apps/banshee.rc" +include "apps/chromium.rc" +include "apps/ff.rc" +include "apps/gnome-terminal.rc" +include "apps/nautilus.rc" + +# Lubuntu specific +include "apps/lubuntu_lxpanel.rc" +include "apps/lubuntu_toolbar.rc" +include "apps/lubuntu_entry.rc" +include "apps/lubuntu_menu.rc" +include "apps/pcmanfm.rc" + +# XFCE specific +include "apps/xfce4-notify.rc" +include "apps/thunar.rc" + diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-bottom-gap.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-bottom-gap.png deleted file mode 100644 index 820aed421ad3da9f2f50d785657a5c5ea0a6b116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEq#LU3J7&hz6W*~`sf9Y$_3YmK0%4z55Udrud~ z5RU6hdp7bOFyJ|SL*ZBb_0qVSR`&9oNh=-1nwU5ecXxKkG0f-ne0}Gj;Qt1dd1rDO iB13cXr#HQ2t6*e0D9vdaa6|-X6oaR$pUXO@geCw7$2ac) diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-right-gap.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-right-gap.png deleted file mode 100644 index 06373ca881903b7dd8b2b2df9a4ab1381608f69d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Eg!N$PAIQLtvJ&?na?&#~tz_78O`%fY(kk6Ln z?e4`sf9Y$_3YXis58$dY*J5LwK z5RU6h`wY1b81OK!SN!$=-Sx_k+BO!^(auJxmVO*9322WQ%mvv4FO#r{UICB61 diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-bottom-active.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-bottom-active.png deleted file mode 100644 index 2aa8b1cac1a25891632599fba9601822dd0d2be8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM%)r37VBOysAcrO0(btiIVPik{pF~z5pR>Rt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaW$$#|b^ff>svjCqES0FuW)~v;g7cW_|WcBLR z+qP}ny?ghA2M-=TeE8_mqbE!pP diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-bottom.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-bottom.png deleted file mode 100644 index b17de8a2fb77a62bac9d8a87aaa5564757059481..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fPd!~6Ln?0Vy?Sz0i-ADv!@B?O zg_oNitXc6uM~UlEgTg)!)8*z1w{7P)|FE7Z-puo9YUH$%SoL+UgPK@BbAPWr-;^j> zA;I?1re9Epx&N`ozW2sWOCKt5NMu&bQsX>4K~RU+J@AOf;mTQR%M%g~-Q1?D iuXDVxfJ-&Pz<#Te)IZbPHuXRcGkCiCxvXRt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaWCH(8_3IE zZQHi(-o5+5g9i^EK791((UT`no<4p0{Q2`2FJ8QS`SSJa*YDoFd;k9Z-leYLK%I;w zL4Lsu4$p3+fjCLt?k?4T_@40G6=-SVo0<@FC)78&qol`;+07FKC AdjJ3c diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-left.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-left.png deleted file mode 100644 index f7f91fe93870f3cfaecfa4b94a50f82ec59c4783..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fdp%toLn>~)ow}Q=#X!LI?|=V| zh6))qNlbQ&lol!22^^8%dD>^=TeF*b%*(y~mYw>T(WKDu{&(2NLk2BVgq~MEs+7C) zz4!I58ILVCytm$*E4_K0_GTUKXO(HoGLw!K9x>o~@mo&rrl;5R9>W*A_;PPA%9OfN z%DdKd@f4@fP>s_^33W@`Wd diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-right-active.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-right-active.png deleted file mode 100644 index c3a2628808a6c2e0873134c0cfae5a5053fd602f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM%)r37VBOysAcrO0(btiIVPik{pF~z5pR>Rt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaWY5w-Mz7bH!EWjtk6-dvTHEZ$W#Y>hfS-pDo zwr$&X@8133!GnhnA3l2Y=*g2OPoF-0{`~oi7cXAEeEItI>v!+oy?_6H?^4%rpiah; zAirP+hi5m^K%69RcNccC#E#cMPP(UyV~EE2yAwBZ9X8-`xqosCoAv+yb7S|IJUIP; zhfDI-N@xBfFBN5_R2pAJ?p%N1EQ>(*t@P+slDD>BNUdI_k+f#Fw_kSuMC14K52o1! ziWpvLJ$OTmOT^>1U9rl_z5l8|e0dt{Ig9=EJxv{bP0l+XkKC*yz} diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-right.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-tab-right.png deleted file mode 100644 index ee96c72d39666e4f751efccae0fc70bfc4046dfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fyFFbTLn>~)ow}2&#el)(?|=V| zfdW@55?d;i7b(bbJnBC)NpsshrQ50>W(mjzKeb%<`jE=L_lGYoe_zdWxS>$S&{ufo z^O-uQn@VF(Zp%%%UtT1`zV5Zs_u9vma`%>Jb}4W?Xi4Po6>;r&EaAkV;(3TYa+>1# zViDKIO*)E8T|z@$G+TGAyJ*6DYg?<_3idhAPd+_%B=&mXzkTaPqc?)kf0ZRt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaWsVRO%C=e)Q7T^=&3Z!SvnzeZG;w4L#tX{o( z+qP}Hckh1i;K9R(4<9{x^yJBtr%#_gfByW%ix)3nzI^@q^}BcP-oJmpcd2VQP$y$a zkY6x^!?PP{AWo9Ey9>KmV#jMBr_$;xJrfJ>=OTp)PN?q5C zU@7=G4yme&5iA`p%aV}}Z`&qCQ80o9Slx;|&ndzBKaBgAWf>z_I-I5{BOS)8OOk{U zEFF&Hn2`=o(7{SuvAP5-g@GuPG`#vLB8jJzWNQe8r7uR(e!BQ}$ lzvDQJU?~{C2MdM;^9yTN8vdY}50n4^002ovPDHLkV1kzlcpv}( diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-top-gap.png b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/notebook-top-gap.png deleted file mode 100644 index 4528ca891f0b5c84bbfd318c75b02b1008f8bef6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEq!N$PAsQpDo0mxxVcl32+VA$Bt{U?zX$Y)FP zc6VWT0D?E_{VISWoCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4kNdiwfw7yr(QrIJ5LwK z5RU7;rx%JIaNuCM=$Io~;-?vYR%(@lz;yBHzw?d+gl1Rg=HG~8@Z9rJ^zL5c!}E*z i7z?cLOmIm%#yl@eQESGbH9)s8FnGH9xvX!lvI6;>1s;*b z3=G_gAk4TVBJVsYh6h~j2fcv298VX=5Q)oI zCm3=y1n@W)|5r{4nd1^r@QI^q(ox&y|8jh<{x8zw9gP2NC6e4d%8G= zWHi3Lxsmq(1ILjADoOuuO0FVdQ&MBb@05D5RWB>pF literal 0 HcmV?d00001 diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc new file mode 100644 index 0000000..d49aaf7 --- /dev/null +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/banshee.rc @@ -0,0 +1,23 @@ +# ============================================================================== +# BANSHEE SPECIFIC SETTINGS +# ============================================================================== + +style "banshee_scrollbar" { + engine "murrine" { + roundness = 20 + } +} + +widget "__gtksharp_1*SeekSlider*" style "scale" +widget "__gtksharp_1*Player*croll*" style "banshee_scrollbar" + +widget_class "__gtksharp_1**" style "default" +widget_class "__gtksharp_1**" style "button" +#widget_class "__gtksharp_1**" style "scale" + + + + + + + diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/chromium.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/chromium.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/chromium.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/chromium.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/ff.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/ff.rc similarity index 97% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/ff.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/ff.rc index e9b1c0c..def64aa 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/ff.rc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/ff.rc @@ -10,9 +10,6 @@ style "ff-default" { } } -style "ff-statusbar" { -} - #widget "MozillaGtkWidget*Toolbar*" style "theme-toolbar" #widget "MozillaGtkWidget*Statusbar*" style "ff-statusbar" diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/gnome-terminal.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-terminal.rc similarity index 97% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/gnome-terminal.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-terminal.rc index 336eb9e..b9242d3 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/gnome-terminal.rc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-terminal.rc @@ -24,7 +24,7 @@ style "terminal_scrollbar" = "scrollbar" style "terminal_screen" { text[NORMAL] = "#ffffff" - base[NORMAL] = "#300a24" + base[NORMAL] = "#300A24" TerminalScreen::background-darkness = 0.95 } diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/entry.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_entry.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/entry.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_entry.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/lxpanel.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc similarity index 98% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/lxpanel.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc index ce69ce2..36e0854 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/lxpanel.rc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc @@ -2,7 +2,7 @@ style "theme-panel" { xthickness = 4 ythickness = 0 - #bg_pixmap[NORMAL] = "images/panel-bg.png" + bg_pixmap[NORMAL] = "images/panel-bg.png" fg[NORMAL] = "#000000" fg[PRELIGHT] = "#ffffff" diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_menu.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_menu.rc new file mode 100644 index 0000000..bc50a5d --- /dev/null +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_menu.rc @@ -0,0 +1,36 @@ +style "dark" +{ + bg[NORMAL] = "#e0e0e0" + bg[PRELIGHT] = shade (1.05, "#e0e0e0") + bg[SELECTED] = @selected_bg_color + bg[ACTIVE] = shade (0.95, "#e0e0e0") + bg[INSENSITIVE] = "#e0e0e0" +} + +style "menubar" = "dark" { + # those two lines were added to fix firefox's menubar item text + bg[SELECTED] = "#8FB2CF" + fg[SELECTED] = @selected_fg_color + + engine "murrine" { + textstyle = 1 + text_shade = 1.23 + gradient_shades = {1.0, 1.0, 1.0, 1.0} + lightborder_shade = 1.0 + } +} + +style "menubar_item" = "menu_item" { + bg[PRELIGHT] = "#8FB2CF" + fg[PRELIGHT] = @selected_fg_color + + engine "murrine" { + gradient_shades = {1.00, 1.0, 1.0, 1.0} +# glowstyle = 5 + border_shades = { 1.0, 1.0 } + glow_shade = 1.00 + lightborderstyle = 3 + lightborder_shade = 1.2 + roundness = 4 + } +} diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/toolbar.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_toolbar.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/toolbar.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_toolbar.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/nautilus.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc similarity index 68% rename from usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/nautilus.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc index de29185..1c69c1a 100644 --- a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/assets/nautilus.rc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/nautilus.rc @@ -169,108 +169,6 @@ style "nautilus-mode-button" } -style "nautilus-breadcrumbs" -{ - xthickness = 3 - ythickness = 0 - - GtkButton::child-displacement-y = 0 - GtkButton::inner-border = { 0, 8, 0, 0} - - engine "pixmap" - { - image - { - function = BOX - shadow = OUT - recolorable = TRUE - state = PRELIGHT - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - shadow = IN - state = PRELIGHT - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = NORMAL - file = "/nautilus/breadcrumb_normal.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = PRELIGHT - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - - image - { - function = BOX - recolorable = TRUE - state = ACTIVE - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = INSENSITIVE - file = "/nautilus/breadcrumb_normal.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - - image - { - function = BOX - recolorable = TRUE - state = SELECTED - file = "/nautilus/breadcrumb_prelight.png" - border = { 3, 13, 3, 3 } - stretch = TRUE - } - } -} - -style "nautilus-left-slider" -{ - xthickness = 0 - ythickness = 0 - - engine "pixmap" - { - image { - function = BOX - file = "/nautilus/left_slider_normal.png" - border = { 3, 3, 3, 3 } - stretch = TRUE - } - } - -} - style "nautilus-right-slider" { xthickness = 0 diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/notebook.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/old/notebook.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/notebook.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/old/notebook.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/pcmanfm.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/pcmanfm.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/pcmanfm.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/pcmanfm.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/thunar.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/thunar.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/thunar.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/thunar.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/xfce4-notifyd.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/xfce4-notifyd.rc similarity index 100% rename from usr/share/themes/Lubuntu-default/gtk-2.0/assets/xfce4-notifyd.rc rename to usr/share/themes/Lubuntu-default/gtk-2.0/apps/xfce4-notifyd.rc diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/statusbar.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/assets/statusbar.rc deleted file mode 100644 index 2ed51bc..0000000 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/assets/statusbar.rc +++ /dev/null @@ -1,35 +0,0 @@ -######################################################################## -# Statusbar -######################################################################## - -style "statusbar" { - GtkStatusbar::shadow_type = GTK_SHADOW_NONE - engine "pixmap" - { - image - { - function = RESIZE_GRIP - detail = "statusbar" - overlay_file = "images/resizer.png" - overlay_stretch = FALSE - } - - image - { - function = SHADOW - file = "images/null.png" - } - } -} - -style "smaller-text" -{ - font_name = "8" -} - -widget_class "**" style "statusbar" -widget_class "*Statusbar*" style "smaller-text" -widget_class "*ToolButton*" style "smaller-text" -class "GtkStatusbar*" style "statusbar" -widget_class "*GtkStatusbar*.*" style "statusbar" - diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc index 40bace9..0cd941d 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc @@ -1,19 +1,11 @@ -gtk_color_scheme = "fg_color:#333333" -gtk_color_scheme = "bg_color:#e0e0e0" -gtk_color_scheme = "base_color:#ffffff" -gtk_color_scheme = "text_color:#333333" -gtk_color_scheme = "selected_bg_color:#8FB2CF" -gtk_color_scheme = "selected_fg_color:#ffffff" -gtk_color_scheme = "tooltip_bg_color:#303334" -gtk_color_scheme = "tooltip_fg_color:#E6E6E6" -gtk_color_scheme = "link_color:#148add" +gtk-color-scheme = "base_color:#ffffff\nfg_color:#4c4c4c\ntooltip_fg_color:#ffffff\nselected_bg_color:#8FB2CF\nselected_fg_color:#FFFFFF\ntext_color:#3C3C3C\nbg_color:#F2F1F0\ntooltip_bg_color:#000000\nlink_color:#148add" gtk_color_scheme = "sidepane_color:#dae0e6" gtk_color_scheme = "sidebar_color:#dae0e6" gtk-icon-sizes = "panel-menu=22,22:gtk-button=16,16" + gtk-auto-mnemonics = 1 -gtk-font-name = "Ubuntu 9" -gtk-icon-theme-name = "Lubuntu" +gtk-alternative-sort-arrows = 1 style "default" { xthickness = 1 @@ -25,30 +17,26 @@ style "default" { GtkButton::child-displacement-x = 1 GtkButton::child-displacement-y = 1 GtkButton::default-border = { 0, 0, 0, 0 } + GtkCheckButton::indicator-size = 16 + GtkPaned::handle-size = 6 + GtkRange::trough-border = 0 GtkRange::slider-width = 14 GtkRange::stepper-size = 13 - GtkRange::resize-grip = 13 GtkRange::trough-under-steppers = 1 + GtkScale::trough-border = 0 GtkScale::slider-width = 23 GtkScale::slider-length = 14 - GtkScale::trough-side-details = 0 - - GtkScrollbar ::has-backward-stepper = 0 - GtkScrollbar ::has-forward-stepper = 1 - GtkScrollbar ::min-slider-length = 30 - GtkScrollbar ::slider-width = 9 - GtkScrollbar ::trough-border = 3 - GtkScrollbar ::activate-slider = FALSE - GtkScrollbar ::trough-side-details = 0 - GtkScrollbar ::stepper-size = 1 - - GtkScrolledWindow ::scrollbar-spacing = 0 - GtkScrolledWindow ::scrollbars-within-bevel = 1 - + GtkScale::trough-side-details = 1 + + GtkScrollbar::activate-slider = 1 + GtkScrollbar::trough-border = 0 + GtkScrollbar::slider-width = 13 + GtkScrollbar::min-slider-length = 31 + GtkMenuBar::internal-padding = 0 GtkMenuBar::shadow-type = GTK_SHADOW_NONE GtkExpander::expander-size = 11 @@ -120,27 +108,26 @@ style "default" { lightborderstyle = 1 listviewstyle = 2 progressbarstyle = 0 - colorize_scrollbar = TRUE + colorize_scrollbar = FALSE menubaritemstyle = 1 menubarstyle = 1 menustyle = 0 focusstyle = 3 handlestyle = 1 sliderstyle = 3 - scrollbarstyle = 0 + scrollbarstyle = 2 stepperstyle = 3 - #rgba = TRUE - #trough_shades = {0.98, 1.06} +# rgba = TRUE } } style "dark" { - bg[NORMAL] = @bg_color - bg[PRELIGHT] = shade (1.05, @bg_color) + bg[NORMAL] = "#dfd7cf" + bg[PRELIGHT] = shade (1.05, "#dfd7cf") bg[SELECTED] = @selected_bg_color - bg[ACTIVE] = shade (0.95, @bg_color) - bg[INSENSITIVE] = @bg_color + bg[ACTIVE] = shade (0.95, "#dfd7cf") + bg[INSENSITIVE] = "#dfd7cf" } style "wide" { @@ -202,30 +189,25 @@ style "spinbutton" = "notebook_button" { } } -style "scrollbar" { - bg[SELECTED] = shade (0.70, @base_color) # color indicador - bg[NORMAL] = shade (0.90, @bg_color) # color borde indicador +style "scrollbar" = "button" { + xthickness = 2 + ythickness = 2 - # color flechas (stepper) - fg[NORMAL] = shade (1.00, @base_color) - fg[PRELIGHT] = shade (1.00, @base_color) - fg[ACTIVE] = shade (1.00, @base_color) - fg[SELECTED] = shade (1.00, @base_color) - fg[INSENSITIVE] = shade (1.00, @base_color) - - engine "murrine" { - roundness = 10 - gradient_shades = {1.0,1.0,1.0,1.0} - highlight_shade = 1.0 - glow_shade = 1.0 - #reliefstyle = 0 - prelight_shade = .75 - gradient_colors = FALSE - lightborder_shade = 1.0 - lightborderstyle = 0 - trough_shades = {1.05, 1.13} - border_shades = {1.32, 1.32} - contrast = 0.00 + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade (1.04, @bg_color) + bg[ACTIVE] = shade (0.96, @bg_color) + + engine "murrine" + { + border_shades = {0.95, 0.90} + roundness = 20 + contrast = 1.0 + trough_shades = {0.92, 0.98} + lightborder_shade = 1.3 + glowstyle = 5 + glow_shade = 1.02 + gradient_shades = {1.2, 1.0, 1.0, 0.86} + trough_border_shades = {0.9, 0.98} } } @@ -301,7 +283,7 @@ style "comboboxentry" = "notebook_button" { style "menubar" = "dark" { # those two lines were added to fix firefox's menubar item text - bg[SELECTED] = @bg_color + bg[SELECTED] = "#ece7e2" fg[SELECTED] = @fg_color engine "murrine" { @@ -328,7 +310,7 @@ style "toolbar-button" = "notebook_button" { style "menu" { xthickness = 0 ythickness = 0 - bg[NORMAL] = @base_color + engine "murrine" { reliefstyle = 0 @@ -353,8 +335,8 @@ style "menu_item" = "menu" { } style "menubar_item" = "menu_item" { - bg[PRELIGHT] = @selected_bg_color - fg[PRELIGHT] = @selected_fg_color + bg[PRELIGHT] = "#ece7e2" + fg[PRELIGHT] = @fg_color engine "murrine" { gradient_shades = {1.00, 1.0, 1.0, 1.0} @@ -540,7 +522,7 @@ style "menuitem_text_is_fg_color_workaround" { text[PRELIGHT] = @selected_fg_color text[SELECTED] = @selected_fg_color text[ACTIVE] = @fg_color - text[INSENSITIVE] = @fg_color + text[INSENSITIVE] = "#99958b" } # Workaround style for places where the fg color is used instead of the text color. @@ -684,14 +666,20 @@ widget "*IdoEntryMenuItem*" style "wide" widget_class "EShellWindow.GtkVBox.BonoboDock.BonoboDockBand.BonoboDockItem*" style "evo_new_button_workaround" # Includes -include "assets/ff.rc" -include "assets/chromium.rc" -include "assets/gnome-terminal.rc" -#include "assets/nautilus.rc" -include "assets/lxpanel.rc" -include "assets/entry.rc" -include "assets/statusbar.rc" -include "assets/toolbar.rc" -include "assets/pcmanfm.rc" -include "assets/xfce4-notifyd.rc" -include "assets/thunar.rc" +#include "apps/banshee.rc" +include "apps/chromium.rc" +include "apps/ff.rc" +include "apps/gnome-terminal.rc" +include "apps/nautilus.rc" + +# Lubuntu specific +include "apps/lubuntu_lxpanel.rc" +include "apps/lubuntu_toolbar.rc" +include "apps/lubuntu_entry.rc" +include "apps/lubuntu_menu.rc" +include "apps/pcmanfm.rc" + +# XFCE specific +include "apps/xfce4-notify.rc" +include "apps/thunar.rc" + diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-bottom-gap.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-bottom-gap.png deleted file mode 100644 index 820aed421ad3da9f2f50d785657a5c5ea0a6b116..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEq#LU3J7&hz6W*~`sf9Y$_3YmK0%4z55Udrud~ z5RU6hdp7bOFyJ|SL*ZBb_0qVSR`&9oNh=-1nwU5ecXxKkG0f-ne0}Gj;Qt1dd1rDO iB13cXr#HQ2t6*e0D9vdaa6|-X6oaR$pUXO@geCw7$2ac) diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-right-gap.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-right-gap.png deleted file mode 100644 index 06373ca881903b7dd8b2b2df9a4ab1381608f69d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^Oh7Eg!N$PAIQLtvJ&?na?&#~tz_78O`%fY(kk6Ln z?e4`sf9Y$_3YXis58$dY*J5LwK z5RU6h`wY1b81OK!SN!$=-Sx_k+BO!^(auJxmVO*9322WQ%mvv4FO#r{UICB61 diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-bottom-active.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-bottom-active.png deleted file mode 100644 index 2aa8b1cac1a25891632599fba9601822dd0d2be8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 334 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM%)r37VBOysAcrO0(btiIVPik{pF~z5pR>Rt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaW$$#|b^ff>svjCqES0FuW)~v;g7cW_|WcBLR z+qP}ny?ghA2M-=TeE8_mqbE!pP diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-bottom.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-bottom.png deleted file mode 100644 index b17de8a2fb77a62bac9d8a87aaa5564757059481..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 286 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fPd!~6Ln?0Vy?Sz0i-ADv!@B?O zg_oNitXc6uM~UlEgTg)!)8*z1w{7P)|FE7Z-puo9YUH$%SoL+UgPK@BbAPWr-;^j> zA;I?1re9Epx&N`ozW2sWOCKt5NMu&bQsX>4K~RU+J@AOf;mTQR%M%g~-Q1?D iuXDVxfJ-&Pz<#Te)IZbPHuXRcGkCiCxvXRt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaWCH(8_3IE zZQHi(-o5+5g9i^EK791((UT`no<4p0{Q2`2FJ8QS`SSJa*YDoFd;k9Z-leYLK%I;w zL4Lsu4$p3+fjCLt?k?4T_@40G6=-SVo0<@FC)78&qol`;+07FKC AdjJ3c diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-left.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-left.png deleted file mode 100644 index f7f91fe93870f3cfaecfa4b94a50f82ec59c4783..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fdp%toLn>~)ow}Q=#X!LI?|=V| zh6))qNlbQ&lol!22^^8%dD>^=TeF*b%*(y~mYw>T(WKDu{&(2NLk2BVgq~MEs+7C) zz4!I58ILVCytm$*E4_K0_GTUKXO(HoGLw!K9x>o~@mo&rrl;5R9>W*A_;PPA%9OfN z%DdKd@f4@fP>s_^33W@`Wd diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-right-active.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-right-active.png deleted file mode 100644 index c3a2628808a6c2e0873134c0cfae5a5053fd602f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM%)r37VBOysAcrO0(btiIVPik{pF~z5pR>Rt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaWY5w-Mz7bH!EWjtk6-dvTHEZ$W#Y>hfS-pDo zwr$&X@8133!GnhnA3l2Y=*g2OPoF-0{`~oi7cXAEeEItI>v!+oy?_6H?^4%rpiah; zAirP+hi5m^K%69RcNccC#E#cMPP(UyV~EE2yAwBZ9X8-`xqosCoAv+yb7S|IJUIP; zhfDI-N@xBfFBN5_R2pAJ?p%N1EQ>(*t@P+slDD>BNUdI_k+f#Fw_kSuMC14K52o1! ziWpvLJ$OTmOT^>1U9rl_z5l8|e0dt{Ig9=EJxv{bP0l+XkKC*yz} diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-right.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-tab-right.png deleted file mode 100644 index ee96c72d39666e4f751efccae0fc70bfc4046dfd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fyFFbTLn>~)ow}2&#el)(?|=V| zfdW@55?d;i7b(bbJnBC)NpsshrQ50>W(mjzKeb%<`jE=L_lGYoe_zdWxS>$S&{ufo z^O-uQn@VF(Zp%%%UtT1`zV5Zs_u9vma`%>Jb}4W?Xi4Po6>;r&EaAkV;(3TYa+>1# zViDKIO*)E8T|z@$G+TGAyJ*6DYg?<_3idhAPd+_%B=&mXzkTaPqc?)kf0ZRt zvY3H^TNs2H8D`A^>0mGM^mS#w!^kaWsVRO%C=e)Q7T^=&3Z!SvnzeZG;w4L#tX{o( z+qP}Hckh1i;K9R(4<9{x^yJBtr%#_gfByW%ix)3nzI^@q^}BcP-oJmpcd2VQP$y$a zkY6x^!?PP{AWo9Ey9>KmV#jMBr_$;xJrfJ>=OTp)PN?q5C zU@7=G4yme&5iA`p%aV}}Z`&qCQ80o9Slx;|&ndzBKaBgAWf>z_I-I5{BOS)8OOk{U zEFF&Hn2`=o(7{SuvAP5-g@GuPG`#vLB8jJzWNQe8r7uR(e!BQ}$ lzvDQJU?~{C2MdM;^9yTN8vdY}50n4^002ovPDHLkV1kzlcpv}( diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-top-gap.png b/usr/share/themes/Lubuntu-default/gtk-2.0/images/notebook-top-gap.png deleted file mode 100644 index 4528ca891f0b5c84bbfd318c75b02b1008f8bef6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^VnEEq!N$PAsQpDo0mxxVcl32+VA$Bt{U?zX$Y)FP zc6VWT0D?E_{VISWoCO|{#S9GG!XV7ZFl&wkP>{XE)7O>#4kNdiwfw7yr(QrIJ5LwK z5RU7;rx%JIaNuCM=$Io~;-?vYR%(@lz;yBHzw?d+gl1Rg=HG~8@Z9rJ^zL5c!}E*z i7z?cLOmIm%#yl@eQESGbH9)s8FnGH9xvX!lvI6;>1s;*b z3=G_gAk4TVBJVsYh6h~j2fcv298VX=5Q)oI zCm3=y1n@W)|5r{4nd1^r@QI^q(ox&y|8jh<{x8zw9gP2NC6e4d%8G= zWHi3Lxsmq(1ILjADoOuuO0FVdQ&MBb@05D5RWB>pF literal 0 HcmV?d00001