[svn-upgrade] Integrating new upstream version, ion3 (20070203)

[ion3.git] / etc / lookcommon_clean.lua

diff --git a/etc/lookcommon_clean.lua b/etc/lookcommon_clean.lua
index cfb059ad7ab70cc50662597fb0d812cb4c1f9ae8..de0efa2323e29f2749b660dab4e1b9700d3f19ed 100644 (file)
--- a/etc/lookcommon_clean.lua
+++ b/etc/lookcommon_clean.lua
@@ -20,20 +20,31 @@ de.defstyle("stdisp", {
 
 de.defstyle("actnotify", {
     based_on = "*",
-    shadow_colour = "#e0c0c0",
-    highlight_colour = "#e0c0c0",
-    background_colour = "#990000",
+    shadow_colour = "#c04040",
+    highlight_colour = "#c04040",
+    background_colour = "#901010",
     foreground_colour = "#eeeeee",
 })
 
 de.defstyle("tab-frame", {
     based_on = "tab",
-    de.substyle("*-*-*-*-activity", {
-        shadow_colour = "#e0c0c0",
-        highlight_colour = "#e0c0c0",
-        background_colour = "#990000",
+    -- TODO: some kind of amend option. It should not be necessary to 
+    -- duplicate this definition for both tab-frame and tab-menuentry,
+    -- or for each style, nor use more complex hacks to communicate
+    -- this stuff otherwise.
+    de.substyle("*-*-*-unselected-activity", {
+        shadow_colour = "#c04040",
+        highlight_colour = "#c04040",
+        background_colour = "#901010",
         foreground_colour = "#eeeeee",
     }),
+    
+    de.substyle("*-*-*-selected-activity", {
+        shadow_colour = "#c04040",
+        highlight_colour = "#c04040",
+        background_colour = "#b03030",
+        foreground_colour = "#ffffff",
+    }),
 })
 
 de.defstyle("tab-frame-tiled", {
@@ -41,11 +52,40 @@ de.defstyle("tab-frame-tiled", {
     spacing = 1,
 })
 
+de.defstyle("tab-menuentry", {
+    based_on = "tab",
+    text_align = "left",
+    
+    de.substyle("*-*-*-unselected-activity", {
+        shadow_colour = "#c04040",
+        highlight_colour = "#c04040",
+        background_colour = "#901010",
+        foreground_colour = "#eeeeee",
+    }),
+    
+    de.substyle("*-*-*-selected-activity", {
+        shadow_colour = "#c04040",
+        highlight_colour = "#c04040",
+        background_colour = "#b03030",
+        foreground_colour = "#ffffff",
+    }),
+})
+
+de.defstyle("frame", {
+    based_on = "*",
+    background_colour = "#000000",
+    transparent_background = false,
+    de.substyle("quasiactive", {
+        -- Something detached from the frame is active
+        padding_colour = "#901010",
+    }),
+})
+
 de.defstyle("frame-tiled", {
     based_on = "frame",
     shadow_pixels = 0,
     highlight_pixels = 0,
-    padding_pixels = 0,
+    padding_pixels = 1,
     spacing = 1,
 })
 
@@ -56,5 +96,6 @@ de.defstyle("frame-tiled-alt", {
 
 de.defstyle("frame-floating", {
     based_on = "frame",
-    bar = "shaped"
+    bar = "shaped",
+    padding_pixels = 0,
 })