Merge branch 'master' of git://git.draconx.com/fvwmconf

diff --git a/common/nickstheme b/common/nickstheme
index 2205a1b261da160d09018bec28c477bafbf695b5..817a5a0509c410dfab651f8542494f28b277c857 100644 (file)
--- a/common/nickstheme
+++ b/common/nickstheme
@@ -45,8 +45,7 @@ Colorset 1 fg gray30, bg gray
 
 # Normal menu colours - black on pale gray
 Colorset 3 fg black, bg #ede9e3
-#Colorset 8 fg gray30, bg gray, TiledPixmap titlebar.png
-Colorset 8 Pixmap titlebar.png, fg gray20, bg gray90
+Colorset 8 Pixmap menubar.png, fg gray20, bg gray90
 
 # Focused window / highlighted menu colours - white on dull blue.
 Colorset 2 fg white, bg #567ea2
@@ -64,11 +63,10 @@ MenuStyle * TitleFont 'xft:M+1P+IPAG:Bold:size=8:minspace=true:rgba=rgb:antialia
 
 MenuStyle * HilightBack, HilightTitleBack, Hilight3DOff
 MenuStyle * TrianglesSolid, TrianglesUseFore, TitleUnderlines1
-MenuStyle * SeparatorsLong, BorderWidth 1, VerticalItemSpacing 2 2
+MenuStyle * SeparatorsLong, BorderWidth 1
 MenuStyle * ItemFormat "%.3s%.2|%2.4i%.5l%.5l%.5r%.5i%2.3>%1|"
-MenuStyle * MenuColorset 3
-MenuStyle * ActiveColorset 4
-MenuStyle * TitleColorset 8
+MenuStyle * MenuColorset 3, ActiveColorset 4, TitleColorset 8
+MenuStyle * VerticalTitleSpacing 3 2, VerticalItemSpacing 2 2
 
 # Buttons: menu iconify maximize --title-- shade close
 Mouse 1 1 N Menu MenuWindow

diff --git a/pixmaps/menubar.png b/pixmaps/menubar.png
new file mode 100644 (file)
index 0000000..b170385
Binary files /dev/null and b/pixmaps/menubar.png differ