342515 [Pinstripe] Use better font and spacing in menus/menuitems. Patch and icons by Stefan <stefanh@bluebottle.com>. r=me r=mano

git-svn-id: svn://10.0.0.236/trunk@203076 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/toolkit/themes/pinstripe/global/jar.mn

@@ -132,6 +132,10 @@ classic.jar:
 +  skin/classic/global/menulist/menulist-arrow.gif                    (menulist/menulist-arrow.gif)
 +  skin/classic/global/scale/scale-tray-horiz.gif                     (scale/scale-tray-horiz.gif)
 +  skin/classic/global/scale/scale-tray-vert.gif                      (scale/scale-tray-vert.gif)
++  skin/classic/global/scrollbox/autorepeat-arrow-dn.gif              (scrollbox/autorepeat-arrow-dn.gif)
++  skin/classic/global/scrollbox/autorepeat-arrow-dn-dis.gif          (scrollbox/autorepeat-arrow-dn-dis.gif)
++  skin/classic/global/scrollbox/autorepeat-arrow-up.gif              (scrollbox/autorepeat-arrow-up.gif)
++  skin/classic/global/scrollbox/autorepeat-arrow-up-dis.gif          (scrollbox/autorepeat-arrow-up-dis.gif)
 +  skin/classic/global/splitter/dimple.png                            (splitter/dimple.png)
 +  skin/classic/global/tabDragDrop/tabDragIndicator.png               (tabDragDrop/tabDragIndicator.png)
 +  skin/classic/global/toolbar/Lighten.png                            (toolbar/Lighten.png)

mozilla/toolkit/themes/pinstripe/global/menu.css

@@ -64,14 +64,13 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 /* ..... internal content .... */
 
 .menu-text,
-.menu-iconic-left,
 .menu-iconic-text {
   margin: 0px 4px 0px 0px !important;
   color: inherit;
 }
 
 .menu-text {
-  margin-left: 13px !important;
+  margin-left: 18px !important;
   font-weight: inherit;
 }
 
@@ -83,19 +82,31 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
 
 .menu-accel,
 .menu-iconic-accel {
-  margin: 0px 2px 0px 7px !important;
-  padding-right: 3px;
+  margin: 0px 2px 0px 2px !important;
+  padding-right: 10px;
   color: inherit;
 }
 
 .menu-iconic-left {
-  width: 16px;
+  margin: 1px 4px 1px 18px !important;
+  color: inherit;
 }
 
+.menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+  list-style-image: inherit;
+}
+
+menuitem[type="checkbox"] > .menu-iconic-left,
+menuitem[type="radio"] > .menu-iconic-left {
+  margin: 0 2px 0 0 !important;
+ }
+
 /* ..... menu arrow box ..... */
 
 .menu-right {
-  margin: 0px 0px 0px 6px;
+  margin: 0px 8px 0px 6px;
   width: 8px;
   list-style-image: url("chrome://global/skin/menu/menu-arrow.gif");
   -moz-image-region: auto;
@@ -111,6 +122,19 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   -moz-image-region: auto;
 }
 
+/* ::::: menu/menuitems in menubar ::::: */
+
+menubar > menu {
+  -moz-appearance: none !important;
+  padding: 2px 5px 2px 7px;
+  margin: 1px 0px 1px 0px;
+}
+
+menubar > menu[_moz-menuactive="true"][open="true"] {
+  -moz-appearance: menuitem !important;
+  color: -moz-mac-menutextselect !important
+}
+
 /* ..... internal content .... */
 
 .menubar-left {
@@ -129,7 +153,7 @@ menupopup > menu,
 popup > menu,
 menupopup > menuitem,
 popup > menuitem {
-  padding: 0px 8px 2px 8px !important;
+  padding: 0px 3px 2px 3px !important;
   max-width: 42em;
   min-height: 19px;
 }
@@ -157,15 +181,10 @@ menulist > menupopup > menu {
 menulist > menupopup > menuitem > .menu-iconic-left,
 .menulist-menupopup > menu > .menu-iconic-left,
 menulist > menupopup > menu > .menu-iconic-left {
-  padding: 0px;
-  margin: 0px;
+  margin: 0 2px 0 0 !important;
 }
 
-menulist > menupopup > menuitem[_moz-menuactive="true"] {
-  /* border: 1px dotted #F5DB95; */
-}
-
-/* ::::: checkbox menuitem ::::: */
+/* ::::: checked menuitems ::::: */
 
 menuitem[checked="true"], 
 menulist > menupopup > menuitem[selected="true"],
@@ -186,13 +205,11 @@ menulist > menupopup > menuitem[_moz-menuactive="true"][selected="true"]:not([di
   -moz-image-region: auto;
 }
 
-/* ::::: radio menuitem ::::: */
-
 /* ::::: menuseparator ::::: */
 
 menuseparator {
-  margin: 6px 1px 4px 1px;
-  padding: 1px !important;
+  margin: 5px 0 4px 0;
+  padding: 1px 0 !important;
   border-top: 1px solid #d9d9d9;
 }
 

mozilla/toolkit/themes/pinstripe/global/menulist.css

@@ -49,7 +49,7 @@
 menulist {
   -moz-appearance: menulist;
   margin: 2px 4px;
-  height: 20px !important;
+  min-height: 20px !important;
 }
 
 .menulist-label-box {

mozilla/toolkit/themes/pinstripe/global/scrollbox.css

@@ -31,26 +31,44 @@
   }
 
 /* Vertical enabled */
-.autorepeatbutton-up,
+.autorepeatbutton-up
+ {
+   list-style-image      : url("chrome://global/skin/scrollbox/autorepeat-arrow-up.gif");
+   padding-bottom: 5px;
+ }
+
+.autorepeatbutton-down
+ {
+   list-style-image     : url("chrome://global/skin/scrollbox/autorepeat-arrow-dn.gif");
+   padding-top: 5px;
+ }
+
 .scrollbutton-up
  {
    list-style-image      : url("chrome://global/skin/arrow/arrow-up-sharp.gif");
  }
- 
-.autorepeatbutton-down,
+
 .scrollbutton-down
   {
     list-style-image     : url("chrome://global/skin/arrow/arrow-dn-sharp.gif");
   }
 
 /* Vertical disabled */
-.autorepeatbutton-up[disabled="true"],
+.autorepeatbutton-up[disabled="true"]
+ {
+   list-style-image      : url("chrome://global/skin/scrollbox/autorepeat-arrow-up-dis.gif");
+ }
+
+.autorepeatbutton-down[disabled="true"]
+ {
+   list-style-image      : url("chrome://global/skin/scrollbox/autorepeat-arrow-dn-dis.gif");
+ }
+
 .scrollbutton-up[disabled="true"]
  {
    list-style-image      : url("chrome://global/skin/arrow/arrow-up-dis.gif");
  }
- 
-.autorepeatbutton-down[disabled="true"],
+
 .scrollbutton-down[disabled="true"]
   {
     list-style-image     : url("chrome://global/skin/arrow/arrow-dn-dis.gif");
@@ -61,6 +79,6 @@ autorepeatbutton
   {
     -moz-box-align       : center;
     -moz-box-pack        : center;
-    margin               : 1px 2px 2px 1px;
-    padding              : 4px;
+    padding: 1px;
+    margin: 1px 2px;
   }

mozilla/toolkit/themes/pinstripe/global/toolbar.css

@@ -52,8 +52,7 @@ toolbox {
 /* ::::: toolbar & menubar ::::: */
 
 toolbar,
-toolbarpalette,
-menubar {
+toolbarpalette {
   min-width: 1px;
   min-height: 20px !important;
   color: #000000;
@@ -61,6 +60,10 @@ menubar {
   background: url("chrome://global/skin/toolbar/toolbar-pinstripe-overlay.png") repeat;
 }
 
+menubar {
+  -moz-appearance: toolbar;
+  min-width: 1px;
+}
 
 .toolbar-holder {
  min-width: 1px;