bug 414445 - The Back and Forward button have arrows below them in Text mode and custom themes, r=mano

This commit is contained in:
mconnor@steelgryphon.com 2008-03-31 12:36:14 -07:00
parent 5bce60c798
commit e1c929deb8
3 changed files with 2 additions and 47 deletions

View File

@ -237,12 +237,12 @@ function SetClickAndHoldHandlers()
var popup = document.getElementById("back-forward-dropmarker")
.firstChild.cloneNode(true);
var backButton = document.getElementById("back-button");
backButton.setAttribute("type", "menu");
backButton.setAttribute("type", "menu-button");
backButton.appendChild(popup);
_addClickAndHoldListenersOnElement(backButton);
var forwardButton = document.getElementById("forward-button");
popup = popup.cloneNode(true);
forwardButton.setAttribute("type", "menu");
forwardButton.setAttribute("type", "menu-button");
forwardButton.appendChild(popup);
_addClickAndHoldListenersOnElement(forwardButton);
}

View File

@ -271,26 +271,14 @@ menubutton:not([disabled="true"]):hover:active {
color: ButtonText !important;
}
/* set up extended binding for the back & forward buttons */
toolbar:not([mode="text"]) #back-button,
toolbar:not([mode="text"]) #forward-button {
-moz-binding: url(chrome://browser/skin/browser.xml#bf-menu-button);
}
toolbar:not([mode="text"]) #back-button .toolbarbutton-menubutton-button,
toolbar:not([mode="text"]) #forward-button .toolbarbutton-menubutton-button {
-moz-binding: url('chrome://global/content/bindings/toolbarbutton.xml#toolbarbutton-image');
margin: 0;
padding: 0;
border-left: 0;
border-right: 0;
}
toolbar:not([mode="text"]) #back-button .allowevents-box,
toolbar:not([mode="text"]) #forward-button .allowevents-box {
-moz-binding: url(chrome://browser/skin/browser.xml#bf-menu-button-allowevents-box);
}
toolbar:not([mode="text"]) #back-button .toolbarbutton-menubutton-dropmarker,
toolbar:not([mode="text"]) #forward-button .toolbarbutton-menubutton-dropmarker {
margin-top: 1px;

View File

@ -15,39 +15,6 @@
<!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
<binding id="bf-menu-button-allowevents-box"
display="xul:button"
extends="chrome://global/content/bindings/button.xml#button-base">
<content allowevents="true">
<children/>
</content>
</binding>
<binding id="bf-menu-button" extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
<content>
<children includes="observes|template|menupopup|tooltip"/>
<xul:hbox flex="1" class="allowevents-box"/>
<xul:vbox>
<xul:hbox align="center" flex="1">
<xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
anonid="button"
allowevents="true"
flex="1"
align="end"
xbl:inherits="disabled,crop,image,label,accesskey,command,
dir,pack,orient,toolbarmode,buttonstyle"/>
</xul:hbox>
<xul:hbox flex="1" class="toolbarbutton-text-box allowevents-box">
<xul:label class="toolbarbutton-text"
crop="right"
xbl:inherits="value=label,accesskey,crop,toolbarmode,buttonstyle"
flex="1"/>
</xul:hbox>
</xul:vbox>
<xul:hbox flex="1" class="allowevents-box"/>
</content>
</binding>
<binding id="bookmark-left">
<content>
<xul:spacer class="bookmark-image-left" xbl:inherits="selected"/>