From 59acc19fa4e47c918da4228dc95e0e107ec15065 Mon Sep 17 00:00:00 2001
From: "bugzilla%arlen.demon.co.uk" <bugzilla%arlen.demon.co.uk>
Date: Sat, 16 Sep 2006 00:31:19 +0000
Subject: [PATCH] Bug 293207 Icons do not show up in menulist in classic theme
 and menulist is not wide enough in classic/modern theme (classic theme patch)
 p=me r=mnyromyr sr=neil

---
 .../communicator/bookmarks/bookmarksToolbar.css  |  5 +++++
 themes/classic/global/mac/menu.css               |  6 +++---
 themes/classic/global/os2/menu.css               |  7 -------
 themes/classic/global/win/menu.css               | 16 ++++------------
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/themes/classic/communicator/bookmarks/bookmarksToolbar.css b/themes/classic/communicator/bookmarks/bookmarksToolbar.css
index 87f5efc875b..f9c5f6956df 100644
--- a/themes/classic/communicator/bookmarks/bookmarksToolbar.css
+++ b/themes/classic/communicator/bookmarks/bookmarksToolbar.css
@@ -127,6 +127,11 @@ menuitem.bookmark-item {
   margin-top: -1px;
 }
 
+.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+}
+
 .bookmark-group {
   list-style-image: url(chrome://communicator/skin/bookmarks/bookmark-group.gif) !important;
 }
diff --git a/themes/classic/global/mac/menu.css b/themes/classic/global/mac/menu.css
index da195426683..9ecdb2da58b 100644
--- a/themes/classic/global/mac/menu.css
+++ b/themes/classic/global/mac/menu.css
@@ -114,8 +114,8 @@ menuitem[type="radio"] > .menu-iconic-left {
 }
 
 .menu-iconic-icon {
-  width: 16px;
-  height: 16px;
+  min-width: 16px;
+  min-height: 16px;
   list-style-image: inherit;
 }
 
@@ -203,7 +203,7 @@ menuitem[checked="true"][_moz-menuactive="true"] {
 menulist > menupopup > menuitem,
 .menulist-menupopup > menuitem {
   max-width: none;
-  padding-right: 20px;
+  padding-right: 28px;
   font: message-box;
 }
 
diff --git a/themes/classic/global/os2/menu.css b/themes/classic/global/os2/menu.css
index 59e11addabc..1c59f36a322 100644
--- a/themes/classic/global/os2/menu.css
+++ b/themes/classic/global/os2/menu.css
@@ -177,13 +177,6 @@ menulist > menupopup > menu {
   background-color: -moz-Field;
 }
 
-.menulist-menupopup > menuitem > .menu-iconic-left,
-menulist > menupopup > menuitem > .menu-iconic-left,
-.menulist-menupopup > menu > .menu-iconic-left,
-menulist > menupopup > menu > .menu-iconic-left {
-  display: none;
-}
-
 menulist > menupopup > menuitem[_moz-menuactive="true"] {
   border: 1px dotted #F5DB95;
 }
diff --git a/themes/classic/global/win/menu.css b/themes/classic/global/win/menu.css
index 06b9635b35b..0b64d09ff31 100644
--- a/themes/classic/global/win/menu.css
+++ b/themes/classic/global/win/menu.css
@@ -110,10 +110,9 @@ menuitem[_moz-menuactive="true"][disabled="true"] {
   color: inherit;
 }
 
-.menu-iconic-icon {
+menuitem[type="checkbox"] > .menu-iconic-left > .menu-iconic-icon,
+menuitem[type="radio"] > .menu-iconic-left > .menu-iconic-icon {
   width: 16px;
-  height: 16px;
-  list-style-image: inherit;
 }
 
 /* ..... menu arrow box ..... */
@@ -200,19 +199,12 @@ menulist > menupopup > menuitem,
 .menulist-menupopup > menu,
 menulist > menupopup > menu {
   border: 1px solid transparent;
-  padding: 1px 30px 1px 5px;
+  padding: 1px 22px 1px 1px;
   max-width: none;
   font: message-box;
   color: -moz-FieldText;
 }
-    
-.menulist-menupopup > menuitem > .menu-iconic-left,
-menulist > menupopup > menuitem > .menu-iconic-left,
-.menulist-menupopup > menu > .menu-iconic-left,
-menulist > menupopup > menu > .menu-iconic-left {
-  display: none;
-}
-    
+
 menulist > menupopup > menuitem[_moz-menuactive="true"] {
   border: 1px dotted #F5DB95;
 }