Bug 404229 - Make toolbarbuttons aware of toolbar mode. r=gavin a=beltzner
authorRyan Flint <rflint@ryanflint.com>
Wed, 19 Nov 2008 00:45:14 -0500
changeset 21821 2686d82a880c
parent 21820 ef058e392023
child 21822 964ca72afb55
child 21843 da2f2a61757b
push id3696
push userrflint@ryanflint.com
push date2008-11-19 05:47 +0000
treeherdermozilla-central@2686d82a880c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin, beltzner
bugs404229
milestone1.9.1b2pre
Bug 404229 - Make toolbarbuttons aware of toolbar mode. r=gavin a=beltzner
browser/base/content/browser.xul
toolkit/content/editMenuOverlay.xul
toolkit/themes/gnomestripe/global/toolbar.css
toolkit/themes/gnomestripe/global/toolbarbutton.css
toolkit/themes/pinstripe/global/toolbar.css
toolkit/themes/pinstripe/global/toolbarbutton.css
toolkit/themes/winstripe/global/toolbar.css
toolkit/themes/winstripe/global/toolbarbutton.css
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -42,21 +42,18 @@
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
 <?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"?>
 
 # All DTD information is stored in a separate file so that it can be shared by
 # hiddenWindow.xul.
 #include browser-doctype.inc
 
--- a/toolkit/content/editMenuOverlay.xul
+++ b/toolkit/content/editMenuOverlay.xul
@@ -1,11 +1,9 @@
 <?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"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/javascript" src="chrome://global/content/editMenuOverlay.js"/>
 
   <commandset id="editMenuCommands">
--- a/toolkit/themes/gnomestripe/global/toolbar.css
+++ b/toolkit/themes/gnomestripe/global/toolbar.css
@@ -77,29 +77,16 @@ toolbarseparator {
   border: 0;
   min-width: 2px;
 }
 
 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 {
   cursor: -moz-grab;
 }
 
 .toolbarpaletteitem-box[type="spacer"],
 .toolbarpaletteitem-box[type="spring"] {
--- a/toolkit/themes/gnomestripe/global/toolbarbutton.css
+++ b/toolkit/themes/gnomestripe/global/toolbarbutton.css
@@ -157,8 +157,21 @@ toolbarbutton[type="menu-button"][disabl
 .toolbarbutton-menubutton-dropmarker {
   border: none !important;
   background-color: transparent !important;
   padding: 3px;
   -moz-appearance: toolbarbutton-dropdown !important;
   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;
+}
--- a/toolkit/themes/pinstripe/global/toolbar.css
+++ b/toolkit/themes/pinstripe/global/toolbar.css
@@ -64,24 +64,16 @@ menubar {
   -moz-appearance: toolbar;
   min-width: 1px;
 }
 
 .toolbar-holder {
  min-width: 1px;
 }  
 
-toolbar[mode="icons"] .toolbarbutton-text {
-  display: none;
-}
-
-toolbar[mode="text"] .toolbarbutton-icon {
-  display: none;
-}
-
 /* ::::: toolbarseparator ::::: */
 
 toolbarseparator {
   -moz-appearance       : none;
   margin: 3px 4px 3px 4px;
   background: url("chrome://global/skin/toolbar/toolbar-separator.png") transparent repeat-y;
   
   padding: 0px;
--- a/toolkit/themes/pinstripe/global/toolbarbutton.css
+++ b/toolkit/themes/pinstripe/global/toolbarbutton.css
@@ -150,8 +150,15 @@ toolbarbutton[type="menu-button"][disabl
   list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png") !important;
   padding: 0 !important;
 }
 
 toolbarbutton.tabbable {
   -moz-user-focus: normal !important;
 }
 
+toolbar[mode="icons"] .toolbarbutton-text {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
--- a/toolkit/themes/winstripe/global/toolbar.css
+++ b/toolkit/themes/winstripe/global/toolbar.css
@@ -65,29 +65,16 @@ toolbar {
 }
 
 toolbar:first-child, menubar {
   min-width: 1px;
   border-bottom: 1px solid ThreeDShadow;
   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 {
   -moz-appearance: separator;
   border-top: 2px solid transparent;
   border-bottom: 2px solid transparent;
   border-left: 3px solid transparent;
   border-right: 3px solid transparent;
--- a/toolkit/themes/winstripe/global/toolbarbutton.css
+++ b/toolkit/themes/winstripe/global/toolbarbutton.css
@@ -168,8 +168,21 @@ toolbarbutton[type="menu-button"][disabl
   border: none !important;
   background-color: transparent !important;
   width: auto;
 }
 
 .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;
+}