From 250e9abed64c0c6269578fee29f30c41472fa8a1 Mon Sep 17 00:00:00 2001
From: "hyatt%netscape.com"
 <hyatt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 17 Jan 2000 11:40:39 +0000
Subject: [PATCH] Skin improvements.

git-svn-id: svn://10.0.0.236/trunk@58010 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/resources/content/navigator.xul   | 16 ++++-----
 .../xpfe/browser/resources/skin/navigator.css | 36 ++-----------------
 2 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 2077847e8cd..b045ece247e 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -226,27 +226,28 @@ Contributor(s): ______________________________________. -->
       // we can get this button into rdf. We can't allow drags on this
       // container so we have to be able to identify it (bug 19588).
       //     - pinkerton
-      <menu id="PersonalMenu" datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" ref="NC:BookmarksRoot">
-        <titledbutton class="bookmarkFolder" align="right" container="true"
+      <menu id="PersonalMenu" datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" 
+            ref="NC:BookmarksRoot">
+        <titledbutton align="right" class="bmenu" container="true"
           value="&bookmarksButton.label;" crop="right"/>
         <template>
           <!-- Recursive rules for nested folders -->
           <rule iscontainer="true">
             <menupopup>
-              <menu uri="rdf:*" crop="right" flex="1" align="left"
+              <menu class="standard" uri="rdf:*" crop="right" flex="1" align="left"
                 value="rdf:http://home.netscape.com/NC-rdf#Name" >
-                <menupopup />
+                <menupopup class="standard"/>
               </menu>
             </menupopup>
           </rule>
           <rule rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
             <menupopup>
-              <menuseparator uri="rdf:*"/>
+              <menuseparator class="standard" uri="rdf:*"/>
             </menupopup>
           </rule>
           <rule>
             <menupopup>
-              <menuitem align="left" uri="..." 
+              <menuitem class="standard" align="left" uri="..." 
                 value="rdf:http://home.netscape.com/NC-rdf#Name"
                 oncommand="OpenBookmarkURL(event.target, document.getElementById('PersonalMenu').database)"/>
             </menupopup>
@@ -257,8 +258,7 @@ Contributor(s): ______________________________________. -->
              builder can hang stuff off of. Failure to add this makes
              it s.t. you need to triple-click (!) to get the bookmarks
              menu to drop down. -->
-        <menupopup/>
-
+        <menupopup class="standard"/>
         <spring class="personaltoolbarspacer" flex="1"/>
       </menu>
 
diff --git a/mozilla/xpfe/browser/resources/skin/navigator.css b/mozilla/xpfe/browser/resources/skin/navigator.css
index 15dda18d835..cdbababa731 100644
--- a/mozilla/xpfe/browser/resources/skin/navigator.css
+++ b/mozilla/xpfe/browser/resources/skin/navigator.css
@@ -135,7 +135,6 @@ titledbutton.bookmarkbutton {
    margin: 0px;
    max-width: 8em;
    font: inherit;
-   font-size: smaller;
    color: #99CCCC;
    border: none;
    padding: 1px;
@@ -154,10 +153,11 @@ titledbutton.bookmarkbutton:active {
    padding-bottom: 0px;
 }
 
-titledbutton.bookmarkFolder {
+titledbutton.bmenu {
    margin: 0px;
    padding: 0px;
    border: none;
+   color: #99cccc;
    list-style-image: url("chrome://global/skin/toolbar-dropdown.gif");
 }
 
@@ -170,38 +170,6 @@ toolbar#PersonalToolbar #personaltoolbar-endcap {
 	background-position: 100% 0%;
 }
 
-toolbar#PersonalToolbar menu {
-  font-size: smaller;
-  color: #99CCCC;
-}
-
-toolbar#PersonalToolbar menuitem {
-  color: #99CCCC;
-}
-
-toolbar#PersonalToolbar menuseparator {
-  border-top: none;
-  margin-left: 6px; 
-  margin-right: 6px;
-  border-bottom: 1px #99CCCC solid; 
-}
-
-toolbar#PersonalToolbar menupopup {
-  color: #99CCCC;
-  background-color: #003366;
-  border: 1px #003366 outset;
-}
-
-toolbar#PersonalToolbar menupopup > menu[menuactive="true"] {
-  color: #003366;
-  background-color: #99CCCC;
-}
-
-toolbar#PersonalToolbar menupopup > menuitem[menuactive="true"] {
-  color: #003366;
-  background-color: #99CCCC;
-}
-
 spring.personaltoolbarspacer {
    max-width: 1em;
    min-width: 0.3em;