diff --git a/debian/changelog b/debian/changelog index 1f27d8f..1aaa7d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ lubuntu-artwork (0.25) UNRELEASED; urgency=low * usr/share/themes/Lubuntu-default: - - Fix black background for some widgets (LP: #933682) + - Update with teh current unico on precise (LP: #933682) -- Julien Lavergne Mon, 20 Feb 2012 02:01:41 +0100 diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-dark.css b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-dark.css new file mode 100644 index 0000000..a5a09b2 --- /dev/null +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk-dark.css @@ -0,0 +1 @@ +@import url("resource:///org/gnome/adwaita/gtk-main-dark.css"); 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 9588c89..22ff9c4 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css @@ -1,8 +1,3 @@ -/* -# Ozone3 theme for Lubuntu 12.04 (GPL2) by 神癒礁湖 (Rafael Laguna) -# Inspired on Prudence/Sammy, by Андрей Твердов (Andrey Tverdov) -*/ - /* Default color scheme */ @define-color fg_color #333333; @define-color bg_color #e0e0e0; @@ -13,78 +8,21 @@ @define-color tooltip_bg_color #E3F1FF; @define-color tooltip_fg_color #333333; @define-color null rgba(0,0,0,0); - @define-color theme_base_color @base_color; @define-color theme_text_color @text_color; -/* Custom colors */ -@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 #B7D1E6; -@define-color progressbar_gr_color_b #7BA2C3; - -@define-color trough_gr_color_a #A5A5A5; -@define-color trough_gr_color_b @bg_color; - -@define-color toolbar_gradient_base #e0e0e0; -@define-color toolbar_gradient_step1 #e0e0e0; -@define-color toolbar_gradient_step2 #c0c0c0; -@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_active_button_color #909081; -@define-color primary_toolbar_entry_bg @theme_base_color; -@define-color primary_toolbar_entry_fg @theme_text_color; - -@define-color menu_bg_color shade (@theme_bg_color, 1.1); -@define-color menu_fg_color @theme_fg_color; -@define-color menu_controls_color shade (@theme_fg_color, 0.9); -@define-color menu_combobox_border #3277bf; -@define-color menu_separator mix (@menu_fg_color, @menu_bg_color, 0.9); - -/* For all widgets */ -* { - engine: unico; - border-width: 1px; - border-radius: 2px; - border-style: none; - background-color: @bg_color; - - -unico-focus-fill-color: @null; - -unico-focus-border-color: alpha (@border_color, 0.5); - -unico-focus-border-radius: 2; - - -unico-focus-outer-stroke-color: @null; - -unico-inner-stroke-color: alpha (@border_color, 0.5); - -unico-inner-stroke-width: 0; -} +@import url("resource:///org/gnome/adwaita/gtk-main.css"); -@import url("button.css"); -@import url("progressbar.css"); +#@import url("progressbar.css"); @import url("scale.css"); @import url("entry.css"); -@import url("radio.css"); -@import url("check.css"); -@import url("scrollbar.css"); +#@import url("radio.css"); +#@import url("check.css"); +#@import url("scrollbar.css"); @import url("menu.css"); -@import url("spinbutton.css"); -@import url("notebook.css"); -@import url("switch.css"); -@import url("workaround.css"); -@import url("nautilus.css"); +#@import url("spinbutton.css"); +#@import url("notebook.css"); +#@import url("switch.css"); +#@import url("workaround.css"); +#@import url("nautilus.css"); @import url("toolbar.css"); diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css~ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css~ new file mode 100644 index 0000000..a6f8c91 --- /dev/null +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.css~ @@ -0,0 +1,15 @@ +@import url("resource:///org/gnome/adwaita/gtk-main.css"); + +#@import url("progressbar.css"); +@import url("scale.css"); +@import url("entry.css"); +#@import url("radio.css"); +#@import url("check.css"); +#@import url("scrollbar.css"); +@import url("menu.css"); +#@import url("spinbutton.css"); +#@import url("notebook.css"); +#@import url("switch.css"); +#@import url("workaround.css"); +#@import url("nautilus.css"); +@import url("toolbar.css"); diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.gresource b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.gresource new file mode 100644 index 0000000..2b2b81e Binary files /dev/null and b/usr/share/themes/Lubuntu-default/gtk-3.0/gtk.gresource differ diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/menu.css b/usr/share/themes/Lubuntu-default/gtk-3.0/menu.css index a42809d..36129cc 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/menu.css +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/menu.css @@ -4,6 +4,7 @@ .menubar { -GtkWidget-window-dragging: true; + -window-dragging: true; } .menuitem { diff --git a/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini b/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini index f35b7b1..9ef3ed9 100644 --- a/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini +++ b/usr/share/themes/Lubuntu-default/gtk-3.0/settings.ini @@ -1,2 +1,3 @@ [Settings] -gtk-auto-mnemonics = 1 +gtk-color-scheme = "base_color:#333333\nbg_color:#e0e0e0\ntooltip_bg_color:#E3F1FF\nselected_bg_color:#8FB2CF\ntext_color:#333333\nfg_color:#333333;\ntooltip_fg_color:#333333\nselected_fg_color:#333333"gtk-auto-mnemonics = 1 +gtk-visible-focus = automatic