some code cleaning

2 files changed, 27 insertions, 27 deletions

diff --git a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
index 98a0b55..67022ba 100644
--- a/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
+++ b/Kogaion-daylight/gtk-2.0/app-styles/panel.rc
@@ -4,11 +4,11 @@ style "pixmap-panel"
 	ythickness = 2
 
 	fg[NORMAL]		= @bg_color
-	fg[PRELIGHT]	= lighter (@selected_bg_color)
+	fg[PRELIGHT]	= shade (1.45, @selected_bg_color)
 	fg[ACTIVE]		= @bg_color
 
 #	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]			= shade (0.70, @window_active_color)
+	bg[NORMAL]       	= shade (0.90, @window_active_color)
 #	bg[ACTIVE]			= @selected_bg_color
 #	bg[PRELIGHT]      	= shade(1.75, @selected_bg_color)
 #	bg[SELECTED]      	= @selected_bg_color
@@ -143,18 +143,18 @@ style "theme-panel-handle"
 }
 
 # XFCE panel theming.
-widget "*Xfce*Panel*"	style "pixmap-panel"
-class "*Xfce*Panel*"	style "pixmap-panel"
+widget "*Xfce*Panel*"				style "pixmap-panel"
+class "*Xfce*Panel*"					style "pixmap-panel"
 
 # Other (MATE) panel
 
-widget "*PanelWidget*"			style "panel-buttons"
-#widget "*PanelApplet*"			style "test"
-widget "*fast-user-switch*"		style "panel-buttons"
-widget "*CPUFreq*Applet*"		style "panel-buttons"
-widget "*indicator-applet*"		style "panel-buttons"
-class "PanelApp*"				style "panel-buttons"
-class "PanelToplevel*"			style "panel-buttons"
+widget "*PanelWidget*"				style "panel-buttons"
+#widget "*PanelApplet*"				style "test"
+widget "*fast-user-switch*"			style "panel-buttons"
+widget "*CPUFreq*Applet*"			style "panel-buttons"
+widget "*indicator-applet*"			style "panel-buttons"
+class "PanelApp*"					style "panel-buttons"
+class "PanelToplevel*"				style "panel-buttons"
 widget_class "*PanelToplevel*"		style "panel-buttons" # pimp here
 
 # widget_class "*notif*"			style "panel-buttons"
@@ -177,11 +177,11 @@ widget_class "*PanelToplevel*"		style "panel-buttons" # pimp here
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text" # pimp here
 widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text" # pimp here
-widget "*.clock-applet-button.*"	style "panel-buttons"
-widget "*PanelApplet*"			style "panel-buttons" # check here, why doubled, looks ok for bottom
+widget "*.clock-applet-button.*"		style "panel-buttons"
+widget "*PanelApplet*"				style "panel-buttons" # check here, why doubled, looks ok for bottom
 
 # Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
+class "PanelAppletFrame" 			style:highest "theme-panel-handle"
 
 # The following removes the arrows from the panel
 
diff --git a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
index 6a784ec..b291f09 100644
--- a/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
+++ b/Kogaion-nighttime/gtk-2.0/app-styles/panel.rc
@@ -8,7 +8,7 @@ style "pixmap-panel"
 	fg[ACTIVE]		= lighter (@fg_color)
 
 #	bg_pixmap[NORMAL] = "/Panel/panel-bg-new.svg" # Disable for normal panel backgrounds.
-	bg[NORMAL]			= @selected_bg_color
+	bg[NORMAL]       	= shade (1.0, @window_active_color)
 #	bg[ACTIVE]			= @selected_bg_color
 #	bg[PRELIGHT]      	= shade(1.75, @selected_bg_color)
 #	bg[SELECTED]      	= @selected_bg_color
@@ -158,18 +158,18 @@ style "theme-panel-handle"
 }
 
 # XFCE panel theming.
-widget "*Xfce*Panel*"	style "pixmap-panel"
-class "*Xfce*Panel*"	style "pixmap-panel"
+widget "*Xfce*Panel*"				style "pixmap-panel"
+class "*Xfce*Panel*"					style "pixmap-panel"
 
 # Other (MATE) panel
 
-widget "*PanelWidget*"			style "panel-buttons"
-# widget "*PanelApplet*"			style "panel-buttons"
-widget "*fast-user-switch*"		style "panel-buttons"
-widget "*CPUFreq*Applet*"		style "panel-buttons"
-widget "*indicator-applet*"		style "panel-buttons"
-class "PanelApp*"			style "panel-buttons"
-class "PanelToplevel*"			style "panel-buttons"
+widget "*PanelWidget*"				style "panel-buttons"
+# widget "*PanelApplet*"				style "panel-buttons"
+widget "*fast-user-switch*"			style "panel-buttons"
+widget "*CPUFreq*Applet*"			style "panel-buttons"
+widget "*indicator-applet*"			style "panel-buttons"
+class "PanelApp*"					style "panel-buttons"
+class "PanelToplevel*"				style "panel-buttons"
 widget_class "*PanelToplevel*"		style "panel-buttons"
 
 # widget_class "*notif*"			style "panel-buttons"
@@ -192,11 +192,11 @@ widget_class "*PanelToplevel*"		style "panel-buttons"
 # Make sure panel text color doesn't change
 widget_class "*Panel*MenuBar*"		style "theme-main-menu-text"
 widget_class "*Panel*<GtkMenuBar>*"	style "theme-main-menu-text"
-widget "*.clock-applet-button.*"	style "panel-buttons"
-widget "*PanelApplet*"			style "panel-buttons"
+widget "*.clock-applet-button.*"		style "panel-buttons"
+widget "*PanelApplet*"				style "panel-buttons"
 
 # Hide ugly handle
-class "PanelAppletFrame" style:highest "theme-panel-handle"
+class "PanelAppletFrame" 			style:highest "theme-panel-handle"
 
 # The following removes the arrows from the panel