From 51170324553bc55b861c2e96eea53d9645ae6020 Mon Sep 17 00:00:00 2001 From: Rafael Laguna Date: Tue, 26 May 2015 21:14:46 +0200 Subject: [PATCH] fix bug #1362555 --- .../gtk-2.0/apps/lubuntu_lxpanel.rc | 4 +- .../gtk-2.0/images/arrow-down.png | Bin 0 -> 373 bytes .../gtk-2.0/images/handle-v.png | Bin 0 -> 142 bytes .../Lubuntu-dark-panel/xfce-notify-4.0/gtkrc | 38 +++---- .../gtk-2.0/apps/gnome-panel.css | 97 ------------------ .../gtk-2.0/apps/lubuntu_lxpanel.rc | 6 +- .../themes/Lubuntu-default/gtk-2.0/gtkrc | 6 +- .../gtk-2.0/images/handle-v.png | Bin 0 -> 142 bytes .../Lubuntu-default/xfce-notify-4.0/gtkrc | 38 +++---- 9 files changed, 34 insertions(+), 155 deletions(-) create mode 100644 src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/arrow-down.png create mode 100644 src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/handle-v.png delete mode 100644 src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-panel.css create mode 100644 src/usr/share/themes/Lubuntu-default/gtk-2.0/images/handle-v.png diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_lxpanel.rc b/src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_lxpanel.rc index f2c50f9..db84add 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_lxpanel.rc +++ b/src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_lxpanel.rc @@ -98,8 +98,8 @@ widget "*indicator-applet*" style "theme-panel" class "PanelApp*" style "theme-panel" class "PanelToplevel*" style "theme-panel" widget_class "*PanelToplevel*" style "theme-panel" -widget_class "*notif*" style "theme-panel" -widget_class "*Notif*" style "theme-panel" +#widget_class "*notif*" style "theme-panel" +#widget_class "*Notif*" style "theme-panel" widget_class "*Tray*" style "theme-panel" widget_class "*tray*" style "theme-panel" widget_class "*computertemp*" style "theme-panel" diff --git a/src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/arrow-down.png b/src/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/images/arrow-down.png new file mode 100644 index 0000000000000000000000000000000000000000..6b9c03d3fd6c509d4a8450e7849141b51dd7e9c4 GIT binary patch literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^{6H+g!3HExhN-duDYhhUcNd2LAh=-f^2tCE&H|6f zVg?4j!ywFfJby(BP>{XE)7O>#8oLamu2vNPjMWSbj7**`jv*T7lVi4)@Gf4F%}28J29*~C-V}>VN3FMcVYMs zf(!O8p9~b?EbxddW?%URLeMvfsuRBTzQ}jgQu&X%Q~loCIFlcAjbdz literal 0 HcmV?d00001 diff --git a/src/usr/share/themes/Lubuntu-dark-panel/xfce-notify-4.0/gtkrc b/src/usr/share/themes/Lubuntu-dark-panel/xfce-notify-4.0/gtkrc index 2af50e3..fee3966 100644 --- a/src/usr/share/themes/Lubuntu-dark-panel/xfce-notify-4.0/gtkrc +++ b/src/usr/share/themes/Lubuntu-dark-panel/xfce-notify-4.0/gtkrc @@ -1,38 +1,27 @@ style "notify-window" { XfceNotifyWindow::summary-bold = 1 - XfceNotifyWindow::border-color = "#555" - XfceNotifyWindow::border-color-hover = "#555" - XfceNotifyWindow::border-radius = 7.0 - XfceNotifyWindow::border-width = 0 - XfceNotifyWindow::border-width-hover = 0 - bg[NORMAL] = "#555" + XfceNotifyWindow::border-color = "#ffffff" + XfceNotifyWindow::border-radius = 10.0 + XfceNotifyWindow::border-width = 0.0 + bg[NORMAL] = "#111" } style "notify-button" { - bg[NORMAL] = "#555" - bg[PRELIGHT] = "#555" - bg[ACTIVE] = "#555" - fg[NORMAL] = "#555" - fg[PRELIGHT] = "#555" + bg[NORMAL] = "#202020" + bg[PRELIGHT] = "#404040" + fg[NORMAL] = "#ffffff" + fg[PRELIGHT] = "#ffffff" engine "murrine" { - border_shades = { 2.9, 2.6 } - shadow_shades = {2.4,2.4} - roundness = 3 + roundness = 4 } } style "notify-text" { - fg[NORMAL] = "#fff" - fg[PRELIGHT] = "#fff" - GtkWidget::link-color = "#bbb" -} - -style "notify-summary" -{ - font_name = "Bold" + fg[NORMAL] = "#ffffff" + GtkWidget::link-color = "#a7a7a7" } style "notify-progressbar" @@ -41,8 +30,8 @@ style "notify-progressbar" ythickness = 1 fg[PRELIGHT] = "#000000" - bg[NORMAL] = "#ddd" - bg[SELECTED] = "#ddd" + bg[NORMAL] = "#dbdbdb" + bg[SELECTED] = "#dbdbdb" engine "murrine" { gradient_shades = {1.1,0.95,1.1,0.85} @@ -53,7 +42,6 @@ style "notify-progressbar" } class "XfceNotifyWindow" style "notify-window" -widget "XfceNotifyWindow.*.summary" style "notify-summary" widget_class "XfceNotifyWindow.*" style "notify-button" widget_class "XfceNotifyWindow.*." style "notify-text" widget_class "XfceNotifyWindow.*." style "notify-progressbar" diff --git a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-panel.css b/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-panel.css deleted file mode 100644 index 6538eba..0000000 --- a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/gnome-panel.css +++ /dev/null @@ -1,97 +0,0 @@ -/* Fallback Mode Panel */ -PanelWidget :backdrop, -PanelApplet :backdrop, -PanelToplevel :backdrop, -PanelWidget, -PanelApplet, -PanelToplevel { - border-image: none; - - color: @dark_fg_color; -} - -PanelWidget, -PanelApplet, -PanelToplevel { - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.15)), - to (shade (@dark_bg_color, 0.95))); -} - -PanelApplet { - border-width: 0; -} - -PanelSeparator:backdrop, -PanelSeparator { - border-width: 0; - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.15)), - to (shade (@dark_bg_color, 0.95))); - - color: @dark_fg_color; -} - -.gnome-panel-menu-bar, -PanelApplet > GtkMenuBar.menubar, -PanelApplet > GtkMenuBar.menubar.menuitem, -PanelMenuBar.menubar, -PanelMenuBar.menubar.menuitem { - -PanelMenuBar-icon-visible: true; - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.15)), - to (shade (@dark_bg_color, 0.95))); -} - -PanelAppletFrame { - background-color: @dark_bg_color; - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.15)), - to (shade (@dark_bg_color, 0.95))); - border-width: 0; -} - -PanelApplet .button:backdrop, -PanelApplet .button { - -GtkButton-inner-border: 2; - - border-image: none; - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.15)), - to (shade (@dark_bg_color, 0.95))); - border-color: alpha (shade (@dark_bg_color, 0.9), 0.6); - border-left-color: alpha (shade (@dark_bg_color, 1.2), 0.6); - border-radius: 0; - border-width: 0 1px 0 1px; - - text-shadow: none; -} - -PanelApplet .button:active:prelight:backdrop, -PanelApplet .button:active:prelight, -PanelApplet .button:active:backdrop, -PanelApplet .button:active { - border-image: none; - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 0.7)), - to (shade (@dark_bg_color, 0.8))); - border-color: shade (@dark_bg_color, 0.7); -} - -PanelApplet .button:prelight:backdrop, -PanelApplet .button:prelight { - border-image: none; - background-image: -gtk-gradient (linear, left top, left bottom, - from (shade (@dark_bg_color, 1.3)), - to (shade (@dark_bg_color, 1.1))); - border-color: alpha (shade (@dark_bg_color, 0.9), 0.6); - border-left-color: alpha (shade (@dark_bg_color, 1.2), 0.8); -} - -ClockBox { - text-shadow: 0 1px shade (@dark_bg_color, 1.08); -} - -WnckPager, WnckTasklist { - background-color: @dark_bg_color; -} diff --git a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc b/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc index f754140..6ff39f4 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_lxpanel.rc +++ b/src/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" @@ -98,8 +98,8 @@ widget "*indicator-applet*" style "theme-panel" class "PanelApp*" style "theme-panel" class "PanelToplevel*" style "theme-panel" widget_class "*PanelToplevel*" style "theme-panel" -widget_class "*notif*" style "theme-panel" -widget_class "*Notif*" style "theme-panel" +# widget_class "*notif*" style "theme-panel" +# widget_class "*Notif*" style "theme-panel" widget_class "*Tray*" style "theme-panel" widget_class "*tray*" style "theme-panel" widget_class "*computertemp*" style "theme-panel" diff --git a/src/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc b/src/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc index d875311..e9bc9de 100644 --- a/src/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc +++ b/src/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc @@ -283,7 +283,7 @@ style "comboboxentry" = "notebook_button" { style "menubar" = "dark" { # those two lines were added to fix firefox's menubar item text - bg[SELECTED] = "#ece7e2" + bg[SELECTED] = @bg_color fg[SELECTED] = @fg_color engine "murrine" { @@ -335,7 +335,7 @@ style "menu_item" = "menu" { } style "menubar_item" = "menu_item" { - bg[PRELIGHT] = "#ece7e2" + bg[PRELIGHT] = @bg_color fg[PRELIGHT] = @fg_color engine "murrine" { @@ -679,7 +679,7 @@ include "apps/lubuntu_scrollbar.rc" include "apps/pcmanfm.rc" # XFCE specific -include "apps/xfce4-notifyd.rc" +#include "apps/xfce4-notifyd.rc" include "apps/thunar.rc" # MATE specific diff --git a/src/usr/share/themes/Lubuntu-default/gtk-2.0/images/handle-v.png b/src/usr/share/themes/Lubuntu-default/gtk-2.0/images/handle-v.png new file mode 100644 index 0000000000000000000000000000000000000000..6e8eba142f44bf74cce6a0a9ffc82534b916ec93 GIT binary patch literal 142 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4F%}28J29*~C-V}>VN3FMcVYMs zf(!O8p9~b?EbxddW?%URLeMvfsuRBTzQ}jgQu&X%Q~loCIFlcAjbdz literal 0 HcmV?d00001 diff --git a/src/usr/share/themes/Lubuntu-default/xfce-notify-4.0/gtkrc b/src/usr/share/themes/Lubuntu-default/xfce-notify-4.0/gtkrc index 2af50e3..fee3966 100644 --- a/src/usr/share/themes/Lubuntu-default/xfce-notify-4.0/gtkrc +++ b/src/usr/share/themes/Lubuntu-default/xfce-notify-4.0/gtkrc @@ -1,38 +1,27 @@ style "notify-window" { XfceNotifyWindow::summary-bold = 1 - XfceNotifyWindow::border-color = "#555" - XfceNotifyWindow::border-color-hover = "#555" - XfceNotifyWindow::border-radius = 7.0 - XfceNotifyWindow::border-width = 0 - XfceNotifyWindow::border-width-hover = 0 - bg[NORMAL] = "#555" + XfceNotifyWindow::border-color = "#ffffff" + XfceNotifyWindow::border-radius = 10.0 + XfceNotifyWindow::border-width = 0.0 + bg[NORMAL] = "#111" } style "notify-button" { - bg[NORMAL] = "#555" - bg[PRELIGHT] = "#555" - bg[ACTIVE] = "#555" - fg[NORMAL] = "#555" - fg[PRELIGHT] = "#555" + bg[NORMAL] = "#202020" + bg[PRELIGHT] = "#404040" + fg[NORMAL] = "#ffffff" + fg[PRELIGHT] = "#ffffff" engine "murrine" { - border_shades = { 2.9, 2.6 } - shadow_shades = {2.4,2.4} - roundness = 3 + roundness = 4 } } style "notify-text" { - fg[NORMAL] = "#fff" - fg[PRELIGHT] = "#fff" - GtkWidget::link-color = "#bbb" -} - -style "notify-summary" -{ - font_name = "Bold" + fg[NORMAL] = "#ffffff" + GtkWidget::link-color = "#a7a7a7" } style "notify-progressbar" @@ -41,8 +30,8 @@ style "notify-progressbar" ythickness = 1 fg[PRELIGHT] = "#000000" - bg[NORMAL] = "#ddd" - bg[SELECTED] = "#ddd" + bg[NORMAL] = "#dbdbdb" + bg[SELECTED] = "#dbdbdb" engine "murrine" { gradient_shades = {1.1,0.95,1.1,0.85} @@ -53,7 +42,6 @@ style "notify-progressbar" } class "XfceNotifyWindow" style "notify-window" -widget "XfceNotifyWindow.*.summary" style "notify-summary" widget_class "XfceNotifyWindow.*" style "notify-button" widget_class "XfceNotifyWindow.*." style "notify-text" widget_class "XfceNotifyWindow.*." style "notify-progressbar"