Bug 585007 - Share a list of primary toolbarbuttons for use across themes. r=gavin a=gavin

--HG--
extra : rebase_source : 91e795afcefa01a1c5761c5ee326e4a9c85f760d
This commit is contained in:
Dão Gottwald 2010-08-23 23:35:34 +02:00
parent 2f9747f146
commit be8bda2307
5 changed files with 11 additions and 6 deletions

View File

@ -1115,6 +1115,9 @@
<toolbarpalette id="BrowserToolbarPalette">
# Update primaryToolbarButtons in browser/themes/browserShared.inc when adding
# or removing default items with the toolbarbutton-1 class.
<toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
label="&printButton.label;" command="cmd_print"
tooltiptext="&printButton.tooltip;"/>

View File

@ -0,0 +1,3 @@
%filter substitution
%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #history-button, #bookmarks-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button

View File

@ -48,6 +48,8 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
%include ../../browserShared.inc
#menubar-items {
-moz-box-orient: vertical; /* for flex hack */
}

View File

@ -1,3 +1,4 @@
%include ../../../../toolkit/themes/pinstripe/global/shared.inc
%include ../../browserShared.inc
%define hudButton -moz-appearance: none; background: url("chrome://browser/skin/hud-style-button-middle-background.png") repeat-x #464646 center center; border: 3px solid; -moz-border-top-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4); -moz-border-right-colors: rgba(53,53,53,1) rgba(53,53,53,1) rgba(162,162,162,1); -moz-border-bottom-colors: rgba(128,128,128,0.35) rgba(0,0,0,0.5) rgba(255,255,255,0.15); -moz-border-left-colors: rgba(0,0,0,0.35) rgba(26,26,26,0.5) rgba(255,255,255,0.4); -moz-border-radius: 20px; color: #fff;

View File

@ -46,6 +46,7 @@
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
%include ../../browserShared.inc
%filter substitution
%define toolbarHighlight rgba(255,255,255,.5)
%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.25) rgba(0,0,0,.32) rgba(0,0,0,.37);
@ -530,12 +531,7 @@ toolbar[iconsize="small"] .toolbarbutton-1 > .toolbarbutton-icon {
/* Default icons have a built-in glow, so they are 18*18px even in small mode,
except for the large back icon, which is why the code below uses 'auto' rather
than 18px. This will pick the correct size based on the image region. */
:-moz-any(
#back-button, #forward-button, #reload-button, #stop-button,
#home-button, #print-button, #downloads-button, #history-button,
#bookmarks-button, #bookmarks-menu-button, #new-tab-button,
#new-window-button, #cut-button, #copy-button, #paste-button,
#fullscreen-button) > .toolbarbutton-icon {
:-moz-any(@primaryToolbarButtons@) > .toolbarbutton-icon {
margin: 0 !important;
width: auto !important;
height: auto !important;