зеркало из https://github.com/mozilla/gecko-dev.git
Bug 755598: Merge Back/ Forward/ URLBar/ Stop/ Reload/ Go buttons into 1 toolbaritem. r=dao
This commit is contained in:
Mike de Boer
Родитель
025119ed3e
Коммит
63ca3d2cd2
|
|
@ -94,11 +94,6 @@ let CustomizationHandler = {
|
||||||
let cmd = document.getElementById("cmd_CustomizeToolbars");
|
let cmd = document.getElementById("cmd_CustomizeToolbars");
|
||||||
cmd.removeAttribute("disabled");
|
cmd.removeAttribute("disabled");
|
||||||
|
|
||||||
// make sure to re-enable click-and-hold
|
|
||||||
if (!getBoolPref("ui.click_hold_context_menus", false)) {
|
|
||||||
SetClickAndHoldHandlers();
|
|
||||||
}
|
|
||||||
|
|
||||||
gBrowser.selectedBrowser.focus();
|
gBrowser.selectedBrowser.focus();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -198,14 +198,9 @@ toolbar[overflowable]:not([overflowing]) > .overflow-button {
|
||||||
display: -moz-box;
|
display: -moz-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wrapper-urlbar-container #urlbar-container > #urlbar > toolbarbutton,
|
#wrapper-urlbar-container > #urlbar-container > #urlbar-wrapper > #urlbar > toolbarbutton,
|
||||||
#urlbar-container:not([combined]) > #urlbar > toolbarbutton,
|
|
||||||
#urlbar-container[combined] + #reload-button + #stop-button,
|
|
||||||
#urlbar-container[combined] + #reload-button,
|
|
||||||
#urlbar-reload-button:not([displaystop]) + #urlbar-stop-button,
|
#urlbar-reload-button:not([displaystop]) + #urlbar-stop-button,
|
||||||
#urlbar-reload-button[displaystop],
|
#urlbar-reload-button[displaystop] {
|
||||||
#reload-button:not([displaystop]) + #stop-button,
|
|
||||||
#reload-button[displaystop] {
|
|
||||||
visibility: collapse;
|
visibility: collapse;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -281,7 +276,7 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
#wrapper-urlbar-container > #urlbar-container > #urlbar {
|
#wrapper-urlbar-container > #urlbar-container > #urlbar-wrapper > #urlbar {
|
||||||
-moz-user-input: disabled;
|
-moz-user-input: disabled;
|
||||||
cursor: -moz-grab;
|
cursor: -moz-grab;
|
||||||
}
|
}
|
||||||
|
|
@ -294,9 +289,7 @@ panel[noactions] > richlistbox > richlistitem[type~="action"] > .ac-url-box > .a
|
||||||
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup");
|
-moz-binding: url("chrome://browser/content/urlbarBindings.xml#urlbar-rich-result-popup");
|
||||||
}
|
}
|
||||||
|
|
||||||
#urlbar-container[combined] > #urlbar > #urlbar-icons > #go-button,
|
#urlbar[pageproxystate="invalid"] > #urlbar-icons > .urlbar-icon,
|
||||||
#urlbar[pageproxystate="invalid"] > #urlbar-icons > .urlbar-icon:not(#go-button),
|
|
||||||
#urlbar[pageproxystate="valid"] > #urlbar-icons > #go-button,
|
|
||||||
#urlbar[pageproxystate="invalid"][focused="true"] > #urlbar-go-button ~ toolbarbutton,
|
#urlbar[pageproxystate="invalid"][focused="true"] > #urlbar-go-button ~ toolbarbutton,
|
||||||
#urlbar[pageproxystate="valid"] > #urlbar-go-button,
|
#urlbar[pageproxystate="valid"] > #urlbar-go-button,
|
||||||
#urlbar:not([focused="true"]) > #urlbar-go-button {
|
#urlbar:not([focused="true"]) > #urlbar-go-button {
|
||||||
|
|
|
||||||
|
|
@ -312,29 +312,22 @@ function SetClickAndHoldHandlers() {
|
||||||
aElm.addEventListener("click", clickHandler, true);
|
aElm.addEventListener("click", clickHandler, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bug 414797: Clone unified-back-forward-button's context menu into both the
|
// Bug 414797: Clone the back/forward buttons' context menu into both buttons.
|
||||||
// back and the forward buttons.
|
let popup = document.getElementById("backForwardMenu").cloneNode(true);
|
||||||
var unifiedButton = document.getElementById("unified-back-forward-button");
|
popup.removeAttribute("id");
|
||||||
if (unifiedButton && !unifiedButton._clickHandlersAttached) {
|
// Prevent the back/forward buttons' context attributes from being inherited.
|
||||||
unifiedButton._clickHandlersAttached = true;
|
popup.setAttribute("context", "");
|
||||||
|
|
||||||
let popup = document.getElementById("backForwardMenu").cloneNode(true);
|
let backButton = document.getElementById("back-button");
|
||||||
popup.removeAttribute("id");
|
backButton.setAttribute("type", "menu");
|
||||||
// Prevent the context attribute on unified-back-forward-button from being
|
backButton.appendChild(popup);
|
||||||
// inherited.
|
_addClickAndHoldListenersOnElement(backButton);
|
||||||
popup.setAttribute("context", "");
|
|
||||||
|
|
||||||
let backButton = document.getElementById("back-button");
|
let forwardButton = document.getElementById("forward-button");
|
||||||
backButton.setAttribute("type", "menu");
|
popup = popup.cloneNode(true);
|
||||||
backButton.appendChild(popup);
|
forwardButton.setAttribute("type", "menu");
|
||||||
_addClickAndHoldListenersOnElement(backButton);
|
forwardButton.appendChild(popup);
|
||||||
|
_addClickAndHoldListenersOnElement(forwardButton);
|
||||||
let forwardButton = document.getElementById("forward-button");
|
|
||||||
popup = popup.cloneNode(true);
|
|
||||||
forwardButton.setAttribute("type", "menu");
|
|
||||||
forwardButton.appendChild(popup);
|
|
||||||
_addClickAndHoldListenersOnElement(forwardButton);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const gSessionHistoryObserver = {
|
const gSessionHistoryObserver = {
|
||||||
|
|
@ -2174,13 +2167,10 @@ function UpdateUrlbarSearchSplitterState()
|
||||||
var splitter = document.getElementById("urlbar-search-splitter");
|
var splitter = document.getElementById("urlbar-search-splitter");
|
||||||
var urlbar = document.getElementById("urlbar-container");
|
var urlbar = document.getElementById("urlbar-container");
|
||||||
var searchbar = document.getElementById("search-container");
|
var searchbar = document.getElementById("search-container");
|
||||||
var stop = document.getElementById("stop-button");
|
|
||||||
|
|
||||||
var ibefore = null;
|
var ibefore = null;
|
||||||
if (urlbar && searchbar) {
|
if (urlbar && searchbar) {
|
||||||
if (urlbar.nextSibling == searchbar ||
|
if (urlbar.nextSibling == searchbar)
|
||||||
urlbar.getAttribute("combined") &&
|
|
||||||
stop && stop.nextSibling == searchbar)
|
|
||||||
ibefore = searchbar;
|
ibefore = searchbar;
|
||||||
else if (searchbar.nextSibling == urlbar)
|
else if (searchbar.nextSibling == urlbar)
|
||||||
ibefore = urlbar;
|
ibefore = urlbar;
|
||||||
|
|
@ -3896,20 +3886,8 @@ var CombinedStopReload = {
|
||||||
if (this._initialized)
|
if (this._initialized)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
var urlbar = document.getElementById("urlbar-container");
|
let reload = document.getElementById("urlbar-reload-button");
|
||||||
var reload = document.getElementById("reload-button");
|
let stop = document.getElementById("urlbar-stop-button");
|
||||||
var stop = document.getElementById("stop-button");
|
|
||||||
|
|
||||||
if (urlbar) {
|
|
||||||
if (!reload || urlbar.nextSibling != reload ||
|
|
||||||
!stop || reload.nextSibling != stop)
|
|
||||||
urlbar.removeAttribute("combined");
|
|
||||||
else {
|
|
||||||
urlbar.setAttribute("combined", "true");
|
|
||||||
reload = document.getElementById("urlbar-reload-button");
|
|
||||||
stop = document.getElementById("urlbar-stop-button");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!stop || !reload || reload.nextSibling != stop)
|
if (!stop || !reload || reload.nextSibling != stop)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -532,28 +532,28 @@
|
||||||
aria-label="&navbarCmd.label;"
|
aria-label="&navbarCmd.label;"
|
||||||
fullscreentoolbar="true" mode="icons" customizable="true"
|
fullscreentoolbar="true" mode="icons" customizable="true"
|
||||||
iconsize="large"
|
iconsize="large"
|
||||||
defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button"
|
defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button"
|
||||||
customizationtarget="nav-bar-customizationtarget"
|
customizationtarget="nav-bar-customizationtarget"
|
||||||
overflowbutton="nav-bar-overflow-button"
|
overflowbutton="nav-bar-overflow-button"
|
||||||
overflowtarget="widget-overflow-list"
|
overflowtarget="widget-overflow-list"
|
||||||
context="toolbar-context-menu">
|
context="toolbar-context-menu">
|
||||||
|
|
||||||
<hbox id="nav-bar-customizationtarget" class="customization-target" flex="1">
|
<hbox id="nav-bar-customizationtarget" class="customization-target" flex="1">
|
||||||
<toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
|
<toolbaritem id="urlbar-container" align="center" flex="400" persist="width"
|
||||||
context="backForwardMenu" removable="false"
|
forwarddisabled="true" title="&locationItem.title;" removable="false"
|
||||||
forwarddisabled="true"
|
class="chromeclass-location" nooverflow="true">
|
||||||
title="&backForwardItem.title;"
|
<toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||||
nooverflow="true">
|
|
||||||
<toolbarbutton id="back-button" class="toolbarbutton-1"
|
|
||||||
label="&backCmd.label;"
|
label="&backCmd.label;"
|
||||||
command="Browser:BackOrBackDuplicate"
|
command="Browser:BackOrBackDuplicate"
|
||||||
onclick="checkForMiddleClick(this, event);"
|
onclick="checkForMiddleClick(this, event);"
|
||||||
tooltip="back-button-tooltip"/>
|
tooltip="back-button-tooltip"
|
||||||
<toolbarbutton id="forward-button" class="toolbarbutton-1"
|
context="backForwardMenu"/>
|
||||||
|
<toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||||
label="&forwardCmd.label;"
|
label="&forwardCmd.label;"
|
||||||
command="Browser:ForwardOrForwardDuplicate"
|
command="Browser:ForwardOrForwardDuplicate"
|
||||||
onclick="checkForMiddleClick(this, event);"
|
onclick="checkForMiddleClick(this, event);"
|
||||||
tooltip="forward-button-tooltip"/>
|
tooltip="forward-button-tooltip"
|
||||||
|
context="backForwardMenu"/>
|
||||||
<dummyobservertarget hidden="true"
|
<dummyobservertarget hidden="true"
|
||||||
onbroadcast="if (this.getAttribute('disabled') == 'true')
|
onbroadcast="if (this.getAttribute('disabled') == 'true')
|
||||||
this.parentNode.setAttribute('forwarddisabled', 'true');
|
this.parentNode.setAttribute('forwarddisabled', 'true');
|
||||||
|
|
@ -561,92 +561,89 @@
|
||||||
this.parentNode.removeAttribute('forwarddisabled');">
|
this.parentNode.removeAttribute('forwarddisabled');">
|
||||||
<observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
|
<observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/>
|
||||||
</dummyobservertarget>
|
</dummyobservertarget>
|
||||||
</toolbaritem>
|
<hbox id="urlbar-wrapper" flex="1">
|
||||||
|
<textbox id="urlbar" flex="1"
|
||||||
<toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true"
|
placeholder="&urlbar.placeholder2;"
|
||||||
title="&locationItem.title;" class="chromeclass-location" removable="false" nooverflow="true">
|
type="autocomplete"
|
||||||
<textbox id="urlbar" flex="1"
|
autocompletesearch="urlinline history"
|
||||||
placeholder="&urlbar.placeholder2;"
|
autocompletesearchparam="enable-actions"
|
||||||
type="autocomplete"
|
autocompletepopup="PopupAutoCompleteRichResult"
|
||||||
autocompletesearch="urlinline history"
|
completeselectedindex="true"
|
||||||
autocompletesearchparam="enable-actions"
|
tabscrolling="true"
|
||||||
autocompletepopup="PopupAutoCompleteRichResult"
|
showcommentcolumn="true"
|
||||||
completeselectedindex="true"
|
showimagecolumn="true"
|
||||||
tabscrolling="true"
|
enablehistory="true"
|
||||||
showcommentcolumn="true"
|
maxrows="6"
|
||||||
showimagecolumn="true"
|
newlines="stripsurroundingwhitespace"
|
||||||
enablehistory="true"
|
oninput="gBrowser.userTypedValue = this.value;"
|
||||||
maxrows="6"
|
ontextentered="this.handleCommand(param);"
|
||||||
newlines="stripsurroundingwhitespace"
|
ontextreverted="return this.handleRevert();"
|
||||||
oninput="gBrowser.userTypedValue = this.value;"
|
pageproxystate="invalid"
|
||||||
ontextentered="this.handleCommand(param);"
|
onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
|
||||||
ontextreverted="return this.handleRevert();"
|
onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
|
||||||
pageproxystate="invalid"
|
<box id="notification-popup-box" hidden="true" align="center">
|
||||||
onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
|
<image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
|
<image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<box id="notification-popup-box" hidden="true" align="center">
|
<image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="default-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="identity-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="geo-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="addons-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
|
<image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
|
||||||
<image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
|
</box>
|
||||||
<image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
|
<!-- Use onclick instead of normal popup= syntax since the popup
|
||||||
<image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
|
code fires onmousedown, and hence eats our favicon drag events.
|
||||||
</box>
|
We only add the identity-box button to the tab order when the location bar
|
||||||
<!-- Use onclick instead of normal popup= syntax since the popup
|
has focus, otherwise pressing F6 focuses it instead of the location bar -->
|
||||||
code fires onmousedown, and hence eats our favicon drag events.
|
<box id="identity-box" role="button"
|
||||||
We only add the identity-box button to the tab order when the location bar
|
align="center"
|
||||||
has focus, otherwise pressing F6 focuses it instead of the location bar -->
|
onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
|
||||||
<box id="identity-box" role="button"
|
onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
|
||||||
align="center"
|
ondragstart="gIdentityHandler.onDragStart(event);">
|
||||||
onclick="gIdentityHandler.handleIdentityButtonEvent(event);"
|
<image id="page-proxy-favicon"
|
||||||
onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);"
|
onclick="PageProxyClickHandler(event);"
|
||||||
ondragstart="gIdentityHandler.onDragStart(event);">
|
pageproxystate="invalid"/>
|
||||||
<image id="page-proxy-favicon"
|
<hbox id="identity-icon-labels">
|
||||||
onclick="PageProxyClickHandler(event);"
|
<label id="identity-icon-label" class="plain" flex="1"/>
|
||||||
pageproxystate="invalid"/>
|
<label id="identity-icon-country-label" class="plain"/>
|
||||||
<hbox id="identity-icon-labels">
|
</hbox>
|
||||||
<label id="identity-icon-label" class="plain" flex="1"/>
|
</box>
|
||||||
<label id="identity-icon-country-label" class="plain"/>
|
<box id="urlbar-display-box" align="center">
|
||||||
|
<label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
|
||||||
|
</box>
|
||||||
|
<hbox id="urlbar-icons">
|
||||||
|
<image id="page-report-button"
|
||||||
|
class="urlbar-icon"
|
||||||
|
hidden="true"
|
||||||
|
tooltiptext="&pageReportIcon.tooltip;"
|
||||||
|
onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
|
||||||
|
<image id="star-button"
|
||||||
|
class="urlbar-icon"
|
||||||
|
onclick="BookmarkingUI.onCommand(event);"/>
|
||||||
</hbox>
|
</hbox>
|
||||||
</box>
|
<toolbarbutton id="urlbar-go-button"
|
||||||
<box id="urlbar-display-box" align="center">
|
class="chromeclass-toolbar-additional"
|
||||||
<label id="urlbar-display" value="&urlbar.switchToTab.label;"/>
|
onclick="gURLBar.handleCommand(event);"
|
||||||
</box>
|
tooltiptext="&goEndCap.tooltip;"/>
|
||||||
<hbox id="urlbar-icons">
|
<toolbarbutton id="urlbar-reload-button"
|
||||||
<image id="page-report-button"
|
class="chromeclass-toolbar-additional"
|
||||||
class="urlbar-icon"
|
command="Browser:ReloadOrDuplicate"
|
||||||
hidden="true"
|
onclick="checkForMiddleClick(this, event);"
|
||||||
tooltiptext="&pageReportIcon.tooltip;"
|
tooltiptext="&reloadButton.tooltip;"/>
|
||||||
onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
|
<toolbarbutton id="urlbar-stop-button"
|
||||||
<image id="go-button"
|
class="chromeclass-toolbar-additional"
|
||||||
class="urlbar-icon"
|
command="Browser:Stop"
|
||||||
tooltiptext="&goEndCap.tooltip;"
|
tooltiptext="&stopButton.tooltip;"/>
|
||||||
onclick="gURLBar.handleCommand(event);"/>
|
</textbox>
|
||||||
</hbox>
|
</hbox>
|
||||||
<toolbarbutton id="urlbar-go-button"
|
|
||||||
class="chromeclass-toolbar-additional"
|
|
||||||
onclick="gURLBar.handleCommand(event);"
|
|
||||||
tooltiptext="&goEndCap.tooltip;"/>
|
|
||||||
<toolbarbutton id="urlbar-reload-button"
|
|
||||||
class="chromeclass-toolbar-additional"
|
|
||||||
command="Browser:ReloadOrDuplicate"
|
|
||||||
onclick="checkForMiddleClick(this, event);"
|
|
||||||
tooltiptext="&reloadButton.tooltip;"/>
|
|
||||||
<toolbarbutton id="urlbar-stop-button"
|
|
||||||
class="chromeclass-toolbar-additional"
|
|
||||||
command="Browser:Stop"
|
|
||||||
tooltiptext="&stopButton.tooltip;"/>
|
|
||||||
</textbox>
|
|
||||||
</toolbaritem>
|
</toolbaritem>
|
||||||
|
|
||||||
<toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
<toolbarbutton id="reload-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
|
||||||
|
|
@ -1088,7 +1085,7 @@
|
||||||
<svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/>
|
<svg:path d="M 0,0 C 0.16,0.11 0.28,0.29 0.28,0.5 0.28,0.71 0.16,0.89 0,1 L 1,1 1,0 0,0 z"/>
|
||||||
</svg:clipPath>
|
</svg:clipPath>
|
||||||
<svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
|
<svg:clipPath id="windows-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
|
||||||
<svg:path d="M 0,0 0,7.8 C 2.5,11 4,14 4,18 4,22 2.5,25 0,28 l 0,22 10000,0 0,-50 L 0,0 z"/>
|
<svg:path d="m 0,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/>
|
||||||
</svg:clipPath>
|
</svg:clipPath>
|
||||||
#endif
|
#endif
|
||||||
#ifdef XP_MACOSX
|
#ifdef XP_MACOSX
|
||||||
|
|
@ -1096,7 +1093,7 @@
|
||||||
<svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
|
<svg:path d="M 0,0 C 0.15,0.12 0.25,0.3 0.25,0.5 0.25,0.7 0.15,0.88 0,1 L 1,1 1,0 0,0 z"/>
|
||||||
</svg:clipPath>
|
</svg:clipPath>
|
||||||
<svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
|
<svg:clipPath id="osx-urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse">
|
||||||
<svg:path d="m 0,-5 0,9.03 C 3.6,6.8 6,11.1 6,16 6,21 3.6,25 0,28 l 0,27 10000,0 0,-55 L 0,-5 z"/>
|
<svg:path d="m 0,-10 l 0,9.03 c 3.6,2.77 6,7.07 6,11.97 c 0,5 -2.4,9 -6,12 l 0,27 l 10000,0 l 0,-55 l -10000,-5 z"/>
|
||||||
</svg:clipPath>
|
</svg:clipPath>
|
||||||
#endif
|
#endif
|
||||||
</svg:svg>
|
</svg:svg>
|
||||||
|
|
|
||||||
|
|
@ -979,7 +979,7 @@
|
||||||
this.mCurrentTab = this.tabContainer.selectedItem;
|
this.mCurrentTab = this.tabContainer.selectedItem;
|
||||||
this.showTab(this.mCurrentTab);
|
this.showTab(this.mCurrentTab);
|
||||||
|
|
||||||
var backForwardContainer = document.getElementById("unified-back-forward-button");
|
var backForwardContainer = document.getElementById("urlbar-container");
|
||||||
if (backForwardContainer) {
|
if (backForwardContainer) {
|
||||||
backForwardContainer.setAttribute("switchingtabs", "true");
|
backForwardContainer.setAttribute("switchingtabs", "true");
|
||||||
window.addEventListener("MozAfterPaint", function removeSwitchingtabsAttr() {
|
window.addEventListener("MozAfterPaint", function removeSwitchingtabsAttr() {
|
||||||
|
|
|
||||||
|
|
@ -144,10 +144,7 @@ let CustomizableUIInternal = {
|
||||||
type: CustomizableUI.TYPE_TOOLBAR,
|
type: CustomizableUI.TYPE_TOOLBAR,
|
||||||
overflowable: true,
|
overflowable: true,
|
||||||
defaultPlacements: [
|
defaultPlacements: [
|
||||||
"unified-back-forward-button",
|
|
||||||
"urlbar-container",
|
"urlbar-container",
|
||||||
"reload-button",
|
|
||||||
"stop-button",
|
|
||||||
"search-container",
|
"search-container",
|
||||||
"webrtc-status-button",
|
"webrtc-status-button",
|
||||||
"bookmarks-menu-button",
|
"bookmarks-menu-button",
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,6 @@ These should match what Safari and other Apple applications use on OS X Lion. --
|
||||||
<!ENTITY printButton.label "Print">
|
<!ENTITY printButton.label "Print">
|
||||||
<!ENTITY printButton.tooltip "Print this page">
|
<!ENTITY printButton.tooltip "Print this page">
|
||||||
|
|
||||||
<!ENTITY backForwardItem.title "Back/Forward">
|
|
||||||
<!ENTITY locationItem.title "Location">
|
<!ENTITY locationItem.title "Location">
|
||||||
<!ENTITY searchItem.title "Search">
|
<!ENTITY searchItem.title "Search">
|
||||||
<!ENTITY bookmarksItem.title "Bookmarks">
|
<!ENTITY bookmarksItem.title "Bookmarks">
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
%filter substitution
|
%filter substitution
|
||||||
|
|
||||||
%define forwardTransitionLength 150ms
|
%define forwardTransitionLength 150ms
|
||||||
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"], #nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
|
%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-container
|
||||||
%define conditionalForwardWithUrlbarWidth 32
|
%define conditionalForwardWithUrlbarWidth 32
|
||||||
|
|
||||||
#menubar-items {
|
#menubar-items {
|
||||||
|
|
@ -551,17 +551,18 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
|
||||||
list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
|
list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=toolbar&state=disabled");
|
||||||
}
|
}
|
||||||
|
|
||||||
#forward-button,
|
#forward-button {
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button {
|
|
||||||
list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar");
|
list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar");
|
||||||
}
|
}
|
||||||
#forward-button:-moz-locale-dir(rtl),
|
#forward-button:-moz-locale-dir(rtl) {
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:-moz-locale-dir(rtl) {
|
|
||||||
list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
|
list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar");
|
||||||
}
|
}
|
||||||
|
|
||||||
#forward-button[disabled] {
|
#forward-button[disabled] {
|
||||||
list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
|
list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=toolbar&state=disabled");
|
||||||
|
transform: scale(0);
|
||||||
|
opacity: 0;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
#forward-button[disabled]:-moz-locale-dir(rtl) {
|
#forward-button[disabled]:-moz-locale-dir(rtl) {
|
||||||
list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
|
list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=toolbar&state=disabled");
|
||||||
|
|
@ -571,26 +572,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) {
|
||||||
transition: @forwardTransitionLength@ ease-out;
|
transition: @forwardTransitionLength@ ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button[disabled] {
|
|
||||||
transform: scale(0);
|
|
||||||
opacity: 0;
|
|
||||||
pointer-events: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
#reload-button {
|
|
||||||
list-style-image: url("moz-icon://stock/gtk-refresh?size=toolbar");
|
|
||||||
}
|
|
||||||
#reload-button[disabled="true"] {
|
|
||||||
list-style-image: url("moz-icon://stock/gtk-refresh?size=toolbar&state=disabled");
|
|
||||||
}
|
|
||||||
|
|
||||||
#stop-button {
|
|
||||||
list-style-image: url("moz-icon://stock/gtk-stop?size=toolbar");
|
|
||||||
}
|
|
||||||
#stop-button[disabled="true"] {
|
|
||||||
list-style-image: url("moz-icon://stock/gtk-stop?size=toolbar&state=disabled");
|
|
||||||
}
|
|
||||||
|
|
||||||
#home-button {
|
#home-button {
|
||||||
list-style-image: url("moz-icon://stock/gtk-home?size=toolbar");
|
list-style-image: url("moz-icon://stock/gtk-home?size=toolbar");
|
||||||
}
|
}
|
||||||
|
|
@ -772,26 +753,26 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
|
||||||
-moz-box-align: stretch;
|
-moz-box-align: stretch;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper {
|
||||||
-moz-padding-start: @conditionalForwardWithUrlbarWidth@px;
|
-moz-padding-start: @conditionalForwardWithUrlbarWidth@px;
|
||||||
-moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
|
-moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
|
||||||
position: relative;
|
position: relative;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar {
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
|
||||||
transition: margin-left @forwardTransitionLength@ ease-out,
|
transition: margin-left @forwardTransitionLength@ ease-out,
|
||||||
margin-right @forwardTransitionLength@ ease-out;
|
margin-right @forwardTransitionLength@ ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) {
|
||||||
margin-left: -@conditionalForwardWithUrlbarWidth@px;
|
margin-left: -@conditionalForwardWithUrlbarWidth@px;
|
||||||
}
|
}
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
|
||||||
margin-right: -@conditionalForwardWithUrlbarWidth@px;
|
margin-right: -@conditionalForwardWithUrlbarWidth@px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -810,7 +791,7 @@ toolbar > .customization-target > toolbarpaletteitem > #history-panelmenu {
|
||||||
-moz-margin-start: -4px;
|
-moz-margin-start: -4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#urlbar-search-splitter + #urlbar-container > #urlbar ,
|
#urlbar-search-splitter + #urlbar-container > #urlbar-wrapper > #urlbar,
|
||||||
#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
|
#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
|
||||||
-moz-margin-start: 0;
|
-moz-margin-start: 0;
|
||||||
}
|
}
|
||||||
|
|
@ -1240,11 +1221,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
||||||
|
|
||||||
/* Combined go/reload/stop button in location bar */
|
/* Combined go/reload/stop button in location bar */
|
||||||
|
|
||||||
#go-button {
|
|
||||||
padding-top: 2px;
|
|
||||||
padding-bottom: 2px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#urlbar > toolbarbutton {
|
#urlbar > toolbarbutton {
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
|
|
@ -1253,12 +1229,10 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
||||||
width: 22px;
|
width: 22px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button,
|
|
||||||
#urlbar-go-button {
|
#urlbar-go-button {
|
||||||
list-style-image: url("chrome://browser/skin/Go-arrow.png");
|
list-style-image: url("chrome://browser/skin/Go-arrow.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
|
|
||||||
#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
|
#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
|
||||||
transform: scaleX(-1);
|
transform: scaleX(-1);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
%include shared.inc
|
%include shared.inc
|
||||||
%filter substitution
|
%filter substitution
|
||||||
%define forwardTransitionLength 150ms
|
%define forwardTransitionLength 150ms
|
||||||
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
|
%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-container
|
||||||
%define conditionalForwardWithUrlbarWidth 27
|
%define conditionalForwardWithUrlbarWidth 27
|
||||||
%define toolbarButtonPressed :hover:active:not([disabled="true"]):not([customizableui-areatype="menu-panel"])
|
%define toolbarButtonPressed :hover:active:not([disabled="true"]):not([customizableui-areatype="menu-panel"])
|
||||||
|
|
||||||
|
|
@ -417,14 +417,6 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
-moz-image-region: rect(18px, 72px, 36px, 54px);
|
-moz-image-region: rect(18px, 72px, 36px, 54px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#reload-button:hover:active:not([disabled="true"]) {
|
|
||||||
-moz-image-region: rect(18px, 90px, 36px, 72px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#stop-button:hover:active:not([disabled="true"]) {
|
|
||||||
-moz-image-region: rect(18px, 108px, 36px, 90px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#home-button@toolbarButtonPressed@ {
|
#home-button@toolbarButtonPressed@ {
|
||||||
-moz-image-region: rect(18px, 126px, 36px, 108px);
|
-moz-image-region: rect(18px, 126px, 36px, 108px);
|
||||||
}
|
}
|
||||||
|
|
@ -599,22 +591,6 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
-moz-image-region: rect(36px, 144px, 72px, 108px);
|
-moz-image-region: rect(36px, 144px, 72px, 108px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#reload-button {
|
|
||||||
-moz-image-region: rect(0, 180px, 36px, 144px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#reload-button:hover:active:not([disabled="true"]) {
|
|
||||||
-moz-image-region: rect(36px, 180px, 72px, 144px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#stop-button {
|
|
||||||
-moz-image-region: rect(0, 216px, 36px, 180px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#stop-button:hover:active:not([disabled="true"]) {
|
|
||||||
-moz-image-region: rect(36px, 216px, 72px, 180px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#home-button[customizableui-areatype="toolbar"] {
|
#home-button[customizableui-areatype="toolbar"] {
|
||||||
-moz-image-region: rect(0, 252px, 36px, 216px);
|
-moz-image-region: rect(0, 252px, 36px, 216px);
|
||||||
}
|
}
|
||||||
|
|
@ -872,16 +848,6 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
list-style-image: url(chrome://browser/skin/menuPanel@2x.png);
|
list-style-image: url(chrome://browser/skin/menuPanel@2x.png);
|
||||||
}
|
}
|
||||||
|
|
||||||
#reload-button[customizableui-areatype="menu-panel"],
|
|
||||||
toolbarpaletteitem[place="palette"] > #reload-button {
|
|
||||||
-moz-image-region: rect(0px, 128px, 64px, 64px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#stop-button[customizableui-areatype="menu-panel"],
|
|
||||||
toolbarpaletteitem[place="palette"] > #stop-button {
|
|
||||||
-moz-image-region: rect(0px, 192px, 64px, 128px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#home-button[customizableui-areatype="menu-panel"],
|
#home-button[customizableui-areatype="menu-panel"],
|
||||||
toolbarpaletteitem[place="palette"] > #home-button {
|
toolbarpaletteitem[place="palette"] > #home-button {
|
||||||
-moz-image-region: rect(0px, 256px, 64px, 192px);
|
-moz-image-region: rect(0px, 256px, 64px, 192px);
|
||||||
|
|
@ -1114,12 +1080,6 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
margin-top: 1px;
|
margin-top: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* unified back/forward button */
|
|
||||||
|
|
||||||
#unified-back-forward-button {
|
|
||||||
-moz-box-align: center;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Common back and forward button styles */
|
/* Common back and forward button styles */
|
||||||
|
|
||||||
#back-button,
|
#back-button,
|
||||||
|
|
@ -1134,7 +1094,6 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
#forward-button:-moz-lwtheme {
|
#forward-button:-moz-lwtheme {
|
||||||
background-origin: border-box;
|
background-origin: border-box;
|
||||||
border: 1px solid rgba(0,0,0,0.4);
|
border: 1px solid rgba(0,0,0,0.4);
|
||||||
border-radius: @toolbarbuttonCornerRadius@;
|
|
||||||
box-shadow: inset 0 1px rgba(255,255,255,0.3), 0 1px rgba(255,255,255,0.2);
|
box-shadow: inset 0 1px rgba(255,255,255,0.3), 0 1px rgba(255,255,255,0.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1152,7 +1111,7 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
|
|
||||||
/* Back button styles */
|
/* Back button styles */
|
||||||
|
|
||||||
#nav-bar #back-button {
|
#back-button {
|
||||||
-moz-margin-end: -7px;
|
-moz-margin-end: -7px;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
|
|
@ -1162,27 +1121,26 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
border-radius: 10000px;
|
border-radius: 10000px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#nav-bar #back-button:not(:-moz-lwtheme) {
|
#back-button:not(:-moz-lwtheme) {
|
||||||
height: 31px;
|
height: 31px;
|
||||||
padding: 4px 5px 5px 3px;
|
padding: 4px 5px 5px 3px;
|
||||||
margin-bottom: -1px;
|
margin-bottom: -1px;
|
||||||
background: url(chrome://browser/skin/keyhole-circle.png) 0 0 no-repeat;
|
background: url(chrome://browser/skin/keyhole-circle.png) 0 0 no-repeat;
|
||||||
border-radius: 0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-resolution: 2dppx) {
|
@media (min-resolution: 2dppx) {
|
||||||
#nav-bar #back-button:not(:-moz-lwtheme) {
|
#back-button:not(:-moz-lwtheme) {
|
||||||
background-image: url(chrome://browser/skin/keyhole-circle@2x.png);
|
background-image: url(chrome://browser/skin/keyhole-circle@2x.png);
|
||||||
background-size: 90px;
|
background-size: 90px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#nav-bar #back-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
#back-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
||||||
background-position: -60px 0;
|
background-position: -60px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#nav-bar #back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
|
#back-button:not([disabled="true"]):active:hover:not(:-moz-lwtheme),
|
||||||
#nav-bar #back-button[open="true"]:not(:-moz-lwtheme) {
|
#back-button[open="true"]:not(:-moz-lwtheme) {
|
||||||
background-position: -30px 0;
|
background-position: -30px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1190,26 +1148,22 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
|
|
||||||
#forward-button {
|
#forward-button {
|
||||||
-moz-margin-start: 0;
|
-moz-margin-start: 0;
|
||||||
|
-moz-margin-end: 0;
|
||||||
|
clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
|
||||||
}
|
}
|
||||||
|
|
||||||
#nav-bar #forward-button > .toolbarbutton-icon {
|
#forward-button > .toolbarbutton-icon {
|
||||||
/* shift the icon away from the back button */
|
/* shift the icon away from the back button */
|
||||||
margin-left: 3px;
|
margin-left: 3px;
|
||||||
margin-right: -1px;
|
margin-right: -1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#nav-bar #forward-button {
|
|
||||||
clip-path: url(chrome://browser/content/browser.xul#osx-keyhole-forward-clip-path);
|
|
||||||
}
|
|
||||||
|
|
||||||
#forward-button:-moz-lwtheme {
|
#forward-button:-moz-lwtheme {
|
||||||
border-top-left-radius: 0;
|
-moz-padding-start: 2px;
|
||||||
border-bottom-left-radius: 0;
|
-moz-padding-end: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Conditional forward button styles */
|
#forward-button:not(:-moz-lwtheme) {
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:not(:-moz-lwtheme) {
|
|
||||||
-moz-padding-start: 2px;
|
-moz-padding-start: 2px;
|
||||||
background: linear-gradient(hsl(0,0%,99%), hsl(0,0%,67%)) padding-box;
|
background: linear-gradient(hsl(0,0%,99%), hsl(0,0%,67%)) padding-box;
|
||||||
border: 1px solid;
|
border: 1px solid;
|
||||||
|
|
@ -1218,21 +1172,11 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
0 1px 0 hsla(0,0%,100%,.2);
|
0 1px 0 hsla(0,0%,100%,.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button {
|
#urlbar-container:not([switchingtabs]) > #forward-button {
|
||||||
border-radius: 0;
|
|
||||||
-moz-margin-end: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:-moz-lwtheme {
|
|
||||||
-moz-padding-start: 2px;
|
|
||||||
-moz-padding-end: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
|
|
||||||
transition: opacity @forwardTransitionLength@ ease-out;
|
transition: opacity @forwardTransitionLength@ ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:hover:active:not(:-moz-lwtheme) {
|
#forward-button:hover:active:not(:-moz-lwtheme) {
|
||||||
background-image: linear-gradient(hsl(0,0%,74%), hsl(0,0%,61%));
|
background-image: linear-gradient(hsl(0,0%,74%), hsl(0,0%,61%));
|
||||||
box-shadow: inset rgba(0,0,0,.3) 0 -6px 10px,
|
box-shadow: inset rgba(0,0,0,.3) 0 -6px 10px,
|
||||||
inset #000 0 1px 3px,
|
inset #000 0 1px 3px,
|
||||||
|
|
@ -1240,18 +1184,18 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
0 1px 0 hsla(0,0%,100%,.2);
|
0 1px 0 hsla(0,0%,100%,.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
#forward-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
||||||
border-color: hsl(0,0%,64%) hsl(0,0%,65%) hsl(0,0%,66%);
|
border-color: hsl(0,0%,64%) hsl(0,0%,65%) hsl(0,0%,66%);
|
||||||
background-image: linear-gradient(hsl(0,0%,99%), hsl(0,0%,82%));
|
background-image: linear-gradient(hsl(0,0%,99%), hsl(0,0%,82%));
|
||||||
box-shadow: inset 0 1px 0 hsla(0,0%,100%,.35);
|
box-shadow: inset 0 1px 0 hsla(0,0%,100%,.35);
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@:not(:hover) > #forward-button[disabled] {
|
#urlbar-container:not(:hover) > #forward-button[disabled] {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (-moz-mac-lion-theme) {
|
@media (-moz-mac-lion-theme) {
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:not(:-moz-lwtheme) {
|
#forward-button:not(:-moz-lwtheme) {
|
||||||
background-image: linear-gradient(hsla(0,0%,100%,.73), hsla(0,0%,100%,.05) 85%);
|
background-image: linear-gradient(hsla(0,0%,100%,.73), hsla(0,0%,100%,.05) 85%);
|
||||||
border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.25) hsla(0,0%,0%,.2);
|
border-color: hsla(0,0%,0%,.35) hsla(0,0%,0%,.25) hsla(0,0%,0%,.2);
|
||||||
box-shadow: inset 0 1px 0 hsla(0,0%,100%,.2),
|
box-shadow: inset 0 1px 0 hsla(0,0%,100%,.2),
|
||||||
|
|
@ -1259,7 +1203,7 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
0 1px 0 hsla(0,0%,100%,.2);
|
0 1px 0 hsla(0,0%,100%,.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:hover:active:not(:-moz-lwtheme) {
|
#forward-button:hover:active:not(:-moz-lwtheme) {
|
||||||
background-image: linear-gradient(hsla(0,0%,60%,.37), hsla(0,0%,100%,.35) 95%);
|
background-image: linear-gradient(hsla(0,0%,60%,.37), hsla(0,0%,100%,.35) 95%);
|
||||||
border-color: hsla(0,0%,0%,.43) hsla(0,0%,0%,.25) hsla(0,0%,0%,.37);
|
border-color: hsla(0,0%,0%,.43) hsla(0,0%,0%,.25) hsla(0,0%,0%,.37);
|
||||||
box-shadow: inset 0 1px 0 hsla(0,0%,0%,.02),
|
box-shadow: inset 0 1px 0 hsla(0,0%,0%,.02),
|
||||||
|
|
@ -1267,7 +1211,7 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
0 1px 0 hsla(0,0%,100%,.2);
|
0 1px 0 hsla(0,0%,100%,.2);
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
#forward-button:-moz-window-inactive:not(:-moz-lwtheme) {
|
||||||
background-image: none;
|
background-image: none;
|
||||||
border-color: hsla(0,0%,0%,.2);
|
border-color: hsla(0,0%,0%,.2);
|
||||||
}
|
}
|
||||||
|
|
@ -1460,53 +1404,53 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
border-radius: @toolbarbuttonCornerRadius@;
|
border-radius: @toolbarbuttonCornerRadius@;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper {
|
||||||
padding-left: @conditionalForwardWithUrlbarWidth@px;
|
padding-left: @conditionalForwardWithUrlbarWidth@px;
|
||||||
-moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
|
-moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
|
||||||
position: relative;
|
position: relative;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar {
|
||||||
-moz-border-start: none;
|
-moz-border-start: none;
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
|
||||||
transition: margin-left @forwardTransitionLength@ ease-out;
|
transition: margin-left @forwardTransitionLength@ ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) {
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
border-bottom-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
|
||||||
border-top-right-radius: 0;
|
border-top-right-radius: 0;
|
||||||
border-bottom-right-radius: 0;
|
border-bottom-right-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper {
|
||||||
clip-path: url("chrome://browser/content/browser.xul#osx-urlbar-back-button-clip-path");
|
clip-path: url("chrome://browser/content/browser.xul#osx-urlbar-back-button-clip-path");
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar {
|
||||||
margin-left: -@conditionalForwardWithUrlbarWidth@px;
|
margin-left: -@conditionalForwardWithUrlbarWidth@px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
|
||||||
/* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
|
/* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
|
||||||
transition-delay: 100s;
|
transition-delay: 100s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar {
|
||||||
/* when not hovered anymore, trigger a new transition to hide the forward button immediately */
|
/* when not hovered anymore, trigger a new transition to hide the forward button immediately */
|
||||||
margin-left: -@conditionalForwardWithUrlbarWidth@.01px;
|
margin-left: -@conditionalForwardWithUrlbarWidth@.01px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl),
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper:-moz-locale-dir(rtl),
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
|
||||||
/* let osx-urlbar-back-button-clip-path clip the urlbar's right side for RTL */
|
/* let osx-urlbar-back-button-clip-path clip the urlbar's right side for RTL */
|
||||||
transform: scaleX(-1);
|
transform: scaleX(-1);
|
||||||
}
|
}
|
||||||
|
|
@ -1535,30 +1479,30 @@ toolbarbutton.bookmark-item > menupopup {
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar > #identity-box {
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
||||||
transition: 0s padding-left;
|
transition: 0s padding-left;
|
||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
||||||
transition: 0s padding-right;
|
transition: 0s padding-right;
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box {
|
||||||
/* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
|
/* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
|
||||||
transition-delay: 100s;
|
transition-delay: 100s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
||||||
padding-left: 10.01px;
|
padding-left: 10.01px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
||||||
padding-right: 10.01px;
|
padding-right: 10.01px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1811,7 +1755,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
|
||||||
|
|
||||||
/* ----- COMBINED GO/RELOAD/STOP BUTTON IN LOCATION BAR ----- */
|
/* ----- COMBINED GO/RELOAD/STOP BUTTON IN LOCATION BAR ----- */
|
||||||
|
|
||||||
#go-button,
|
|
||||||
#urlbar > toolbarbutton {
|
#urlbar > toolbarbutton {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
-moz-padding-start: 2px;
|
-moz-padding-start: 2px;
|
||||||
|
|
@ -1824,21 +1767,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
|
||||||
background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0));
|
background-image: radial-gradient(circle closest-side, hsla(205,100%,70%,.3), hsla(205,100%,70%,0));
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button {
|
|
||||||
padding: 0 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#go-button,
|
|
||||||
#urlbar-go-button {
|
#urlbar-go-button {
|
||||||
-moz-image-region: rect(0, 42px, 14px, 28px);
|
-moz-image-region: rect(0, 42px, 14px, 28px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button:hover:active,
|
|
||||||
#urlbar-go-button:hover:active {
|
#urlbar-go-button:hover:active {
|
||||||
-moz-image-region: rect(14px, 42px, 28px, 28px);
|
-moz-image-region: rect(14px, 42px, 28px, 28px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button:-moz-locale-dir(rtl),
|
|
||||||
#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
|
#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
|
||||||
transform: scaleX(-1);
|
transform: scaleX(-1);
|
||||||
}
|
}
|
||||||
|
|
@ -1864,17 +1800,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (min-resolution: 2dppx) {
|
@media (min-resolution: 2dppx) {
|
||||||
#go-button,
|
|
||||||
#urlbar > toolbarbutton {
|
#urlbar > toolbarbutton {
|
||||||
list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
|
list-style-image: url("chrome://browser/skin/reload-stop-go@2x.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button,
|
|
||||||
#urlbar-go-button {
|
#urlbar-go-button {
|
||||||
-moz-image-region: rect(0, 84px, 28px, 56px);
|
-moz-image-region: rect(0, 84px, 28px, 56px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button:hover:active,
|
|
||||||
#urlbar-go-button:hover:active {
|
#urlbar-go-button:hover:active {
|
||||||
-moz-image-region: rect(28px, 84px, 56px, 56px);
|
-moz-image-region: rect(28px, 84px, 56px, 56px);
|
||||||
}
|
}
|
||||||
|
|
@ -1895,7 +1828,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
|
||||||
-moz-image-region: rect(28px, 56px, 56px, 28px);
|
-moz-image-region: rect(28px, 56px, 56px, 28px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button > .toolbarbutton-icon,
|
|
||||||
#urlbar > toolbarbutton > .toolbarbutton-icon {
|
#urlbar > toolbarbutton > .toolbarbutton-icon {
|
||||||
width: 14px;
|
width: 14px;
|
||||||
}
|
}
|
||||||
|
|
@ -3003,7 +2935,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box {
|
||||||
padding-left: 7px;
|
padding-left: 7px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,3 @@
|
||||||
%filter substitution
|
%filter substitution
|
||||||
|
|
||||||
%define primaryToolbarButtons #back-button, #forward-button, #reload-button, #stop-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button
|
%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #downloads-indicator, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #alltabs-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button
|
||||||
|
|
|
||||||
|
|
@ -5,16 +5,6 @@ toolbarpaletteitem[place="palette"] > :-moz-any(@primaryToolbarButtons@) {
|
||||||
list-style-image: url(chrome://browser/skin/menuPanel.png);
|
list-style-image: url(chrome://browser/skin/menuPanel.png);
|
||||||
}
|
}
|
||||||
|
|
||||||
#reload-button[customizableui-areatype="menu-panel"],
|
|
||||||
toolbarpaletteitem[place="palette"] > #reload-button {
|
|
||||||
-moz-image-region: rect(0px, 64px, 32px, 32px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#stop-button[customizableui-areatype="menu-panel"],
|
|
||||||
toolbarpaletteitem[place="palette"] > #stop-button {
|
|
||||||
-moz-image-region: rect(0px, 96px, 32px, 64px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#home-button[customizableui-areatype="menu-panel"],
|
#home-button[customizableui-areatype="menu-panel"],
|
||||||
toolbarpaletteitem[place="palette"] > #home-button {
|
toolbarpaletteitem[place="palette"] > #home-button {
|
||||||
-moz-image-region: rect(0px, 128px, 32px, 96px);
|
-moz-image-region: rect(0px, 128px, 32px, 96px);
|
||||||
|
|
@ -142,4 +132,4 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button {
|
||||||
#zoom-controls[customizableui-areatype="menu-panel"] > #zoom-in-button,
|
#zoom-controls[customizableui-areatype="menu-panel"] > #zoom-in-button,
|
||||||
toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
|
toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button {
|
||||||
-moz-image-region: rect(0px, 96px, 16px, 80px);
|
-moz-image-region: rect(0px, 96px, 16px, 80px);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,14 +19,6 @@
|
||||||
transform: scaleX(-1);
|
transform: scaleX(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#reload-button {
|
|
||||||
-moz-image-region: rect(0, 90px, 18px, 72px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#stop-button {
|
|
||||||
-moz-image-region: rect(0, 108px, 18px, 90px);
|
|
||||||
}
|
|
||||||
|
|
||||||
#home-button[customizableui-areatype="toolbar"] {
|
#home-button[customizableui-areatype="toolbar"] {
|
||||||
-moz-image-region: rect(0, 126px, 18px, 108px);
|
-moz-image-region: rect(0, 126px, 18px, 108px);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
%define fgTabBackgroundMiddle linear-gradient(transparent, transparent 2px, -moz-dialog 2px, -moz-dialog)
|
%define fgTabBackgroundMiddle linear-gradient(transparent, transparent 2px, -moz-dialog 2px, -moz-dialog)
|
||||||
%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
|
%define navbarTextboxCustomBorder border-color: rgba(0,0,0,.32);
|
||||||
%define forwardTransitionLength 150ms
|
%define forwardTransitionLength 150ms
|
||||||
%define conditionalForwardWithUrlbar window:not([chromehidden~=toolbar]) :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > #nav-bar-customizationtarget > #unified-back-forward-button
|
%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-container
|
||||||
%define conditionalForwardWithUrlbarWidth 27
|
%define conditionalForwardWithUrlbarWidth 27
|
||||||
|
|
||||||
#menubar-items {
|
#menubar-items {
|
||||||
|
|
@ -538,26 +538,22 @@ menuitem.bookmark-item {
|
||||||
|
|
||||||
/* unified back/forward button */
|
/* unified back/forward button */
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ {
|
#forward-button {
|
||||||
-moz-box-align: center;
|
padding: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button {
|
#forward-button > menupopup {
|
||||||
padding: 0;
|
margin-top: 1px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button > menupopup {
|
#forward-button > .toolbarbutton-icon {
|
||||||
margin-top: 1px;
|
|
||||||
}
|
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #forward-button > .toolbarbutton-icon {
|
|
||||||
/*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
|
/*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */
|
||||||
clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path);
|
clip-path: url(chrome://browser/content/browser.xul#windows-keyhole-forward-clip-path) !important;
|
||||||
-moz-margin-start: -6px !important;
|
margin-left: -6px !important;
|
||||||
border-left-style: none;
|
border-left-style: none !important;
|
||||||
border-radius: 0;
|
border-radius: 0 !important;
|
||||||
padding-left: 7px;
|
padding-left: 7px !important;
|
||||||
padding-right: 3px;
|
padding-right: 3px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
|
@conditionalForwardWithUrlbar@:not([switchingtabs]) > #forward-button {
|
||||||
|
|
@ -568,59 +564,59 @@ menuitem.bookmark-item {
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #back-button {
|
#back-button {
|
||||||
padding-top: 3px;
|
padding-top: 3px !important;
|
||||||
padding-bottom: 3px;
|
padding-bottom: 3px !important;
|
||||||
-moz-padding-start: 5px;
|
-moz-padding-start: 5px !important;
|
||||||
-moz-padding-end: 0;
|
-moz-padding-end: 0 !important;
|
||||||
position: relative;
|
position: relative !important;
|
||||||
z-index: 1;
|
z-index: 1 !important;
|
||||||
border-radius: 0 10000px 10000px 0;
|
border-radius: 0 10000px 10000px 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #back-button:-moz-locale-dir(rtl) {
|
#back-button:-moz-locale-dir(rtl) {
|
||||||
border-radius: 10000px 0 0 10000px;
|
border-radius: 10000px 0 0 10000px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #back-button > menupopup {
|
#back-button > menupopup {
|
||||||
margin-top: -1px;
|
margin-top: -1px !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #back-button > .toolbarbutton-icon {
|
#back-button > .toolbarbutton-icon {
|
||||||
border-radius: 10000px;
|
border-radius: 10000px !important;
|
||||||
padding: 5px;
|
padding: 5px !important;
|
||||||
border: none;
|
border: none !important;
|
||||||
background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1));
|
background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.1)) !important;
|
||||||
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
|
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
|
||||||
0 0 0 1px hsla(0,0%,100%,.3) inset,
|
0 0 0 1px hsla(0,0%,100%,.3) inset,
|
||||||
0 0 0 1px hsla(210,54%,20%,.25),
|
0 0 0 1px hsla(210,54%,20%,.25),
|
||||||
0 1px 0 hsla(210,54%,20%,.35);
|
0 1px 0 hsla(210,54%,20%,.35) !important;
|
||||||
transition-property: background-color, box-shadow;
|
transition-property: background-color, box-shadow;
|
||||||
transition-duration: 250ms;
|
transition-duration: 250ms;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
|
#back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon {
|
||||||
background-color: hsla(210,48%,96%,.75);
|
background-color: hsla(210,48%,96%,.75) !important;
|
||||||
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
|
box-shadow: 0 1px 0 hsla(0,0%,100%,.3) inset,
|
||||||
0 0 0 1px hsla(0,0%,100%,.3) inset,
|
0 0 0 1px hsla(0,0%,100%,.3) inset,
|
||||||
0 0 0 1px hsla(210,54%,20%,.3),
|
0 0 0 1px hsla(210,54%,20%,.3),
|
||||||
0 1px 0 hsla(210,54%,20%,.4),
|
0 1px 0 hsla(210,54%,20%,.4),
|
||||||
0 0 4px hsla(210,54%,20%,.2);
|
0 0 4px hsla(210,54%,20%,.2) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
|
#back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon,
|
||||||
@conditionalForwardWithUrlbar@ > #back-button[open="true"] > .toolbarbutton-icon {
|
#back-button[open="true"] > .toolbarbutton-icon {
|
||||||
background-color: hsla(210,54%,20%,.15);
|
background-color: hsla(210,54%,20%,.15) !important;
|
||||||
box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
|
box-shadow: 0 1px 1px hsla(210,54%,20%,.1) inset,
|
||||||
0 0 1px hsla(210,54%,20%,.2) inset,
|
0 0 1px hsla(210,54%,20%,.2) inset,
|
||||||
0 0 0 1px hsla(210,54%,20%,.4),
|
0 0 0 1px hsla(210,54%,20%,.4),
|
||||||
0 1px 0 hsla(210,54%,20%,.2);
|
0 1px 0 hsla(210,54%,20%,.2) !important;
|
||||||
transition: none;
|
transition: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ > #back-button[disabled] > .toolbarbutton-icon {
|
#back-button[disabled] > .toolbarbutton-icon {
|
||||||
box-shadow: 0 0 0 1px hsla(210,54%,20%,.55),
|
box-shadow: 0 0 0 1px hsla(210,54%,20%,.55),
|
||||||
0 1px 0 hsla(210,54%,20%,.65);
|
0 1px 0 hsla(210,54%,20%,.65) !important;
|
||||||
transition: none;
|
transition: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -772,53 +768,53 @@ menuitem.bookmark-item {
|
||||||
color: black;
|
color: black;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper {
|
||||||
padding-left: @conditionalForwardWithUrlbarWidth@px;
|
padding-left: @conditionalForwardWithUrlbarWidth@px;
|
||||||
-moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
|
-moz-margin-start: -@conditionalForwardWithUrlbarWidth@px;
|
||||||
position: relative;
|
position: relative;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar {
|
||||||
-moz-border-start: none;
|
-moz-border-start: none;
|
||||||
margin-left: 0;
|
margin-left: 0;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@:not([switchingtabs]) + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
|
||||||
transition: margin-left @forwardTransitionLength@ ease-out;
|
transition: margin-left @forwardTransitionLength@ ease-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(ltr) {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) {
|
||||||
border-top-left-radius: 0;
|
border-top-left-radius: 0;
|
||||||
border-bottom-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
|
||||||
border-top-right-radius: 0;
|
border-top-right-radius: 0;
|
||||||
border-bottom-right-radius: 0;
|
border-bottom-right-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper {
|
||||||
clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");
|
clip-path: url("chrome://browser/content/browser.xul#windows-urlbar-back-button-clip-path");
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar {
|
||||||
margin-left: -@conditionalForwardWithUrlbarWidth@px;
|
margin-left: -@conditionalForwardWithUrlbarWidth@px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar {
|
||||||
/* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
|
/* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */
|
||||||
transition-delay: 100s;
|
transition-delay: 100s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar {
|
||||||
/* when not hovered anymore, trigger a new transition to hide the forward button immediately */
|
/* when not hovered anymore, trigger a new transition to hide the forward button immediately */
|
||||||
margin-left: -@conditionalForwardWithUrlbarWidth@.01px;
|
margin-left: -@conditionalForwardWithUrlbarWidth@.01px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container:-moz-locale-dir(rtl),
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper:-moz-locale-dir(rtl),
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) {
|
||||||
/* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */
|
/* let windows-urlbar-back-button-mask clip the urlbar's right side for RTL */
|
||||||
transform: scaleX(-1);
|
transform: scaleX(-1);
|
||||||
}
|
}
|
||||||
|
|
@ -877,7 +873,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
|
||||||
background: transparent;
|
background: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
#urlbar-search-splitter + #urlbar-container > #urlbar ,
|
#urlbar-search-splitter + #urlbar-container > #urlbar-wrapper > #urlbar,
|
||||||
#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
|
#urlbar-search-splitter + #search-container > #searchbar > .searchbar-textbox {
|
||||||
-moz-margin-start: 0;
|
-moz-margin-start: 0;
|
||||||
}
|
}
|
||||||
|
|
@ -916,31 +912,31 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar > #identity-box {
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
transition: padding-left;
|
transition: padding-left;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
||||||
padding-right: 5px;
|
padding-right: 5px;
|
||||||
transition: padding-right;
|
transition: padding-right;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:hover:not([switchingtabs]) > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box {
|
||||||
/* forward button hiding is delayed when hovered */
|
/* forward button hiding is delayed when hovered */
|
||||||
transition-delay: 100s;
|
transition-delay: 100s;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) {
|
||||||
/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
|
/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
|
||||||
padding-left: 5.01px;
|
padding-left: 5.01px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
@conditionalForwardWithUrlbar@[forwarddisabled]:not(:hover) > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) {
|
||||||
/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
|
/* when not hovered anymore, trigger a new non-delayed transition to react to the forward button hiding */
|
||||||
padding-right: 5.01px;
|
padding-right: 5.01px;
|
||||||
}
|
}
|
||||||
|
|
@ -999,7 +995,7 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder,
|
||||||
-moz-image-region: rect(0, 16px, 16px, 0);
|
-moz-image-region: rect(0, 16px, 16px, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@ + #urlbar-container > #urlbar > #identity-box > #page-proxy-favicon {
|
@conditionalForwardWithUrlbar@ > #urlbar-wrapper > #urlbar > #identity-box > #page-proxy-favicon {
|
||||||
-moz-margin-end: 1px;
|
-moz-margin-end: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1103,7 +1099,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
||||||
|
|
||||||
/* combined go/reload/stop button in location bar */
|
/* combined go/reload/stop button in location bar */
|
||||||
|
|
||||||
#go-button,
|
|
||||||
#urlbar > toolbarbutton {
|
#urlbar > toolbarbutton {
|
||||||
-moz-appearance: none;
|
-moz-appearance: none;
|
||||||
padding: 0 2px;
|
padding: 0 2px;
|
||||||
|
|
@ -1112,10 +1107,6 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
||||||
list-style-image: url("chrome://browser/skin/reload-stop-go.png");
|
list-style-image: url("chrome://browser/skin/reload-stop-go.png");
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button {
|
|
||||||
padding: 0 3px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#urlbar-reload-button {
|
#urlbar-reload-button {
|
||||||
-moz-image-region: rect(0, 14px, 14px, 0);
|
-moz-image-region: rect(0, 14px, 14px, 0);
|
||||||
}
|
}
|
||||||
|
|
@ -1134,24 +1125,20 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
|
||||||
transform: scaleX(-1);
|
transform: scaleX(-1);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button,
|
|
||||||
#urlbar-go-button {
|
#urlbar-go-button {
|
||||||
-moz-image-region: rect(0, 42px, 14px, 28px);
|
-moz-image-region: rect(0, 42px, 14px, 28px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button:hover,
|
|
||||||
#urlbar-go-button:hover {
|
#urlbar-go-button:hover {
|
||||||
background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0));
|
background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.2), hsla(110,70%,50%,0));
|
||||||
-moz-image-region: rect(14px, 42px, 28px, 28px);
|
-moz-image-region: rect(14px, 42px, 28px, 28px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button:hover:active,
|
|
||||||
#urlbar-go-button:hover:active {
|
#urlbar-go-button:hover:active {
|
||||||
background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0));
|
background-image: radial-gradient(circle closest-side, hsla(110,70%,50%,.1), hsla(110,70%,50%,0));
|
||||||
-moz-image-region: rect(28px, 42px, 42px, 28px);
|
-moz-image-region: rect(28px, 42px, 42px, 28px);
|
||||||
}
|
}
|
||||||
|
|
||||||
#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon,
|
|
||||||
#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
|
#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon {
|
||||||
transform: scaleX(-1);
|
transform: scaleX(-1);
|
||||||
}
|
}
|
||||||
|
|
@ -1841,7 +1828,7 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] {
|
||||||
-moz-margin-end: -8px;
|
-moz-margin-end: -8px;
|
||||||
}
|
}
|
||||||
|
|
||||||
@conditionalForwardWithUrlbar@[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box {
|
@conditionalForwardWithUrlbar@[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box {
|
||||||
padding-left: 5px;
|
padding-left: 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Загрузка…
Ссылка в новой задаче