Bug 888115 - rename customizableui-areatype and customizableui-anchorid to cui-areatype/cui-anchorid to save our poor fingers, r=jaws

This commit is contained in:
Gijs Kruitbosch 2013-10-22 22:26:09 +02:00
parent 606bc1b7d1
commit 911c5803db
13 changed files with 199 additions and 199 deletions

View File

@ -197,18 +197,18 @@ toolbar[customizing] > .overflow-button {
#bookmarks-toolbar-placeholder,
toolbarpaletteitem > #personal-bookmarks > #PlacesToolbar,
#personal-bookmarks[customizableui-areatype="menu-panel"] > #PlacesToolbar,
#personal-bookmarks[customizableui-areatype="toolbar"].overflowedItem > #PlacesToolbar {
#personal-bookmarks[cui-areatype="menu-panel"] > #PlacesToolbar,
#personal-bookmarks[cui-areatype="toolbar"].overflowedItem > #PlacesToolbar {
display: none;
}
toolbarpaletteitem > #personal-bookmarks > #bookmarks-toolbar-placeholder,
#personal-bookmarks[customizableui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder,
#personal-bookmarks[customizableui-areatype="toolbar"].overflowedItem > #bookmarks-toolbar-placeholder {
#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder,
#personal-bookmarks[cui-areatype="toolbar"].overflowedItem > #bookmarks-toolbar-placeholder {
display: -moz-box;
}
#zoom-controls[customizableui-areatype="toolbar"]:not(.overflowedItem) > #zoom-reset-button > .toolbarbutton-text {
#zoom-controls[cui-areatype="toolbar"]:not(.overflowedItem) > #zoom-reset-button > .toolbarbutton-text {
display: -moz-box;
}

View File

@ -464,7 +464,7 @@
#endif
context="toolbar-context-menu">
<toolbaritem id="menubar-items" align="center"
customizableui-areatype="toolbar">
cui-areatype="toolbar">
# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by
# hiddenWindow.xul.
#include browser-menubar.inc
@ -496,7 +496,7 @@
flex="1"
setfocus="false"
tooltip="tabbrowser-tab-tooltip"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
stopwatchid="FX_TAB_CLICK_MS">
<tab class="tabbrowser-tab" selected="true" fadein="true"/>
</tabs>
@ -511,7 +511,7 @@
ondragover="newTabButtonObserver.onDragOver(event)"
ondragenter="newTabButtonObserver.onDragOver(event)"
ondragexit="newTabButtonObserver.onDragExit(event)"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
removable="true"/>
<toolbarbutton id="alltabs-button"
@ -527,7 +527,7 @@
key="key_tabview"
label="&viewTabGroups.label;"
command="Browser:ToggleTabView"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
observes="tabviewGroupsNumber"/>
<menuseparator id="alltabs-popup-separator"/>
</menupopup>
@ -537,7 +537,7 @@
class="close-button tabs-closebutton close-icon"
command="cmd_close"
label="&closeTab.label;"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
tooltiptext="&closeTab.label;"/>
#ifdef CAN_DRAW_IN_TITLEBAR
@ -577,7 +577,7 @@
<hbox id="nav-bar-customizationtarget" class="customization-target" flex="1">
<toolbaritem id="urlbar-container" flex="400" persist="width"
forwarddisabled="true" title="&locationItem.title;" removable="false"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
class="chromeclass-location" overflows="false">
<toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
label="&backCmd.label;"
@ -686,7 +686,7 @@
<toolbaritem id="search-container" title="&searchItem.title;"
align="center" class="chromeclass-toolbar-additional panel-wide-item"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
flex="100" persist="width" removable="true">
<searchbar id="searchbar" flex="1"/>
</toolbaritem>
@ -698,7 +698,7 @@
orient="horizontal"
label="&webrtcIndicatorButton.label;"
tooltiptext="&webrtcIndicatorButton.tooltip;"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
overflows="false">
<menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);"
onpopuphiding="WebrtcIndicator.clearPopup(this);"
@ -716,7 +716,7 @@
ondragover="PlacesMenuDNDHandler.onDragOver(event);"
ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
ondrop="PlacesMenuDNDHandler.onDrop(event);"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
oncommand="BookmarkingUI.onCommand(event);">
<menupopup id="BMB_bookmarksPopup"
placespopup="true"
@ -804,7 +804,7 @@
ondragenter="DownloadsIndicatorView.onDragOver(event);"
label="&downloads.label;"
removable="true"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
tooltiptext="&downloads.tooltip;"/>
<toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
@ -815,7 +815,7 @@
ondrop="homeButtonObserver.onDrop(event)"
ondragexit="homeButtonObserver.onDragExit(event)"
onclick="BrowserGoHome(event);"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
@ -825,7 +825,7 @@
overflows="false"
label="&sharePageCmd.label;"
tooltiptext="&sharePageCmd.label;"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
command="Social:SharePage"/>
<toolbaritem id="social-toolbar-item"
@ -834,7 +834,7 @@
title="&socialToolbar.title;"
hidden="true"
overflows="false"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
observes="socialActiveBroadcaster">
<toolbarbutton id="social-notification-icon" class="default-notification-icon toolbarbutton-1 notification-anchor-icon"
oncommand="PopupNotifications._reshowNotifications(this,
@ -925,7 +925,7 @@
<toolbaritem id="personal-bookmarks"
flex="1"
title="&bookmarksToolbarItem.label;"
customizableui-areatype="toolbar"
cui-areatype="toolbar"
removable="true">
<toolbarbutton id="bookmarks-toolbar-placeholder"
type="wrap"

View File

@ -688,16 +688,16 @@ let CustomizableUIInternal = {
"associated with it.");
}
aNode.setAttribute("customizableui-areatype", props.get("type") || "");
aNode.setAttribute("cui-areatype", props.get("type") || "");
let anchor = props.get("anchor");
if (anchor) {
aNode.setAttribute("customizableui-anchorid", anchor);
aNode.setAttribute("cui-anchorid", anchor);
}
},
removeLocationAttributes: function(aNode) {
aNode.removeAttribute("customizableui-areatype");
aNode.removeAttribute("customizableui-anchorid");
aNode.removeAttribute("cui-areatype");
aNode.removeAttribute("cui-anchorid");
},
insertNode: function(aWidgetId, aArea, aPosition, isNew) {
@ -2194,7 +2194,7 @@ function WidgetSingleWrapper(aWidget, aNode) {
anchorId = gAreas.get(placement.area).get("anchor");
}
if (!anchorId) {
anchorId = aNode.getAttribute("customizableui-anchorid");
anchorId = aNode.getAttribute("cui-anchorid");
}
return anchorId ? aNode.ownerDocument.getElementById(anchorId)
@ -2283,7 +2283,7 @@ function XULWidgetSingleWrapper(aWidgetId, aNode) {
anchorId = gAreas.get(placement.area).get("anchor");
}
if (!anchorId) {
anchorId = aNode.getAttribute("customizableui-anchorid");
anchorId = aNode.getAttribute("cui-anchorid");
}
return anchorId ? aNode.ownerDocument.getElementById(anchorId)
@ -2422,7 +2422,7 @@ OverflowableToolbar.prototype = {
if (child.getAttribute("overflows") != "false") {
this._collapsed.set(child.id, this._target.clientWidth);
child.classList.add("overflowedItem");
child.setAttribute("customizableui-anchorid", this._chevron.id);
child.setAttribute("cui-anchorid", this._chevron.id);
this._list.insertBefore(child, this._list.firstChild);
if (!this._toolbar.hasAttribute("overflowing")) {
@ -2477,7 +2477,7 @@ OverflowableToolbar.prototype = {
if (!inserted) {
this._target.appendChild(child);
}
child.removeAttribute("customizableui-anchorid");
child.removeAttribute("cui-anchorid");
child.classList.remove("overflowedItem");
}
@ -2551,7 +2551,7 @@ OverflowableToolbar.prototype = {
let prevId = aNode.previousSibling.id;
let minSize = this._collapsed.get(prevId);
this._collapsed.set(aNode.id, minSize);
aNode.setAttribute("customizableui-anchorid", this._chevron.id);
aNode.setAttribute("cui-anchorid", this._chevron.id);
aNode.classList.add("overflowedItem");
}
// If it is not overflowed and not in the toolbar, and was not overflowed
@ -2568,7 +2568,7 @@ OverflowableToolbar.prototype = {
// ... and isn't anymore, let's remove our bookkeeping:
if (!nowOverflowed) {
this._collapsed.delete(aNode.id);
aNode.removeAttribute("customizableui-anchorid");
aNode.removeAttribute("cui-anchorid");
aNode.classList.remove("overflowedItem");
if (!this._collapsed.size) {

View File

@ -1217,7 +1217,7 @@ CustomizeMode.prototype = {
aDragOverNode.parentNode.insertBefore(aDraggedItem, aDragOverNode);
// Update the node's areaType.
let areaType = CustomizableUI.getAreaType(targetArea.id);
const kAreaType = "customizableui-areatype";
const kAreaType = "cui-areatype";
let currentType = aDraggedItem.hasAttribute(kAreaType) &&
aDraggedItem.getAttribute(kAreaType);
if (areaType)

View File

@ -72,7 +72,7 @@
/* Places toolbar */
toolbarbutton.bookmark-item,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder {
margin: 0;
padding: 2px 3px;
}
@ -86,14 +86,14 @@ toolbarbutton.bookmark-item[open="true"] {
}
.bookmark-item > .toolbarbutton-icon,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
width: 16px;
height: 16px;
}
/* Force the display of the label for bookmarks */
.bookmark-item > .toolbarbutton-text,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
display: -moz-box !important;
}
@ -1252,15 +1252,15 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
/* bookmarks menu-button */
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker {
-moz-appearance: none !important;
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
padding: 9px 3px;
}
#bookmarks-menu-button[customizableui-areatype="toolbar"].bookmark-item > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
#bookmarks-menu-button[cui-areatype="toolbar"].bookmark-item > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon,
#bookmarks-menu-button.bookmark-item {
list-style-image: url("chrome://browser/skin/Toolbar-small.png");
}
@ -1273,15 +1273,15 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
-moz-image-region: rect(16px 144px 32px 128px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"].bookmark-item > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"].bookmark-item > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-moz-image-region: rect(0px 160px 16px 144px);
}
#bookmarks-menu-button[disabled][customizableui-areatype="toolbar"] > .toolbarbutton-icon,
#bookmarks-menu-button[disabled][customizableui-areatype="toolbar"] > .toolbarbutton-menu-dropmarker,
#bookmarks-menu-button[disabled][customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker,
#bookmarks-menu-button[disabled][customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-icon,
#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-menu-dropmarker,
#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker,
#bookmarks-menu-button[disabled][cui-areatype="toolbar"] > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button[disabled] > .toolbarbutton-icon {
opacity: .4;
}

View File

@ -19,12 +19,12 @@
/*** Main indicator icon ***/
#downloads-button[customizableui-areatype="toolbar"] > #downloads-indicator-anchor > #downloads-indicator-icon {
#downloads-button[cui-areatype="toolbar"] > #downloads-indicator-anchor > #downloads-indicator-icon {
background: -moz-image-rect(url("chrome://browser/skin/Toolbar.png"),
0, 198, 18, 180) center no-repeat;
}
#downloads-button[customizableui-areatype="toolbar"][attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
#downloads-button[cui-areatype="toolbar"][attention] > #downloads-indicator-anchor > #downloads-indicator-icon {
background-image: url("chrome://browser/skin/downloads/download-glow.png");
}

View File

@ -9,7 +9,7 @@
%define forwardTransitionLength 150ms
%define conditionalForwardWithUrlbar window:not([chromehidden~="toolbar"]) #urlbar-container
%define conditionalForwardWithUrlbarWidth 27
%define toolbarButtonPressed :hover:active:not([disabled="true"]):not([customizableui-areatype="menu-panel"])
%define toolbarButtonPressed :hover:active:not([disabled="true"]):not([cui-areatype="menu-panel"])
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
@namespace html url("http://www.w3.org/1999/xhtml");
@ -159,7 +159,7 @@ toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon {
/* ----- BOOKMARK BUTTONS ----- */
toolbarbutton.bookmark-item,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder {
font-weight: bold;
color: #222;
border: 0;
@ -188,7 +188,7 @@ toolbarbutton.bookmark-item,
}
.bookmark-item > .toolbarbutton-text,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
display: -moz-box !important; /* Force the display of the label for bookmarks */
margin: 0 !important;
}
@ -228,7 +228,7 @@ toolbarbutton.bookmark-item > menupopup {
}
.bookmark-item > .toolbarbutton-icon,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
width: 16px;
min-height: 16px;
max-height: 16px;
@ -236,7 +236,7 @@ toolbarbutton.bookmark-item > menupopup {
.bookmark-item > .toolbarbutton-icon[label]:not([label=""]),
.bookmark-item > .toolbarbutton-icon[type="menu"],
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon[label]:not([label=""]) {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon[label]:not([label=""]) {
-moz-margin-end: 5px;
}
@ -331,7 +331,7 @@ toolbarbutton.bookmark-item > menupopup {
@media (min-resolution: 2dppx) {
.bookmark-item > .toolbarbutton-icon,
.bookmark-item > .menu-iconic-left > .menu-iconic-icon,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
image-rendering: -moz-crisp-edges;
}
}
@ -458,11 +458,11 @@ toolbarbutton.bookmark-item > menupopup {
-moz-image-region: rect(18px, 162px, 36px, 144px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-moz-image-region: rect(0px, 630px, 18px, 612px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
-moz-image-region: rect(18px, 630px, 36px, 612px);
}
@ -591,7 +591,7 @@ toolbarbutton.bookmark-item > menupopup {
* OSX has a unique set of icons when fullscreen is in the checked state.
*/
#fullscreen-button[checked="true"]:not([customizableui-areatype="menu-panel"]) {
#fullscreen-button[checked="true"]:not([cui-areatype="menu-panel"]) {
-moz-image-region: rect(36px, 432px, 54px, 414px);
}
@ -605,12 +605,12 @@ toolbarbutton.bookmark-item > menupopup {
to avoid potentially breaking add-on toolbar buttons. */
:-moz-any(@primaryToolbarButtons@),
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
list-style-image: url("chrome://browser/skin/Toolbar@2x.png");
}
:-moz-any(@primaryToolbarButtons@):-moz-lwtheme-brighttext,
#bookmarks-menu-button[customizableui-areatype="toolbar"]:-moz-lwtheme-brighttext > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"]:-moz-lwtheme-brighttext > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
list-style-image: url("chrome://browser/skin/Toolbar-inverted@2x.png");
}
@ -630,197 +630,197 @@ toolbarbutton.bookmark-item > menupopup {
-moz-image-region: rect(36px, 144px, 72px, 108px);
}
#home-button[customizableui-areatype="toolbar"] {
#home-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 252px, 36px, 216px);
}
#home-button[customizableui-areatype="toolbar"]:hover:active {
#home-button[cui-areatype="toolbar"]:hover:active {
-moz-image-region: rect(36px, 252px, 72px, 216px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] {
#bookmarks-menu-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 288px, 36px, 252px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#bookmarks-menu-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 288px, 72px, 252px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"][open] {
#bookmarks-menu-button[cui-areatype="toolbar"][open] {
-moz-image-region: rect(72px, 288px, 108px, 252px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"][starred] {
#bookmarks-menu-button[cui-areatype="toolbar"][starred] {
-moz-image-region: rect(0, 324px, 36px, 288px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"][starred]:hover:active:not([disabled="true"]) {
#bookmarks-menu-button[cui-areatype="toolbar"][starred]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 324px, 72px, 288px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-moz-image-region: rect(0px, 1260px, 36px, 1224px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker:hover:active:not([disabled="true"]) > .dropmarker-icon {
-moz-image-region: rect(36px, 1260px, 72px, 1224px);
}
#history-panelmenu[customizableui-areatype="toolbar"] {
#history-panelmenu[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 360px, 36px, 324px);
}
#history-panelmenu[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#history-panelmenu[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 360px, 72px, 324px);
}
#history-panelmenu[customizableui-areatype="toolbar"][open] {
#history-panelmenu[cui-areatype="toolbar"][open] {
-moz-image-region: rect(72px, 360px, 108px, 324px);
}
#downloads-indicator[customizableui-areatype="toolbar"],
#downloads-button[customizableui-areatype="toolbar"] {
#downloads-indicator[cui-areatype="toolbar"],
#downloads-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 396px, 36px, 360px);
}
#downloads-indicator[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]),
#downloads-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#downloads-indicator[cui-areatype="toolbar"]:hover:active:not([disabled="true"]),
#downloads-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 396px, 72px, 360px);
}
#add-ons-button[customizableui-areatype="toolbar"] {
#add-ons-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 432px, 36px, 396px);
}
#add-ons-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#add-ons-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 432px, 72px, 396px);
}
#open-file-button[customizableui-areatype="toolbar"] {
#open-file-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 468px, 36px, 432px);
}
#open-file-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#open-file-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 468px, 72px, 432px);
}
#save-page-button[customizableui-areatype="toolbar"] {
#save-page-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 504px, 36px, 468px);
}
#save-page-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#save-page-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 504px, 72px, 468px);
}
#sync-button[customizableui-areatype="toolbar"] {
#sync-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 540px, 36px, 504px);
}
#sync-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#sync-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 540px, 72px, 504px);
}
#feed-button[customizableui-areatype="toolbar"] {
#feed-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 576px, 36px, 540px);
}
#feed-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#feed-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 576px, 72px, 540px);
}
#social-share-button[customizableui-areatype="toolbar"] {
#social-share-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 612px, 36px, 576px);
}
#social-share-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#social-share-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 612px, 72px, 576px);
}
#characterencoding-button[customizableui-areatype="toolbar"] {
#characterencoding-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 648px, 36px, 612px);
}
#characterencoding-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#characterencoding-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 648px, 72px, 612px);
}
#characterencoding-button[customizableui-areatype="toolbar"][open] {
#characterencoding-button[cui-areatype="toolbar"][open] {
-moz-image-region: rect(72px, 648px, 108px, 612px);
}
#new-window-button[customizableui-areatype="toolbar"] {
#new-window-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 684px, 36px, 648px);
}
#new-window-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#new-window-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 684px, 72px, 648px);
}
#new-tab-button[customizableui-areatype="toolbar"] {
#new-tab-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 720px, 36px, 684px);
}
#new-tab-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#new-tab-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 720px, 72px, 684px);
}
#privatebrowsing-button[customizableui-areatype="toolbar"] {
#privatebrowsing-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 756px, 36px, 720px);
}
#privatebrowsing-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#privatebrowsing-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 756px, 72px, 720px);
}
#find-button[customizableui-areatype="toolbar"] {
#find-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 792px, 36px, 756px);
}
#find-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#find-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 792px, 72px, 756px);
}
#print-button[customizableui-areatype="toolbar"] {
#print-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 828px, 36px, 792px);
}
#print-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#print-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 828px, 72px, 792px);
}
#fullscreen-button[customizableui-areatype="toolbar"] {
#fullscreen-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 864px, 36px, 828px);
}
#fullscreen-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#fullscreen-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 864px, 72px, 828px);
}
#fullscreen-button[customizableui-areatype="toolbar"][checked="true"] {
#fullscreen-button[cui-areatype="toolbar"][checked="true"] {
-moz-image-region: rect(72px, 864px, 108px, 828px);
}
#fullscreen-button[customizableui-areatype="toolbar"][checked="true"]:hover:active:not([disabled="true"]) {
#fullscreen-button[cui-areatype="toolbar"][checked="true"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(108px, 864px, 144px, 828px);
}
#developer-button[customizableui-areatype="toolbar"] {
#developer-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 900px, 36px, 864px);
}
#developer-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#developer-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 900px, 72px, 864px);
}
#developer-button[customizableui-areatype="toolbar"][open] {
#developer-button[cui-areatype="toolbar"][open] {
-moz-image-region: rect(72px, 900px, 108px, 864px);
}
#preferences-button[customizableui-areatype="toolbar"] {
#preferences-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 936px, 36px, 900px);
}
#preferences-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#preferences-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 936px, 72px, 900px);
}
@ -836,51 +836,51 @@ toolbarbutton.bookmark-item > menupopup {
-moz-image-region: rect(72px, 972px, 108px, 936px);
}
#edit-controls[customizableui-areatype="toolbar"] > #cut-button {
#edit-controls[cui-areatype="toolbar"] > #cut-button {
-moz-image-region: rect(0, 1008px, 36px, 972px);
}
#edit-controls[customizableui-areatype="toolbar"] > #cut-button:hover:active:not([disabled="true"]) {
#edit-controls[cui-areatype="toolbar"] > #cut-button:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 1008px, 72px, 972px);
}
#edit-controls[customizableui-areatype="toolbar"] > #copy-button {
#edit-controls[cui-areatype="toolbar"] > #copy-button {
-moz-image-region: rect(0, 1044px, 36px, 1008px);
}
#edit-controls[customizableui-areatype="toolbar"] > #copy-button:hover:active:not([disabled="true"]) {
#edit-controls[cui-areatype="toolbar"] > #copy-button:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 1044px, 72px, 1008px);
}
#edit-controls[customizableui-areatype="toolbar"] > #paste-button {
#edit-controls[cui-areatype="toolbar"] > #paste-button {
-moz-image-region: rect(0, 1080px, 36px, 1044px);
}
#edit-controls[customizableui-areatype="toolbar"] > #paste-button:hover:active:not([disabled="true"]) {
#edit-controls[cui-areatype="toolbar"] > #paste-button:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 1080px, 72px, 1044px);
}
#zoom-controls[customizableui-areatype="toolbar"] > #zoom-out-button {
#zoom-controls[cui-areatype="toolbar"] > #zoom-out-button {
-moz-image-region: rect(0, 1116px, 36px, 1080px);
}
#zoom-controls[customizableui-areatype="toolbar"] > #zoom-out-button:hover:active:not([disabled="true"]) {
#zoom-controls[cui-areatype="toolbar"] > #zoom-out-button:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 1116px, 72px, 1080px);
}
#zoom-controls[customizableui-areatype="toolbar"] > #zoom-in-button {
#zoom-controls[cui-areatype="toolbar"] > #zoom-in-button {
-moz-image-region: rect(0, 1152px, 36px, 1116px);
}
#zoom-controls[customizableui-areatype="toolbar"] > #zoom-in-button:hover:active:not([disabled="true"]) {
#zoom-controls[cui-areatype="toolbar"] > #zoom-in-button:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 1152px, 72px, 1116px);
}
#webrtc-status-button[customizableui-areatype="toolbar"] {
#webrtc-status-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 1188px, 36px, 1152px);
}
#webrtc-status-button[customizableui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
#webrtc-status-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-moz-image-region: rect(36px, 1188px, 72px, 1152px);
}
@ -910,107 +910,107 @@ toolbarbutton.bookmark-item > menupopup {
/* Menu panel and palette styles */
:-moz-any(@primaryToolbarButtons@)[customizableui-areatype="menu-panel"],
:-moz-any(@primaryToolbarButtons@)[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > :-moz-any(@primaryToolbarButtons@) {
list-style-image: url(chrome://browser/skin/menuPanel@2x.png);
}
#home-button[customizableui-areatype="menu-panel"],
#home-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #home-button {
-moz-image-region: rect(0px, 256px, 64px, 192px);
}
#bookmarks-menu-button[customizableui-areatype="menu-panel"],
#bookmarks-menu-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #bookmarks-menu-button {
-moz-image-region: rect(0px, 320px, 64px, 256px);
}
#bookmarks-menu-button[starred][customizableui-areatype="menu-panel"] {
#bookmarks-menu-button[starred][cui-areatype="menu-panel"] {
-moz-image-region: rect(0px, 384px, 64px, 320px);
}
#history-panelmenu[customizableui-areatype="menu-panel"],
#history-panelmenu[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #history-panelmenu {
-moz-image-region: rect(0px, 448px, 64px, 384px);
}
#downloads-button[customizableui-areatype="menu-panel"],
#downloads-indicator[customizableui-areatype="menu-panel"],
#downloads-button[cui-areatype="menu-panel"],
#downloads-indicator[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #downloads-button {
-moz-image-region: rect(0px, 512px, 64px, 448px);
}
#add-ons-button[customizableui-areatype="menu-panel"],
#add-ons-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #add-ons-button {
-moz-image-region: rect(0px, 576px, 64px, 512px);
}
#open-file-button[customizableui-areatype="menu-panel"],
#open-file-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #open-file-button {
-moz-image-region: rect(0px, 640px, 64px, 576px);
}
#save-page-button[customizableui-areatype="menu-panel"],
#save-page-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #save-page-button {
-moz-image-region: rect(0px, 704px, 64px, 640px);
}
#sync-button[customizableui-areatype="menu-panel"],
#sync-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #sync-button {
-moz-image-region: rect(0px, 768px, 64px, 704px);
}
#feed-button[customizableui-areatype="menu-panel"],
#feed-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #feed-button {
-moz-image-region: rect(0px, 832px, 64px, 768px);
}
#social-share-button[customizableui-areatype="menu-panel"],
#social-share-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #social-share-button {
-moz-image-region: rect(0px, 896px, 64px, 832px);
}
#characterencoding-button[customizableui-areatype="menu-panel"],
#characterencoding-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #characterencoding-button {
-moz-image-region: rect(0, 960px, 64px, 896px);
}
#new-window-button[customizableui-areatype="menu-panel"],
#new-window-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #new-window-button {
-moz-image-region: rect(0px, 1024px, 64px, 960px);
}
#new-tab-button[customizableui-areatype="menu-panel"],
#new-tab-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #new-tab-button {
-moz-image-region: rect(0px, 1088px, 64px, 1024px);
}
#privatebrowsing-button[customizableui-areatype="menu-panel"],
#privatebrowsing-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #privatebrowsing-button {
-moz-image-region: rect(0px, 1152px, 64px, 1088px);
}
#find-button[customizableui-areatype="menu-panel"],
#find-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #find-button {
-moz-image-region: rect(0px, 1280px, 64px, 1216px);
}
#print-button[customizableui-areatype="menu-panel"],
#print-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #print-button {
-moz-image-region: rect(0px, 1344px, 64px, 1280px);
}
#fullscreen-button[customizableui-areatype="menu-panel"],
#fullscreen-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #fullscreen-button {
-moz-image-region: rect(0px, 1408px, 64px, 1344px);
}
#developer-button[customizableui-areatype="menu-panel"],
#developer-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #developer-button {
-moz-image-region: rect(0px, 1472px, 64px, 1408px);
}
#preferences-button[customizableui-areatype="menu-panel"],
#preferences-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #preferences-button {
-moz-image-region: rect(0px, 1536px, 64px, 1472px);
}
@ -1411,11 +1411,11 @@ toolbarbutton.bookmark-item > menupopup {
border-bottom-left-radius: 0;
}
#zoom-controls[customizableui-areatype="toolbar"] > #zoom-reset-button {
#zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button {
margin: 0;
}
#zoom-controls[customizableui-areatype="toolbar"] > #zoom-reset-button > .toolbarbutton-text {
#zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button > .toolbarbutton-text {
margin-top: 0;
padding-top: 8px;
}
@ -1886,7 +1886,7 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url-
-moz-image-region: rect(14px, 28px, 28px, 14px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
width: 16px;
height: 16px;
}

View File

@ -60,7 +60,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button {
padding-right: 12px;
}
.panel-wide-item[customizableui-areatype="menu-panel"] > toolbarbutton,
toolbarbutton[customizableui-areatype="menu-panel"] {
.panel-wide-item[cui-areatype="menu-panel"] > toolbarbutton,
toolbarbutton[cui-areatype="menu-panel"] {
margin: 0;
}

View File

@ -1,4 +1,4 @@
%filter substitution
%define primaryToolbarButtons #back-button, #forward-button, #home-button, #print-button, #downloads-button, #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, #characterencoding-button
%define inAnyPanel :-moz-any(:not([customizableui-areatype="toolbar"]),.overflowedItem)
%define inAnyPanel :-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)

View File

@ -135,8 +135,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton,
max-width: none;
}
#edit-controls:not([customizableui-areatype="toolbar"]) > toolbarbutton,
#zoom-controls:not([customizableui-areatype="toolbar"]) > toolbarbutton {
#edit-controls:not([cui-areatype="toolbar"]) > toolbarbutton,
#zoom-controls:not([cui-areatype="toolbar"]) > toolbarbutton {
-moz-box-orient: horizontal;
min-width: 7em;
}
@ -161,7 +161,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton,
}
.panel-wide-item.overflowedItem,
.panel-wide-item[customizableui-areatype="menu-panel"] {
.panel-wide-item[cui-areatype="menu-panel"] {
-moz-box-align: stretch;
padding: .5em 0 .5em;
}
@ -171,8 +171,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton,
}
.panel-customization-placeholder-child > .toolbarbutton-icon,
toolbarbutton[customizableui-areatype="menu-panel"] > .toolbarbutton-icon,
toolbaritem[customizableui-areatype="menu-panel"] > toolbarbutton > .toolbarbutton-icon,
toolbarbutton[cui-areatype="menu-panel"] > .toolbarbutton-icon,
toolbaritem[cui-areatype="menu-panel"] > toolbarbutton > .toolbarbutton-icon,
toolbarpaletteitem[place="palette"] > toolbarbutton > .toolbarbutton-icon,
toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton > .toolbarbutton-icon,
toolbarpaletteitem[place="panel"] > toolbarbutton > .toolbarbutton-icon,
@ -357,7 +357,7 @@ toolbarbutton.panel-multiview-anchor {
color: HighlightText;
}
#bookmarks-menu-button[customizableui-areatype="menu-panel"] > .toolbarbutton-menubutton-dropmarker {
#bookmarks-menu-button[cui-areatype="menu-panel"] > .toolbarbutton-menubutton-dropmarker {
display: none;
}
@ -384,7 +384,7 @@ toolbarbutton.panel-multiview-anchor {
display: none;
}
#zoom-controls[customizableui-areatype="toolbar"] > #zoom-reset-button > .toolbarbutton-text {
#zoom-controls[cui-areatype="toolbar"] > #zoom-reset-button > .toolbarbutton-text {
min-width: 4em;
}

View File

@ -1,106 +1,106 @@
/* Menu panel and palette styles */
:-moz-any(@primaryToolbarButtons@)[customizableui-areatype="menu-panel"],
:-moz-any(@primaryToolbarButtons@)[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > :-moz-any(@primaryToolbarButtons@) {
list-style-image: url(chrome://browser/skin/menuPanel.png);
}
#home-button[customizableui-areatype="menu-panel"],
#home-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #home-button {
-moz-image-region: rect(0px, 128px, 32px, 96px);
}
#bookmarks-menu-button[customizableui-areatype="menu-panel"],
#bookmarks-menu-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #bookmarks-menu-button {
-moz-image-region: rect(0px, 160px, 32px, 128px);
}
#bookmarks-menu-button[starred][customizableui-areatype="menu-panel"] {
#bookmarks-menu-button[starred][cui-areatype="menu-panel"] {
-moz-image-region: rect(0px, 192px, 32px, 160px);
}
#history-panelmenu[customizableui-areatype="menu-panel"],
#history-panelmenu[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #history-panelmenu {
-moz-image-region: rect(0px, 224px, 32px, 192px);
}
#downloads-button[customizableui-areatype="menu-panel"],
#downloads-indicator[customizableui-areatype="menu-panel"],
#downloads-button[cui-areatype="menu-panel"],
#downloads-indicator[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #downloads-button {
-moz-image-region: rect(0px, 256px, 32px, 224px);
}
#add-ons-button[customizableui-areatype="menu-panel"],
#add-ons-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #add-ons-button {
-moz-image-region: rect(0px, 288px, 32px, 256px);
}
#open-file-button[customizableui-areatype="menu-panel"],
#open-file-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #open-file-button {
-moz-image-region: rect(0px, 320px, 32px, 288px);
}
#save-page-button[customizableui-areatype="menu-panel"],
#save-page-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #save-page-button {
-moz-image-region: rect(0px, 352px, 32px, 320px);
}
#sync-button[customizableui-areatype="menu-panel"],
#sync-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #sync-button {
-moz-image-region: rect(0px, 384px, 32px, 352px);
}
#feed-button[customizableui-areatype="menu-panel"],
#feed-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #feed-button {
-moz-image-region: rect(0px, 416px, 32px, 384px);
}
#social-share-button[customizableui-areatype="menu-panel"],
#social-share-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #social-share-button {
-moz-image-region: rect(0px, 448px, 32px, 416px);
}
#characterencoding-button[customizableui-areatype="menu-panel"],
#characterencoding-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #characterencoding-button {
-moz-image-region: rect(0px, 480px, 32px, 448px);
}
#new-window-button[customizableui-areatype="menu-panel"],
#new-window-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #new-window-button {
-moz-image-region: rect(0px, 512px, 32px, 480px);
}
#new-tab-button[customizableui-areatype="menu-panel"],
#new-tab-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #new-tab-button {
-moz-image-region: rect(0px, 544px, 32px, 512px);
}
#privatebrowsing-button[customizableui-areatype="menu-panel"],
#privatebrowsing-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #privatebrowsing-button {
-moz-image-region: rect(0px, 576px, 32px, 544px);
}
#find-button[customizableui-areatype="menu-panel"],
#find-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #find-button {
-moz-image-region: rect(0px, 640px, 32px, 608px);
}
#print-button[customizableui-areatype="menu-panel"],
#print-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #print-button {
-moz-image-region: rect(0px, 672px, 32px, 640px);
}
#fullscreen-button[customizableui-areatype="menu-panel"],
#fullscreen-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #fullscreen-button {
-moz-image-region: rect(0px, 704px, 32px, 672px);
}
#developer-button[customizableui-areatype="menu-panel"],
#developer-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #developer-button {
-moz-image-region: rect(0px, 736px, 32px, 704px);
}
#preferences-button[customizableui-areatype="menu-panel"],
#preferences-button[cui-areatype="menu-panel"],
toolbarpaletteitem[place="palette"] > #preferences-button {
-moz-image-region: rect(0px, 768px, 32px, 736px);
}

View File

@ -21,87 +21,87 @@
transform: scaleX(-1);
}
#home-button[customizableui-areatype="toolbar"] {
#home-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 126px, 18px, 108px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] {
#bookmarks-menu-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 144px, 18px, 126px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"][starred] {
#bookmarks-menu-button[cui-areatype="toolbar"][starred] {
-moz-image-region: rect(0, 162px, 18px, 144px);
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
-moz-image-region: rect(0, 630px, 18px, 612px);
}
#history-panelmenu[customizableui-areatype="toolbar"] {
#history-panelmenu[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 180px, 18px, 162px);
}
#downloads-button[customizableui-areatype="toolbar"] {
#downloads-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 198px, 18px, 180px);
}
#add-ons-button[customizableui-areatype="toolbar"] {
#add-ons-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 216px, 18px, 198px);
}
#open-file-button[customizableui-areatype="toolbar"] {
#open-file-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 234px, 18px, 216px);
}
#save-page-button[customizableui-areatype="toolbar"] {
#save-page-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 252px, 18px, 234px);
}
#sync-button[customizableui-areatype="toolbar"] {
#sync-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 270px, 18px, 252px);
}
#feed-button[customizableui-areatype="toolbar"] {
#feed-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 288px, 18px, 270px);
}
#social-share-button[customizableui-areatype="toolbar"] {
#social-share-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0px, 306px, 18px, 288px);
}
#characterencoding-button[customizableui-areatype="toolbar"]{
#characterencoding-button[cui-areatype="toolbar"]{
-moz-image-region: rect(0, 324px, 18px, 306px);
}
#new-window-button[customizableui-areatype="toolbar"] {
#new-window-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 342px, 18px, 324px);
}
#new-tab-button[customizableui-areatype="toolbar"] {
#new-tab-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 360px, 18px, 342px);
}
#privatebrowsing-button[customizableui-areatype="toolbar"] {
#privatebrowsing-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 378px, 18px, 360px);
}
#find-button[customizableui-areatype="toolbar"] {
#find-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 396px, 18px, 378px);
}
#print-button[customizableui-areatype="toolbar"] {
#print-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 414px, 18px, 396px);
}
#fullscreen-button[customizableui-areatype="toolbar"] {
#fullscreen-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 432px, 18px, 414px);
}
#developer-button[customizableui-areatype="toolbar"] {
#developer-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 450px, 18px, 432px);
}
#preferences-button[customizableui-areatype="toolbar"] {
#preferences-button[cui-areatype="toolbar"] {
-moz-image-region: rect(0, 468px, 18px, 450px);
}

View File

@ -272,7 +272,7 @@
/* ::::: bookmark buttons ::::: */
toolbarbutton.bookmark-item,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder {
margin: 0;
padding: 2px 3px;
}
@ -286,14 +286,14 @@ toolbarbutton.bookmark-item[open="true"] {
}
.bookmark-item > .toolbarbutton-icon,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon {
width: 16px;
height: 16px;
}
/* Force the display of the label for bookmarks */
.bookmark-item > .toolbarbutton-text,
#personal-bookmarks[customizableui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text {
display: -moz-box !important;
}
@ -1361,7 +1361,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
-moz-margin-start: 5px;
}
#bookmarks-menu-button[customizableui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
padding-top: 2px;
padding-bottom: 2px;
}