merge after backout

Brli · Nov 20, 2008 · cc542ef · cc542ef
2 parents 204df64 + 27252d7
commit cc542ef
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 33 deletions.
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
@@ -47,8 +47,11 @@
 
 <?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 <?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
+
 <?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> 
 
+<?xml-stylesheet href="chrome://global/skin/toolbar.css" type="text/css"?>
+
 <?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/baseMenuOverlay.xul"?>
 <?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?>

diff --git a/toolkit/content/editMenuOverlay.xul b/toolkit/content/editMenuOverlay.xul
@@ -1,4 +1,6 @@
 <?xml version="1.0"?> <!-- -*- Mode: HTML -*- --> 
+<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
+
 <!DOCTYPE overlay SYSTEM "chrome://global/locale/editMenuOverlay.dtd">
 
 <overlay id="editMenuOverlay"

diff --git a/toolkit/themes/gnomestripe/global/toolbar.css b/toolkit/themes/gnomestripe/global/toolbar.css
@@ -82,6 +82,19 @@ toolbarspacer {
   width: 15px;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 0 !important;
+  margin: 3px 5px !important;
+}
+
 /* ::::: toolbarpaletteitem ::::: */
 
 toolbarpaletteitem {

diff --git a/toolkit/themes/gnomestripe/global/toolbarbutton.css b/toolkit/themes/gnomestripe/global/toolbarbutton.css
@@ -162,16 +162,3 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
   list-style-image: none;
   -moz-image-region: auto;
 }
-
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}
diff --git a/toolkit/themes/pinstripe/global/toolbar.css b/toolkit/themes/pinstripe/global/toolbar.css
@@ -69,6 +69,14 @@ menubar {
  min-width: 1px;
 }  
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
 /* ::::: toolbarseparator ::::: */
 
 toolbarseparator {

diff --git a/toolkit/themes/pinstripe/global/toolbarbutton.css b/toolkit/themes/pinstripe/global/toolbarbutton.css
@@ -155,10 +155,3 @@ toolbarbutton.tabbable {
   -moz-user-focus: normal !important;
 }
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
diff --git a/toolkit/themes/winstripe/global/toolbar.css b/toolkit/themes/winstripe/global/toolbar.css
@@ -70,6 +70,19 @@ toolbar:first-child, menubar {
   border-top: 0px !important;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-text {
+  padding: 0 !important;
+  margin: 3px 5px !important;
+}
+
 /* ::::: toolbar decorations ::::: */
 
 toolbarseparator {

diff --git a/toolkit/themes/winstripe/global/toolbarbutton.css b/toolkit/themes/winstripe/global/toolbarbutton.css
@@ -173,16 +173,3 @@ toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
 .toolbarbutton-menubutton-dropmarker[disabled="true"] {
   padding: 3px !important;
 }
-
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-text {
-  padding: 0 !important;
-  margin: 3px 5px !important;
-}