X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fbrowser%2Fbrowser.css;h=7dbd3dfcb06ac568df2f889a3e385f55955316bf;hp=77af9bb80f689791e6a251c328f10e96390fa9a2;hb=0ef54c720436759577528cc97d0c4cc67eb1dc92;hpb=00f971bcdc3c62e89cac2618464efbad925b40bb diff --git a/LCARStrek/browser/browser.css b/LCARStrek/browser/browser.css index 77af9bb8..7dbd3dfc 100644 --- a/LCARStrek/browser/browser.css +++ b/LCARStrek/browser/browser.css @@ -7,22 +7,28 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); @namespace html url("http://www.w3.org/1999/xhtml"); +@namespace svg url("http://www.w3.org/2000/svg"); toolbar { -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar"); } -/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */ -#navigator-toolbox:not([iconsize]) > toolbar[customizable="true"] { +toolbar[customizable="true"] { -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-browsercustom"); } +@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme), (-moz-mac-yosemite-theme) { + /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */ + toolbar[customizable="true"]:not([nowindowdrag="true"]) { + -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom"); + } +} + toolbar[type="menubar"][autohide="true"] { -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide"); } -/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */ -#navigator-toolbox:not([iconsize]) > #toolbar-menubar[autohide="true"] { +#toolbar-menubar[autohide="true"] { -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menubar-autohide-browsercustom"); } @@ -30,6 +36,10 @@ menubar { -moz-binding: url("chrome://global/skin/globalBindings.xml#menubar"); } +:root { + --verified-identity-box-backgroundcolor: #000000; +} + #menubar-items { -moz-box-orient: vertical; /* for flex hack */ } @@ -49,33 +59,49 @@ menubar { background-color: #9C9CFF; } +/* Hides the titlebar-placeholder underneath the window caption buttons when we + are not autohiding the menubar. */ +#toolbar-menubar:not([autohide="true"]) + #TabsToolbar > .titlebar-placeholder[type="caption-buttons"] { + display: none; +} + /* We want a 4px gap between the TabsToolbar and the toolbar-menubar when the toolbar-menu is displayed, and a 16px gap when it is not. 1px is taken care of by the (light) outer shadow of the tab, the remaining 3/15 are these margins. */ -#toolbar-menubar:not([autohide="true"]) ~ #TabsToolbar, -#toolbar-menubar[autohide="true"]:not([inactive]) ~ #TabsToolbar { +#toolbar-menubar:not([moz-collapsed=true]):not([autohide=true]) ~ #TabsToolbar, +#toolbar-menubar:not([moz-collapsed=true])[autohide=true]:not([inactive]) ~ #TabsToolbar { /* margin-top: 3px;*/ } -#main-window[tabsintitlebar][sizemode="normal"][chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar, -#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar { +#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen])[chromehidden~="menubar"] #toolbar-menubar ~ #TabsToolbar, +#main-window[tabsintitlebar][sizemode="normal"]:not([inFullscreen]) #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar { /* margin-top: 15px;*/ } -/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */ -#navigator-toolbox:not([iconsize]) > #toolbar-menubar:not([autohide="true"]) { - -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom"); +@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) { + /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */ + #toolbar-menubar:not([autohide="true"]) { + -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-drag-browsercustom"); + } } -#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) { - /* like menubar */ - background-color: #6000CF; - color: #FF9F00; +@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) { + /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */ + #main-window[tabsintitlebar]:not([inFullscreen="true"]) #TabsToolbar { + padding-left: 60px; + } } -#main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme):-moz-window-inactive { - background-color: #8050B0; - color: #FF9F00; +#main-window[tabsintitlebar] #toolbar-menubar .toolbar-endcap { + /* the titlebar buttons are shown right over the endcap but we have no power over the buttonbox position just for this case, so hide the endcap */ + display: none; +} + +#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[customizing-dragovertarget].customization-target::before, +#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #TabsToolbar[customizing-dragovertarget].customization-target::before, +#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #toolbar-menubar.customization-target:hover::before, +#main-window[customize-entered][tabsintitlebar]:not([inFullscreen]) #TabsToolbar.customization-target:hover::before { + outline-color: #A09090; } #navigator-toolbox { @@ -87,272 +113,77 @@ menubar { -moz-box-ordinal-group: 101; /* tabs toolbar is 100 */ height: 1px; } -#navigator-toolbox[tabsontop=false]::after, -#main-window[disablechrome] #navigator-toolbox::after { - visibility: collapse; -} - -#navigator-toolbox > toolbar:not(:-moz-lwtheme) { -} - -#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme) { - /* like menubar */ - background-color: #6000CF; - color: #FF9F00; -} -#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive { - background-color: #8050B0; - color: #FF9F00; -} -#main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar[inactive] ~ #TabsToolbar > .tabbrowser-tabs > .tabbrowser-tab { - padding-top: 3px; -} - -#main-window[tabsintitlebar] #titlebar:-moz-lwtheme { - visibility: hidden; -} -#main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme { - -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox"); - visibility: visible; -} - -#nav-bar[tabsontop="true"], -#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + toolbar, -#nav-bar[tabsontop="true"][collapsed="true"]:not([customizing]) + #customToolbars + #PersonalToolbar { - /* background-image: linear-gradient(@toolbarHighlight@, rgba(255,255,255,0)); */ -} - -#personal-bookmarks { -/* min-height: 24px; */ -} - -#print-preview-toolbar:not(:-moz-lwtheme) { - /* -moz-appearance: toolbox; */ -} - -/* ::::: app menu button ::::: */ - -#appmenu-button { - background-color: #FF9F00; - background-clip: padding-box; - border-radius: 0; - border: none; - border-right: 3px solid #000000; - color: #000000; - font-weight: bold; - padding: 1px 1.5em; - margin: 0; -} - -#appmenu-button:-moz-locale-dir(rtl) { - border-left: 3px solid #000000; - border-right: none; -} - -#main-window[privatebrowsingmode=temporary] #appmenu-button { - background-color: #6000CF; - color: #FFCF00; -} - -#appmenu-button:hover:not(:active):not([open]) { -} -#main-window[privatebrowsingmode=temporary] #appmenu-button:hover:not(:active):not([open]) { +#navigator-toolbox > toolbar { } -#appmenu-button:hover, -#appmenu-button:hover:active, -#appmenu-button[open] { - background-color: #FFCF00; - color: #000000; -} - -#appmenu-button > .button-box > .button-menu-dropmarker { - list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); - width: auto; - height: auto; - padding: 0; - margin: 0; - border: none; - background-color: transparent; - -moz-margin-start: .5em; -} - -#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .button-menu-dropmarker { - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); -} - -#appmenuPrimaryPane > menuitem, -#appmenuSecondaryPane > menuitem, -#appmenuPrimaryPane > menu { - padding: 2px; -} - -.splitmenu-menuitem { - -moz-padding-start: 2px; - padding-top: 2px; - padding-bottom: 2px; - -moz-margin-end: 1px; -} - -.splitmenu-menu { - padding-top: 2px; - padding-bottom: 2px; - -moz-box-pack: end; +#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(:-moz-lwtheme) { } -.appmenu-edit-button { +#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar) { + overflow: -moz-hidden-unscrollable; + max-height: 4em; + transition: min-height 170ms ease-out, max-height 170ms ease-out; } -.appmenu-edit-button[disabled="true"] { +#navigator-toolbox > toolbar:not(#toolbar-menubar):not(#TabsToolbar):not(#nav-bar):not(#addon-bar)[collapsed=true] { + min-height: 0.1px; + max-height: 0; + transition: min-height 170ms ease-out, max-height 170ms ease-out, visibility 170ms linear; } -#appmenuPrimaryPane { - -moz-border-end: 1px solid #9C9CFF; -} -/* - #appmenu-popup { - } - #appmenuPrimaryPane { - } - #appmenuSecondaryPane { - } - #appmenuSecondaryPane:-moz-locale-dir(rtl) { +@media (-moz-mac-graphite-theme: 0) and (-moz-mac-lion-theme: 0) { + /* This is a hackish workaround to exclude most of Mac OS until bug 1060941 gets fixed. */ + /* Indent also due to non-applicable aero rule in original Windows theme. */ + #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme), + #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme) { + /* like menubar */ + background-color: #6000CF; + color: #FF9F00; } - #appmenuSecondaryPane menupopup { + #main-window[tabsintitlebar]:not([inFullscreen]) #toolbar-menubar:not(:-moz-lwtheme):-moz-window-inactive, + #main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar:not(:-moz-lwtheme):-moz-window-inactive { + background-color: #8050B0; + color: #FF9F00; } - .appmenu-menuseparator { + #main-window[tabsintitlebar] #main-menubar > menu:not(:-moz-lwtheme) { + /*color: inherit;*/ } - .appmenu-edit-button:not([disabled]):hover { + #main-window[tabsintitlebar] #titlebar:-moz-lwtheme { + visibility: hidden; } -*/ -#appmenuSecondaryPane-spacer { - min-height: 1em; -} - -#appmenu-editmenu { - -moz-box-pack: end; -} - -#appmenu_print, -#appmenu_print_popup, -.appmenu-edit-button, -#appmenu-editmenu-cut, -#appmenu-editmenu-copy, -#appmenu-editmenu-paste, -#appmenu-quit { - list-style-image: url("appmenu-icons.png"); -} - -#appmenu-cut, -#appmenu-editmenu-cut { - -moz-image-region: rect(0 16px 16px 0); -} - -#appmenu-cut:hover:not([disabled="true"]), -#appmenu-editmenu-cut:hover:not([disabled="true"]) { - -moz-image-region: rect(16px 16px 32px 0); -} - -#appmenu-cut[disabled="true"], -#appmenu-editmenu-cut[disabled="true"] { - -moz-image-region: rect(32px 16px 48px 0); -} - -#appmenu-copy, -#appmenu-editmenu-copy { - -moz-image-region: rect(0 32px 16px 16px); -} - -#appmenu-copy:hover:not([disabled="true"]), -#appmenu-editmenu-copy:hover:not([disabled="true"]) { - -moz-image-region: rect(16px 32px 32px 16px); -} - -#appmenu-copy[disabled="true"], -#appmenu-editmenu-copy[disabled="true"] { - -moz-image-region: rect(32px 32px 48px 16px); -} - -#appmenu-paste, -#appmenu-editmenu-paste { - -moz-image-region: rect(0 48px 16px 32px); -} - -#appmenu-paste:hover:not([disabled="true"]), -#appmenu-editmenu-paste:hover:not([disabled="true"]) { - -moz-image-region: rect(16px 48px 32px 32px); -} - -#appmenu-paste[disabled="true"], -#appmenu-editmenu-paste[disabled="true"] { - -moz-image-region: rect(32px 48px 48px 32px); -} - -#appmenu_print, -#appmenu_print_popup { - -moz-image-region: rect(0 64px 16px 48px); -} - -#appmenu_print:hover:not([disabled="true"]), -#appmenu_print[open="true"], -#appmenu_print_popup:hover:not([disabled="true"]) { - -moz-image-region: rect(16px 64px 32px 48px); -} - -#appmenu-print[disabled="true"], -#appmenu_print_popup[disabled="true"] { - -moz-image-region: rect(32px 64px 48px 48px); -} - -#appmenu-quit { - -moz-image-region: rect(0 80px 16px 64px); -} - -#appmenu-quit:hover { - -moz-image-region: rect(16px 80px 32px 64px); -} - -#appmenu-edit-label { - -moz-appearance: none; - background: transparent; - font-style: italic; -} -#appmenu_bookmarks { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0px 48px 16px 32px); + #main-window[tabsintitlebar] #titlebar-content:-moz-lwtheme { + -moz-binding: url("chrome://global/content/bindings/general.xml#windowdragbox"); + visibility: visible; + } } -#appmenu_privateBrowsing, -#appmenu_newPrivateWindow { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); +@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) { + /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */ + #titlebar-buttonbox > .titlebar-button { + display: none; + } } -@media (min-resolution: 1.25dppx) { - #appmenu_privateBrowsing, - #appmenu_newPrivateWindow { - list-style-image: url("chrome://browser/skin/Privacy-32.png"); - } +#nav-bar { + /* Position the toolbar above the bottom of background tabs */ + position: relative; + z-index: 1; } -#appmenu_addons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); +#personal-bookmarks { +/* min-height: 24px; */ } -@media (min-resolution: 1.25dppx) { - #appmenu_addons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); - } +#print-preview-toolbar:not(:-moz-lwtheme) { + /* -moz-appearance: toolbox; */ } -#BMB_bookmarkThisPage, -#appmenu_bookmarkThisPage { - list-style-image: url("chrome://browser/skin/places/bookmark.png"); - -moz-image-region: rect(0 16px 16px 0); +#browser-bottombox:not(:-moz-lwtheme) { } /* ::::: titlebar ::::: */ @@ -376,21 +207,30 @@ menubar { margin-top: 4px; } +@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) { + /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */ + #main-window[sizemode="normal"] > #titlebar, + #main-window[sizemode="maximized"] > #titlebar { + margin-top: 19px; + /* There is a margin-bottom set to -23 by code. */ + } +} + /* The button box must appear on top of the navigator-toolbox in order for * click and hover mouse events to work properly for the button in the restored * window state. Otherwise, elements in the navigator-toolbox, like the menubar, * can swallow those events. It will also place the buttons above the fog on * themes with Aero Glass. */ -#titlebar-buttonbox { - margin-top: 5px; +#titlebar-buttonbox, +#main-window[sizemode="maximized"] #titlebar-buttonbox { + -moz-appearance: none; + margin-top: 6px; + margin-top: 4px; -moz-margin-end: 3px; z-index: 1; } -#main-window[sizemode="maximized"] #titlebar-buttonbox { -} - .titlebar-placeholder[type="appmenu-button"] { margin-left: 4px; } @@ -433,16 +273,58 @@ menubar { list-style-image: url("chrome://navigator/skin/icons/win-close-hover.gif"); } +@media (-moz-mac-graphite-theme), (-moz-mac-lion-theme) { + /* This is a hackish workaround to cover most of Mac OS until bug 1060941 gets fixed. */ + #titlebar-fullscreen-button { + -moz-appearance: none; + list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon.png"); + -moz-image-region: rect(0px, 16px, 16px, 0px); + } + + #titlebar-fullscreen-button:hover { + -moz-image-region: rect(0px, 32px, 16px, 16px); + } + + @media (min-resolution: 2dppx) { + #titlebar-fullscreen-button { + list-style-image: url("chrome://browser/skin/icons/mac-fullscreen-icon@2x.png"); + -moz-image-region: rect(0px, 32px, 32px, 0px); + } + + #titlebar-fullscreen-button:hover { + -moz-image-region: rect(0px, 64px, 32px, 32px); + } + } +} + + /* ::::: bookmark buttons ::::: */ -/*.bookmark-item:not(#bookmarks-menu-button) > .toolbarbutton-icon */ -.bookmark-item > .toolbarbutton-icon { +toolbarbutton.bookmark-item:not(.subviewbutton), +#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder { +/* margin: 0; + padding: 2px 3px;*/ +} + +toolbarbutton.bookmark-item:not([disabled="true"]):not(.subviewbutton):hover:active, +toolbarbutton.bookmark-item[open="true"] { +/* padding-top: 3px; + padding-bottom: 1px; + -moz-padding-start: 4px; + -moz-padding-end: 2px;*/ +} + +.bookmark-item > .toolbarbutton-icon, +#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { width: 16px; height: 16px; + -moz-margin-start: 1px; + -moz-margin-end: 2px; } -/* Prevent [mode="icons"] from hiding the label */ -.bookmark-item > .toolbarbutton-text { +/* Force the display of the label for bookmarks */ +.bookmark-item > .toolbarbutton-text, +#personal-bookmarks[cui-areatype="toolbar"] > #bookmarks-toolbar-placeholder > .toolbarbutton-text { display: -moz-box !important; } @@ -450,13 +332,75 @@ menubar { display: none; } -#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box { - background: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") no-repeat center; +#bookmarks-toolbar-placeholder { + list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important; + -moz-box-orient: horizontal; +} + +toolbarpaletteitem[place="palette"] > #personal-bookmarks > #bookmarks-toolbar-placeholder, +#personal-bookmarks[cui-areatype="menu-panel"] > #bookmarks-toolbar-placeholder { + list-style-image: url("chrome://browser/skin/places/bookmarksToolbar-menuPanel.png") !important; } -.bookmarks-toolbar-customize { - max-width: 15em !important; - list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png") !important; +/* ----- BOOKMARK STAR ANIMATION ----- */ + +@keyframes animation-bookmarkAdded { + from { transform: rotate(0deg) translateX(-16px) rotate(0deg) scale(1); opacity: 0; } + 60% { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(2.2); opacity: 1; } + 80% { opacity: 1; } + to { transform: rotate(180deg) translateX(-16px) rotate(-180deg) scale(1); opacity: 0; } +} + +@keyframes animation-bookmarkPulse { + from { transform: scale(1); } + 50% { transform: scale(1.3); } + to { transform: scale(1); } +} + +#bookmarked-notification-container { + min-height: 1px; + min-width: 1px; + height: 1px; + margin-bottom: -1px; + z-index: 5; + position: relative; +} + +#bookmarked-notification { + background-size: 16px; + background-position: center; + background-repeat: no-repeat; + width: 16px; + height: 16px; + opacity: 0; +} + +#bookmarked-notification-dropmarker-anchor { + z-index: -1; + position: relative; +} + +#bookmarked-notification-dropmarker-icon { + width: 18px; + height: 18px; + visibility: hidden; +} + +#bookmarked-notification-anchor[notification="finish"] > #bookmarked-notification { + background-image: url("chrome://browser/skin/places/bookmarks-notification-finish.png"); + animation: animation-bookmarkAdded 800ms; + animation-timing-function: ease, ease, ease; +} + +#bookmarks-menu-button[notification="finish"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { + list-style-image: none !important; +} + +#bookmarked-notification-dropmarker-anchor[notification="finish"] > #bookmarked-notification-dropmarker-icon { + visibility: visible; + animation: animation-bookmarkPulse 300ms; + animation-delay: 600ms; + animation-timing-function: ease-out; } /* ::::: bookmark menus ::::: */ @@ -467,7 +411,7 @@ menuitem.bookmark-item { max-width: 32em; } -.bookmark-item > .menu-iconic-left { +.bookmark-item:not(.subviewbutton) > .menu-iconic-left { margin-top: 0; margin-bottom: 0; } @@ -547,704 +491,941 @@ menuitem.bookmark-item { /* === BEGIN toolbarbuttons.inc.css === */ /* Whole section of this included file: */ -/* Remove |#navigator-toolbox:not([iconsize])| selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */ -#navigator-toolbox:not([iconsize]) :-moz-any(#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, - #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, - #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, - #PanelUI-menu-button, #characterencoding-button, #email-link-button), -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { +:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, + #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, + #social-share-button, #open-file-button, #find-button, #developer-button, + #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, + #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, + #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, + #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button), + +#bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/ToolbarFx.png"); } -#navigator-toolbox:not([iconsize]) #back-button { +#back-button { -moz-image-region: rect(0, 36px, 18px, 18px); } -#navigator-toolbox:not([iconsize]) #back-button:hover:not([disabled="true"]) { +#back-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 36px, 36px, 18px); } -#navigator-toolbox:not([iconsize]) #back-button[disabled="true"] { +#back-button[disabled="true"] { -moz-image-region: rect(36px, 36px, 54px, 18px); } -#navigator-toolbox:not([iconsize]) #forward-button { +#forward-button { -moz-image-region: rect(0, 72px, 18px, 54px); } -#navigator-toolbox:not([iconsize]) #forward-button:hover:not([disabled="true"]) { +#forward-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 72px, 36px, 54px); } -#navigator-toolbox:not([iconsize]) #forward-button[disabled="true"] { +#forward-button[disabled="true"] { -moz-image-region: rect(36px, 72px, 54px, 54px); } -#navigator-toolbox:not([iconsize]) #back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, -#navigator-toolbox:not([iconsize]) #forward-button:-moz-locale-dir(rtl) { +#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, +#forward-button:-moz-locale-dir(rtl) { transform: scaleX(-1); } -#navigator-toolbox:not([iconsize]) #home-button[cui-areatype="toolbar"] { +#home-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 126px, 18px, 108px); } -#navigator-toolbox:not([iconsize]) #home-button[cui-areatype="toolbar"]:hover { +#home-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 126px, 36px, 108px); } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] { +#bookmarks-menu-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 144px, 18px, 126px); } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover, -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] { +#bookmarks-menu-button[cui-areatype="toolbar"]:hover, +#bookmarks-menu-button[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 144px, 36px, 126px); } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred] { +/* When "new tab" page shows up, the menubutton-button (star button) is disabled */ +#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-button[disabled="true"] { + -moz-image-region: rect(36px, 144px, 54px, 126px) !important; + background-color: transparent !important; +} + +#bookmarks-menu-button[cui-areatype="toolbar"][starred] { -moz-image-region: rect(0, 162px, 18px, 144px); } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred]:hover, -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][starred][open="true"] { +#bookmarks-menu-button[cui-areatype="toolbar"][starred]:hover, +#bookmarks-menu-button[cui-areatype="toolbar"][starred][open="true"], +#bookmarks-menu-button[cui-areatype="toolbar"][starred] > .toolbarbutton-menubutton-button[open="true"] { + /* When starred and clicked (for edit/delete dialog), + * then only the menubutton-button itself is open, but not the whole menubutton. */ -moz-image-region: rect(18px, 162px, 36px, 144px); } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-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); } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker { +#bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker { padding: 1px; -moz-box-align: center; } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { +#bookmarks-menu-button[cui-areatype="toolbar"]:hover > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { -moz-image-region: rect(18px, 630px, 36px, 612px); } -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"]:hover:active > .toolbarbutton-menubutton-dropmarker, -#navigator-toolbox:not([iconsize]) #bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker { +#bookmarks-menu-button[cui-areatype="toolbar"]:hover:active > .toolbarbutton-menubutton-dropmarker, +#bookmarks-menu-button[cui-areatype="toolbar"][open="true"] > .toolbarbutton-menubutton-dropmarker { padding-top: 2px; padding-bottom: 0px; -moz-padding-start: 2px; -moz-padding-end: 0px; } -#navigator-toolbox:not([iconsize]) #history-panelmenu[cui-areatype="toolbar"] { +#history-panelmenu[cui-areatype="toolbar"] { -moz-image-region: rect(0, 180px, 18px, 162px); } -#navigator-toolbox:not([iconsize]) #history-panelmenu[cui-areatype="toolbar"]:hover, -#navigator-toolbox:not([iconsize]) #history-panelmenu[cui-areatype="toolbar"][open="true"] { +#history-panelmenu[cui-areatype="toolbar"]:hover, +#history-panelmenu[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 180px, 36px, 162px); } -#navigator-toolbox:not([iconsize]) #downloads-button[cui-areatype="toolbar"] { +#downloads-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 198px, 18px, 180px); } -#navigator-toolbox:not([iconsize]) #downloads-button[cui-areatype="toolbar"]:hover, -#navigator-toolbox:not([iconsize]) #downloads-button[cui-areatype="toolbar"][open="true"] { +#downloads-button[cui-areatype="toolbar"]:hover, +#downloads-button[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 198px, 36px, 180px); } -#navigator-toolbox:not([iconsize]) #add-ons-button[cui-areatype="toolbar"] { +#add-ons-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 216px, 18px, 198px); } -#navigator-toolbox:not([iconsize]) #add-ons-button[cui-areatype="toolbar"]:hover { +#add-ons-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 216px, 36px, 198px); } -#navigator-toolbox:not([iconsize]) #switch-to-metro-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 648px, 18px, 630px); -} - -#navigator-toolbox:not([iconsize]) #switch-to-metro-button[cui-areatype="toolbar"]:hover { - -moz-image-region: rect(18px, 648px, 36px, 630px); -} - -#navigator-toolbox:not([iconsize]) #open-file-button[cui-areatype="toolbar"] { +#open-file-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 234px, 18px, 216px); } -#navigator-toolbox:not([iconsize]) #open-file-button[cui-areatype="toolbar"]:hover { +#open-file-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 234px, 36px, 216px); } -#navigator-toolbox:not([iconsize]) #save-page-button[cui-areatype="toolbar"] { +#save-page-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 252px, 18px, 234px); } -#navigator-toolbox:not([iconsize]) #save-page-button[cui-areatype="toolbar"]:hover { +#save-page-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 252px, 36px, 234px); } -#navigator-toolbox:not([iconsize]) #sync-button[cui-areatype="toolbar"] { +#sync-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 270px, 18px, 252px); } -#navigator-toolbox:not([iconsize]) #sync-button[cui-areatype="toolbar"]:hover { +#sync-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 270px, 36px, 252px); } -#navigator-toolbox:not([iconsize]) #feed-button[cui-areatype="toolbar"] { +#sync-button[cui-areatype="toolbar"][status="active"], +#sync-button[cui-areatype="toolbar"][status="active"]:hover:active:not([disabled="true"]) { + list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png"); + -moz-image-region: rect(0, 18px, 18px, 0px); +} + +/* +#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext, +#sync-button[cui-areatype="toolbar"][status="active"]:-moz-lwtheme-brighttext:hover:active:not([disabled="true"]) { + list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); +} +*/ + +#feed-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 288px, 18px, 270px); } -#navigator-toolbox:not([iconsize]) #feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) { +#feed-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 288px, 36px, 270px); } -#navigator-toolbox:not([iconsize]) #feed-button[cui-areatype="toolbar"][disabled="true"] { +#feed-button[cui-areatype="toolbar"][disabled="true"] { -moz-image-region: rect(36px, 288px, 54px, 270px); } -#navigator-toolbox:not([iconsize]) #social-share-button[cui-areatype="toolbar"] { +#social-share-button[cui-areatype="toolbar"] { -moz-image-region: rect(0px, 306px, 18px, 288px); } -#navigator-toolbox:not([iconsize]) #social-share-button[cui-areatype="toolbar"]:hover { +#social-share-button[cui-areatype="toolbar"]:hover:not([disabled="true"]), +#social-share-button[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 306px, 36px, 288px); } -#navigator-toolbox:not([iconsize]) #email-link-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 306px, 18px, 288px); - /* This is temporary until we have an email-link icon (Bug 932235) */ - transform: scale(-1, -1); -} - -#navigator-toolbox:not([iconsize]) #email-link-button[cui-areatype="toolbar"]:hover { - -moz-image-region: rect(18px, 306px, 36px, 288px); +#social-share-button[cui-areatype="toolbar"][disabled="true"] { + -moz-image-region: rect(36px, 306px, 54px, 288px); } -#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"] { +#characterencoding-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 324px, 18px, 306px); } -#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"]:hover:not([disabled="true"]), -#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"][open="true"] { +#characterencoding-button[cui-areatype="toolbar"]:hover:not([disabled="true"]), +#characterencoding-button[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 324px, 36px, 306px); } -#navigator-toolbox:not([iconsize]) #characterencoding-button[cui-areatype="toolbar"][disabled="true"] { +#characterencoding-button[cui-areatype="toolbar"][disabled="true"] { -moz-image-region: rect(36px, 324px, 54px, 306px); } -#navigator-toolbox:not([iconsize]) #new-window-button[cui-areatype="toolbar"] { +#new-window-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 342px, 18px, 324px); +} + +#new-window-button[cui-areatype="toolbar"]:hover { + -moz-image-region: rect(18px, 342px, 36px, 324px); +} + +#e10s-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 342px, 18px, 324px); } -#navigator-toolbox:not([iconsize]) #new-window-button[cui-areatype="toolbar"]:hover { +#e10s-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 342px, 36px, 324px); } -#navigator-toolbox:not([iconsize]) #new-tab-button[cui-areatype="toolbar"] { +#e10s-button > .toolbarbutton-icon { + transform: scaleY(-1); +} + +#new-tab-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 360px, 18px, 342px); } -#navigator-toolbox:not([iconsize]) #new-tab-button[cui-areatype="toolbar"]:hover { +#new-tab-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 360px, 36px, 342px); } -#navigator-toolbox:not([iconsize]) #privatebrowsing-button[cui-areatype="toolbar"] { +#privatebrowsing-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 378px, 18px, 360px); } -#navigator-toolbox:not([iconsize]) #privatebrowsing-button[cui-areatype="toolbar"]:hover { +#privatebrowsing-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 378px, 36px, 360px); } -#navigator-toolbox:not([iconsize]) #find-button[cui-areatype="toolbar"] { +#find-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 396px, 18px, 378px); } -#navigator-toolbox:not([iconsize]) #find-button[cui-areatype="toolbar"]:hover { +#find-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 396px, 36px, 378px); } -#navigator-toolbox:not([iconsize]) #print-button[cui-areatype="toolbar"] { +#print-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 414px, 18px, 396px); } -#navigator-toolbox:not([iconsize]) #print-button[cui-areatype="toolbar"]:hover { +#print-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 414px, 36px, 396px); } -#navigator-toolbox:not([iconsize]) #fullscreen-button[cui-areatype="toolbar"] { +#fullscreen-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 432px, 18px, 414px); } -#navigator-toolbox:not([iconsize]) #fullscreen-button[cui-areatype="toolbar"]:hover { +#fullscreen-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 432px, 36px, 414px); } -#navigator-toolbox:not([iconsize]) #developer-button[cui-areatype="toolbar"] { +#developer-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 450px, 18px, 432px); } -#navigator-toolbox:not([iconsize]) #developer-button[cui-areatype="toolbar"]:hover, -#navigator-toolbox:not([iconsize]) #developer-button[cui-areatype="toolbar"][open="true"] { +#developer-button[cui-areatype="toolbar"]:hover, +#developer-button[cui-areatype="toolbar"][open="true"] { -moz-image-region: rect(18px, 450px, 36px, 432px); } -#navigator-toolbox:not([iconsize]) #preferences-button[cui-areatype="toolbar"] { +#preferences-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 468px, 18px, 450px); } -#navigator-toolbox:not([iconsize]) #preferences-button[cui-areatype="toolbar"]:hover { +#preferences-button[cui-areatype="toolbar"]:hover { -moz-image-region: rect(18px, 468px, 36px, 450px); } -#navigator-toolbox:not([iconsize]) #PanelUI-menu-button { +#PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } -#navigator-toolbox:not([iconsize]) #PanelUI-menu-button:hover, -#navigator-toolbox:not([iconsize]) #PanelUI-menu-button[open="true"] { +#PanelUI-menu-button:hover, +#PanelUI-menu-button[open="true"] { -moz-image-region: rect(18px, 486px, 36px, 468px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button:hover:not([disabled="true"]) { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 504px, 36px, 486px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #cut-button[disabled="true"] { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button[disabled="true"] { -moz-image-region: rect(36px, 504px, 54px, 486px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button { -moz-image-region: rect(0, 522px, 18px, 504px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button:hover:not([disabled="true"]) { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 522px, 36px, 504px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #copy-button[disabled="true"] { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #copy-button[disabled="true"] { -moz-image-region: rect(36px, 522px, 54px, 504px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button { -moz-image-region: rect(0, 540px, 18px, 522px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button:hover:not([disabled="true"]) { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 540px, 36px, 522px); } -#navigator-toolbox:not([iconsize]) #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #paste-button[disabled="true"] { +#edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #paste-button[disabled="true"] { -moz-image-region: rect(36px, 540px, 54px, 522px); } -#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button { -moz-image-region: rect(0, 558px, 18px, 540px); } -#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button:hover:not([disabled="true"]) { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 558px, 36px, 540px); } -#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-out-button[disabled="true"] { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-out-button[disabled="true"] { -moz-image-region: rect(36px, 558px, 54px, 540px); } -#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button { -moz-image-region: rect(0, 576px, 18px, 558px); } -#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button:hover:not([disabled="true"]) { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button:hover:not([disabled="true"]) { -moz-image-region: rect(18px, 576px, 36px, 558px); } -#navigator-toolbox:not([iconsize]) #zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) > #zoom-in-button[disabled="true"] { +#zoom-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #zoom-in-button[disabled="true"] { -moz-image-region: rect(36px, 576px, 54px, 558px); } -#navigator-toolbox:not([iconsize]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)) { - -moz-image-region: rect(0, 594px, 18px, 576px); +#nav-bar-overflow-button { + -moz-image-region: rect(0, 612px, 18px, 594px); } -#navigator-toolbox:not([iconsize]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem)):hover, -#navigator-toolbox:not([iconsize]) #webrtc-status-button:not(:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem))[open="true"] { - -moz-image-region: rect(18px, 594px, 36px, 576px); +#nav-bar-overflow-button:hover, +#nav-bar-overflow-button[open="true"] { + -moz-image-region: rect(18px, 612px, 36px, 594px); } -#navigator-toolbox:not([iconsize]) #nav-bar-overflow-button { - -moz-image-region: rect(0, 612px, 18px, 594px); +#nav-bar-overflow-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1); } -#navigator-toolbox:not([iconsize]) #nav-bar-overflow-button:hover, -#navigator-toolbox:not([iconsize]) #nav-bar-overflow-button[open="true"] { - -moz-image-region: rect(18px, 612px, 36px, 594px); +#tabview-button { + -moz-image-region: rect(0, 648px, 18px, 630px); } -/* === END toolbarbuttons.inc.css === */ - +#tabview-button:hover { + -moz-image-region: rect(18px, 648px, 36px, 630px); +} + +#email-link-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 666px, 18px, 648px); +} + +#email-button[cui-areatype="toolbar"]:hover:not([disabled="true"]) { + -moz-image-region: rect(18px, 666px, 36px, 648px); +} + +#email-button[cui-areatype="toolbar"][disabled="true"] { + -moz-image-region: rect(36px, 666px, 54px, 648px); +} + +#sidebar-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 684px, 18px, 666px); +} + +#sidebar-button[cui-areatype="toolbar"]:hover { + -moz-image-region: rect(18px, 684px, 36px, 666px); +} + +#panic-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 702px, 18px, 684px); +} + +#panic-button[cui-areatype="toolbar"]:hover, +#panic-button[cui-areatype="toolbar"][open] { + -moz-image-region: rect(18px, 702px, 36px, 684px); +} + +#panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1); +} + +#web-apps-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 720px, 18px, 702px); +} + +#web-apps-button[cui-areatype="toolbar"]:hover { + -moz-image-region: rect(18px, 720px, 36px, 702px); +} + +#loop-button-throttled > .toolbarbutton-badge-container, +#loop-button > .toolbarbutton-badge-container { + list-style-image: url("chrome://browser/skin/loop/toolbarfx.png"); + -moz-image-region: rect(0, 18px, 18px, 0); +} + +#loop-button-throttled:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container, +#loop-button:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 90px, 18px, 72px); +} + +#loop-button-throttled[state="disabled"] > .toolbarbutton-badge-container, +#loop-button-throttled[disabled="true"] > .toolbarbutton-badge-container, +#loop-button[state="disabled"] > .toolbarbutton-badge-container, +#loop-button[disabled="true"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 36px, 18px, 18px); +} + +#loop-button-throttled[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container, +#loop-button[disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 126px, 18px, 108px); +} + +#loop-button-throttled:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container, +#loop-button:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 54px, 18px, 36px); +} + +#loop-button-throttled:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container, +#loop-button:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 72px, 18px, 54px); +} + +#loop-button-throttled:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container, +#loop-button:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 108px, 18px, 90px); +} + +#webide-button[cui-areatype="toolbar"] { + -moz-image-region: rect(0, 738px, 18px, 720px); +} + +#webide-button[cui-areatype="toolbar"]:hover { + -moz-image-region: rect(18px, 738px, 36px, 720px); +} + +/* === END toolbarbuttons.inc.css === */ + /* === BEGIN menupanel.inc.css === */ /* Menu panel and palette styles */ -/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */ -:-moz-any(#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, - #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, - #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, - #PanelUI-menu-button, #characterencoding-button, #email-link-button)[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > :-moz-any(#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, - #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, - #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, - #PanelUI-menu-button, #characterencoding-button, #email-link-button) { - list-style-image: url("chrome://browser/skin/menuPanel.png"); +:root { + /* avoid aero overrides with changed filenames */ + --menupanel-list-style-image: url(chrome://browser/skin/menuPanelFx.png); + --menupanel-small-list-style-image: url(chrome://browser/skin/menuPanelFx-small.png); +} + +toolbaritem[sdkstylewidget="true"] > toolbarbutton, +:-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, + #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, + #social-share-button, #open-file-button, #find-button, #developer-button, + #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, + #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, + #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, + #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button)[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, + #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, + #social-share-button, #open-file-button, #find-button, #developer-button, + #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, + #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, + #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, + #copy-button, #paste-button, #e10s-button, #panic-button, #web-apps-button, #webide-button) { + list-style-image: var(--menupanel-list-style-image); } #home-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #home-button { +toolbarpaletteitem[place="palette"] > #home-button { -moz-image-region: rect(0px, 128px, 32px, 96px); } #home-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #home-button:hover { +toolbarpaletteitem[place="palette"] > #home-button:hover { -moz-image-region: rect(32px, 128px, 64px, 96px); } #bookmarks-menu-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #bookmarks-menu-button { - -moz-image-region: rect(0px, 160px, 32px, 128px); +toolbarpaletteitem[place="palette"] > #bookmarks-menu-button { + -moz-image-region: rect(0px, 192px, 32px, 160px); } #bookmarks-menu-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #bookmarks-menu-button:hover { - -moz-image-region: rect(32px, 160px, 64px, 128px); -} - -#bookmarks-menu-button[starred][cui-areatype="menu-panel"] { - -moz-image-region: rect(0px, 192px, 32px, 160px); +toolbarpaletteitem[place="palette"] > #bookmarks-menu-button:hover { + -moz-image-region: rect(32px, 192px, 64px, 160px); } -#bookmarks-menu-button[starred][cui-areatype="menu-panel"]:hover { +#bookmarks-menu-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(32px, 192px, 64px, 160px); } #history-panelmenu[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #history-panelmenu { +toolbarpaletteitem[place="palette"] > #history-panelmenu { -moz-image-region: rect(0px, 224px, 32px, 192px); } #history-panelmenu[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #history-panelmenu:hover { +toolbarpaletteitem[place="palette"] > #history-panelmenu:hover { + -moz-image-region: rect(32px, 224px, 64px, 192px); +} + +#history-panelmenu[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(32px, 224px, 64px, 192px); } #downloads-button[cui-areatype="menu-panel"], -#downloads-indicator[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button { +toolbarpaletteitem[place="palette"] > #downloads-button { -moz-image-region: rect(0px, 256px, 32px, 224px); } #downloads-button[cui-areatype="menu-panel"]:hover, -#downloads-indicator[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #downloads-button:hover { +toolbarpaletteitem[place="palette"] > #downloads-button:hover { -moz-image-region: rect(32px, 256px, 64px, 224px); } -#switch-to-metro-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #switch-to-metro-button { - -moz-image-region: rect(0px, 800px, 32px, 768px); -} - -#switch-to-metro-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #switch-to-metro-button:hover { - -moz-image-region: rect(32px, 800px, 64px, 768px); -} - #add-ons-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #add-ons-button { +toolbarpaletteitem[place="palette"] > #add-ons-button { -moz-image-region: rect(0px, 288px, 32px, 256px); } #add-ons-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #add-ons-button:hover { +toolbarpaletteitem[place="palette"] > #add-ons-button:hover { -moz-image-region: rect(32px, 288px, 64px, 256px); } #open-file-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #open-file-button { +toolbarpaletteitem[place="palette"] > #open-file-button { -moz-image-region: rect(0px, 320px, 32px, 288px); } #open-file-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #open-file-button:hover { +toolbarpaletteitem[place="palette"] > #open-file-button:hover { -moz-image-region: rect(32px, 320px, 64px, 288px); } #save-page-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #save-page-button { +toolbarpaletteitem[place="palette"] > #save-page-button { -moz-image-region: rect(0px, 352px, 32px, 320px); } #save-page-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #save-page-button:hover { +toolbarpaletteitem[place="palette"] > #save-page-button:hover { -moz-image-region: rect(32px, 352px, 64px, 320px); } #sync-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #sync-button { +toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 384px, 32px, 352px); } #sync-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #sync-button:hover { +toolbarpaletteitem[place="palette"] > #sync-button:hover { -moz-image-region: rect(32px, 384px, 64px, 352px); } +#sync-button[cui-areatype="menu-panel"][status="active"] { + list-style-image: url("chrome://browser/skin/syncProgress-menuPanel.png"); + -moz-image-region: rect(0px, 32px, 32px, 0px); +} + #feed-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button { +toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } #feed-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button:hover:not([disabled="true"]) { +toolbarpaletteitem[place="palette"] > #feed-button:hover:not([disabled="true"]) { -moz-image-region: rect(32px, 416px, 64px, 384px); } #feed-button[cui-areatype="menu-panel"][disabled="true"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #feed-button[disabled="true"] { +toolbarpaletteitem[place="palette"] > #feed-button[disabled="true"] { -moz-image-region: rect(64px, 416px, 96px, 384px); } #social-share-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #social-share-button { +toolbarpaletteitem[place="palette"] > #social-share-button { -moz-image-region: rect(0px, 448px, 32px, 416px); } -#social-share-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #social-share-button:hover { - -moz-image-region: rect(32px, 448px, 64px, 416px); -} - -#email-link-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button { - -moz-image-region: rect(0, 448px, 32px, 416px); -} - -#email-link-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button:hover { +#social-share-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #social-share-button:hover:not([disabled="true"]) { -moz-image-region: rect(32px, 448px, 64px, 416px); } -/* This is temporary until we have an email-link icon (Bug 932235) */ -#email-link-button[cui-areatype="menu-panel"] > image, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #email-link-button > image { - transform: scale(-1, -1); +#social-share-button[cui-areatype="menu-panel"][disabled="true"], +toolbarpaletteitem[place="palette"] > #social-share-button[disabled="true"] { + -moz-image-region: rect(64px, 448px, 96px, 416px); } #characterencoding-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button { +toolbarpaletteitem[place="palette"] > #characterencoding-button { -moz-image-region: rect(0px, 480px, 32px, 448px); } #characterencoding-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button:hover:not([disabled="true"]) { +toolbarpaletteitem[place="palette"] > #characterencoding-button:hover:not([disabled="true"]) { -moz-image-region: rect(32px, 480px, 64px, 448px); } #characterencoding-button[cui-areatype="menu-panel"][disabled="true"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #characterencoding-button[disabled="true"] { +toolbarpaletteitem[place="palette"] > #characterencoding-button[disabled="true"] { -moz-image-region: rect(64px, 480px, 96px, 448px); } +#characterencoding-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 480px, 64px, 448px); +} + #new-window-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-window-button { +toolbarpaletteitem[place="palette"] > #new-window-button { -moz-image-region: rect(0px, 512px, 32px, 480px); } #new-window-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-window-button:hover { +toolbarpaletteitem[place="palette"] > #new-window-button:hover { + -moz-image-region: rect(32px, 512px, 64px, 480px); +} + +#e10s-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #e10s-button { + -moz-image-region: rect(0px, 512px, 32px, 480px); +} + +#e10s-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #e10s-button:hover { -moz-image-region: rect(32px, 512px, 64px, 480px); } #new-tab-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-tab-button { +toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 544px, 32px, 512px); } #new-tab-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #new-tab-button:hover { +toolbarpaletteitem[place="palette"] > #new-tab-button:hover { -moz-image-region: rect(32px, 544px, 64px, 512px); } #privatebrowsing-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #privatebrowsing-button { +toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 576px, 32px, 544px); } #privatebrowsing-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #privatebrowsing-button:hover { +toolbarpaletteitem[place="palette"] > #privatebrowsing-button:hover { -moz-image-region: rect(32px, 576px, 64px, 544px); } +#tabview-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #tabview-button { + -moz-image-region: rect(0px, 608px, 32px, 576px); +} + +#tabview-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #tabview-button:hover { + -moz-image-region: rect(32px, 608px, 64px, 576px); +} + #find-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #find-button { +toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 640px, 32px, 608px); } #find-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #find-button:hover { +toolbarpaletteitem[place="palette"] > #find-button:hover { -moz-image-region: rect(32px, 640px, 64px, 608px); } #print-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #print-button { +toolbarpaletteitem[place="palette"] > #print-button { -moz-image-region: rect(0px, 672px, 32px, 640px); } #print-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #print-button:hover { +toolbarpaletteitem[place="palette"] > #print-button:hover { -moz-image-region: rect(32px, 672px, 64px, 640px); } #fullscreen-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #fullscreen-button { +toolbarpaletteitem[place="palette"] > #fullscreen-button { -moz-image-region: rect(0px, 704px, 32px, 672px); } #fullscreen-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #fullscreen-button:hover { +toolbarpaletteitem[place="palette"] > #fullscreen-button:hover { -moz-image-region: rect(32px, 704px, 64px, 672px); } #developer-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #developer-button { +toolbarpaletteitem[place="palette"] > #developer-button { -moz-image-region: rect(0px, 736px, 32px, 704px); } #developer-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #developer-button:hover { +toolbarpaletteitem[place="palette"] > #developer-button:hover { + -moz-image-region: rect(32px, 736px, 64px, 704px); +} + +#developer-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(32px, 736px, 64px, 704px); } #preferences-button[cui-areatype="menu-panel"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #preferences-button { +toolbarpaletteitem[place="palette"] > #preferences-button { -moz-image-region: rect(0px, 768px, 32px, 736px); } #preferences-button[cui-areatype="menu-panel"]:hover, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #preferences-button:hover { +toolbarpaletteitem[place="palette"] > #preferences-button:hover { -moz-image-region: rect(32px, 768px, 64px, 736px); } +#email-link-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #email-link-button { + -moz-image-region: rect(0, 800px, 32px, 768px); +} + +#email-link-button[cui-areatype="menu-panel"]:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #email-link-button:hover:not([disabled="true"]) { + -moz-image-region: rect(32px, 800px, 64px, 768px); +} + +#email-link-button[cui-areatype="menu-panel"][disabled="true"], +toolbarpaletteitem[place="palette"] > #email-link-button[disabled="true"] { + -moz-image-region: rect(64px, 800px, 96px, 768px); +} + +#sidebar-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #sidebar-button { + -moz-image-region: rect(0, 864px, 32px, 832px); +} + +#sidebar-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #sidebar-button:hover, +#sidebar-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 864px, 64px, 832px); +} + +#panic-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #panic-button { + -moz-image-region: rect(0, 896px, 32px, 864px); +} + +#panic-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #panic-button:hover, +#panic-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 896px, 64px, 864px); +} + +#web-apps-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #web-apps-button { + -moz-image-region: rect(0, 928px, 32px, 896px); +} + +#web-apps-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #web-apps-button:hover { + -moz-image-region: rect(32px, 928px, 64px, 896px); +} + +#webide-button[cui-areatype="menu-panel"], +toolbarpaletteitem[place="palette"] > #webide-button { + -moz-image-region: rect(0px, 960px, 32px, 928px); +} + +#webide-button[cui-areatype="menu-panel"]:hover, +toolbarpaletteitem[place="palette"] > #webide-button:hover { + -moz-image-region: rect(32px, 960px, 64px, 928px); +} + +toolbaritem[sdkstylewidget="true"] > toolbarbutton { + -moz-image-region: rect(0, 832px, 32px, 800px); +} + +#loop-button-throttled[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, +toolbarpaletteitem[place="palette"] > #loop-button-throttled > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"] > .toolbarbutton-badge-container, +toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + list-style-image: url("chrome://browser/skin/loop/menuPanel.png"); + -moz-image-region: rect(0, 32px, 32px, 0); +} + +/* Make sure that the state icons are not shown in the customization palette. */ +toolbarpaletteitem[place="palette"] > #loop-button-throttled > .toolbarbutton-badge-container, +toolbarpaletteitem[place="palette"] > #loop-button > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 32px, 32px, 0) !important; +} + +#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"]):-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 160px, 32px, 128px); +} + +#loop-button-throttled[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, +#loop-button-throttled[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"][state="disabled"] > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"][disabled="true"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 64px, 32px, 32px); +} + +#loop-button-throttled[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"][disabled="true"]:-moz-any(:hover,:hover:active,[open]) > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 224px, 32px, 192px); +} + +#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 96px, 32px, 64px); +} + +#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 128px, 32px, 96px); +} + +#loop-button-throttled[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container, +#loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] > .toolbarbutton-badge-container { + -moz-image-region: rect(0, 192px, 32px, 160px); +} + /* Wide panel control icons */ -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton, -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > toolbarbutton, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton { - list-style-image: url("chrome://browser/skin/menuPanel-small.png"); +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, +toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton, +toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton { + list-style-image: var(--menupanel-small-list-style-image); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button, +toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button { -moz-image-region: rect(0px, 32px, 16px, 16px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button:hover:not([disabled="true"]), -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button:hover:not([disabled="true"]) { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 32px, 32px, 16px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #cut-button[disabled="true"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button[disabled="true"] { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #cut-button[disabled="true"], +toolbarpaletteitem[place="palette"] > #edit-controls > #cut-button[disabled="true"] { -moz-image-region: rect(32px, 32px, 48px, 16px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button, +toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button { -moz-image-region: rect(0px, 48px, 16px, 32px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button:hover:not([disabled="true"]), -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button:hover:not([disabled="true"]) { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 48px, 32px, 32px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #copy-button[disabled="true"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button[disabled="true"] { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #copy-button[disabled="true"], +toolbarpaletteitem[place="palette"] > #edit-controls > #copy-button[disabled="true"] { -moz-image-region: rect(32px, 48px, 48px, 32px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button, +toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button { -moz-image-region: rect(0px, 64px, 16px, 48px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button:hover:not([disabled="true"]), -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button:hover:not([disabled="true"]) { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 64px, 32px, 48px); } -#edit-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #paste-button[disabled="true"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button[disabled="true"] { +#edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #paste-button[disabled="true"], +toolbarpaletteitem[place="palette"] > #edit-controls > #paste-button[disabled="true"] { -moz-image-region: rect(32px, 64px, 48px, 48px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button { +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button, +toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button { -moz-image-region: rect(0px, 80px, 16px, 64px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button:hover:not([disabled="true"]), -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button:hover:not([disabled="true"]) { +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 80px, 32px, 64px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-out-button[disabled="true"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button[disabled="true"] { +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-out-button[disabled="true"], +toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-out-button[disabled="true"] { -moz-image-region: rect(32px, 80px, 48px, 64px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button, -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button, +toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { -moz-image-region: rect(0px, 96px, 16px, 80px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button:hover:not([disabled="true"]), -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button:hover:not([disabled="true"]) { +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button:hover:not([disabled="true"]), +toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button:hover:not([disabled="true"]) { -moz-image-region: rect(16px, 96px, 32px, 80px); } -#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]),.overflowedItem) > #zoom-in-button[disabled="true"], -:-moz-any(#customization-palette, #panelUI-contents) > toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled="true"] { +#zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > #zoom-in-button[disabled="true"], +toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button[disabled="true"] { -moz-image-region: rect(32px, 96px, 48px, 80px); } -/* === END menupanel.inc.css === */ - -.toolbarbutton-1 { - list-style-image: url("chrome://browser/skin/FxToolbar.png"); +#add-share-provider { + list-style-image: var(--menupanel-small-list-style-image); + -moz-image-region: rect(0px, 96px, 16px, 80px); } +/* === END menupanel.inc.css === */ + .toolbarbutton-1:not([type="menu-button"]) { -moz-box-orient: vertical; } .toolbarbutton-1, .toolbarbutton-1 > .toolbarbutton-menubutton-button { - min-width: 36px; - min-height: 36px; -} - -.toolbarbutton-1:not([type="menu-button"]) { - -moz-box-orient: vertical; +/* min-width: 36px; + min-height: 36px;*/ } .toolbarbutton-1, @@ -1263,576 +1444,340 @@ menuitem.bookmark-item { -moz-padding-end: 1px; } -/* ::::: small primary toolbar buttons ::::: */ - -#nav-bar { - /* force iconsize="small" on this toolbar */ - counter-reset: smallicons; -} - -toolbar[mode="text"] .toolbarbutton-1, -toolbar[mode="icons"] .toolbarbutton-1, -toolbar[iconsize="small"] .toolbarbutton-1, -:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1, -toolbar[mode="text"] .toolbarbutton-menubutton-button, -toolbar[mode="icons"] .toolbarbutton-menubutton-button, -toolbar[iconsize="small"] .toolbarbutton-menubutton-button, -:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-button { - min-width: 0px; - min-height: 0px; +#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-icon, +#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menu-dropmarker, +#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-dropmarker, +#main-window:not([customizing]) .toolbarbutton-1[disabled=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#main-window:not([customizing]) .toolbarbutton-1 > .toolbarbutton-menubutton-button[disabled=true] > .toolbarbutton-icon { } -toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker { - padding-top: 4px; - padding-bottom: 8px; - -moz-padding-start: 1px; - -moz-padding-end: 1px; +.toolbarbutton-1 > .toolbarbutton-menu-dropmarker, +.toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { } -toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker, -toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker, -:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { - padding-top: 0px; - padding-bottom: 13px; - -moz-padding-start: 1px; - -moz-padding-end: 1px; +toolbar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker:-moz-lwtheme-brighttext, +toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker:-moz-lwtheme-brighttext { } -toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, -toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { - padding-top: 5px; - padding-bottom: 7px; - -moz-padding-start: 2px; - -moz-padding-end: 0px; +.toolbarbutton-1 > .toolbarbutton-icon, +.toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { } -toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, -toolbar[mode="icons"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker, -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, -toolbar[iconsize="small"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker, -:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker, -:-moz-any(#TabsToolbar, #addon-bar) .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker { - padding-top: 1px; - padding-bottom: 12px; - -moz-padding-start: 2px; - -moz-padding-end: 0px; +.findbar-button, +#nav-bar .toolbarbutton-1, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button { } -toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker[disabled="true"] { - padding-top: 4px !important; - padding-bottom: 8px !important; - -moz-padding-start: 1px !important; - -moz-padding-end: 1px !important; +#nav-bar .toolbarbutton-1:not([type=menu-button]), +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { } -toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker[disabled="true"], -toolbar[iconsize="small"] > .toolbarbutton-menubutton-dropmarker[disabled="true"] { - padding-top: 0px !important; - padding-bottom: 13px !important; - -moz-padding-start: 1px !important; - -moz-padding-end: 1px !important; +#nav-bar #PanelUI-menu-button { +/* -moz-padding-start: 7px; + -moz-padding-end: 5px;*/ } -toolbar[mode="icons"] .toolbarbutton-text, -toolbar[mode="text"] .toolbarbutton-icon { - display: none; +#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) { +/* padding-left: 5px; + padding-right: 5px;*/ } -toolbar[mode="text"] .toolbarbutton-text { - padding: 4px 0; +#nav-bar .toolbarbutton-1 > menupopup { +/* margin-top: -3px;*/ } -toolbar[mode="text"] .toolbarbutton-1, -toolbar[mode="text"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { - -moz-box-orient: horizontal; +#nav-bar .toolbarbutton-1 > menupopup.cui-widget-panel { + margin-top: -4px; } -toolbar[mode="full"] .toolbarbutton-1, -toolbar[mode="full"] .toolbarbutton-1 > .toolbarbutton-menubutton-button { - min-width: 30px; +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button { +/* -moz-padding-end: 0;*/ } -#navigator-toolbox[iconsize=small] > #nav-bar { +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker { +/* -moz-padding-start: 0; + -moz-box-align: center;*/ } -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar { +.findbar-button > .toolbarbutton-text, +#nav-bar .toolbarbutton-1 > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1 > .toolbarbutton-text, +#nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon { +/* padding: 2px 6px; + border: 1px solid; + border-color: transparent; + transition-property: background-color, border-color; + transition-duration: 150ms;*/ } - - -/* unified back/forward button */ - -#back-button { - -moz-image-region: rect(0, 18px, 18px, 0); - -moz-margin-end: 0; +/* +#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-badge-container, +#nav-bar .toolbarbutton-1:not(:-moz-any(@primaryToolbarButtons@)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { + padding: 3px 7px; } +*/ -#back-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 18px, 36px, 0); +/* Help SDK icons fit: */ +toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { + width: 16px; } -#back-button[disabled="true"] { - -moz-image-region: rect(36px, 18px, 54px, 0); +#nav-bar toolbarbutton[sdk-button="true"][cui-areatype="toolbar"] > .toolbarbutton-icon { + /* XXXgijs box models strike again: this is 16px + 2 * 7px padding + 2 * 1px border (from the rules above) */ + width: 32px; } -#forward-button { - -moz-image-region: rect(0, 36px, 18px, 18px); - border-left: none; - -moz-margin-start: 0; +#nav-bar .toolbarbutton-1[type=menu]:not(#back-button):not(#forward-button):not(#feed-button):not(#PanelUI-menu-button) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1[type=menu] > .toolbarbutton-text /* hack for add-ons that forcefully display the label */ { +/* -moz-padding-end: 17px;*/ } -#forward-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 36px, 36px, 18px); +#nav-bar .toolbarbutton-1 > .toolbarbutton-menu-dropmarker { } -#forward-button[disabled="true"] { - -moz-image-region: rect(36px, 36px, 54px, 18px); +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-icon { } -#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, -#forward-button:-moz-locale-dir(rtl), -#forward-button:-moz-locale-dir(rtl) > .toolbarbutton-text { - transform: scaleX(-1); +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { } -#nav-bar #back-button { - -moz-margin-end: 0 !important; +#nav-bar .toolbaritem-combined-buttons { +/* margin-left: 2px; + margin-right: 2px;*/ } -#nav-bar #forward-button { - border-left-style: none; - -moz-margin-start: 0 !important; +#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1 { +/* padding-left: 0; + padding-right: 0;*/ } -#nav-bar #back-button:-moz-locale-dir(ltr) { - border-top-right-radius: 0; - border-bottom-right-radius: 0; +#nav-bar .toolbarbutton-1:not(:hover):not(:active):not([open]) > .toolbarbutton-menubutton-dropmarker::before, +#nav-bar .toolbaritem-combined-buttons > .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true]) + .toolbarbutton-1:-moz-any(:not(:hover):not([open]),[disabled=true])::before { +/* + content: ""; + display: -moz-box; + width: 1px; + height: 16px; + -moz-margin-end: -1px; +*/ } -#nav-bar #back-button:-moz-locale-dir(rtl), -#nav-bar #forward-button { - border-top-left-radius: 0; - border-bottom-left-radius: 0; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > .toolbarbutton-1:-moz-any([disabled=true],:not([open]):not([disabled=true]):not(:active)) > .toolbarbutton-icon { } -/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */ -#urlbar-container > #back-button, -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #back-button { - border-radius: 10000px; - width: 30px; - height: 30px; - position: relative; - z-index: 1; - margin-top: -2px; - margin-bottom: -2px; - border: none; - -moz-image-region: rect(54px, 20px, 74px, 0); +.findbar-button:not(:-moz-any([checked="true"],[disabled="true"])):hover > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([disabled=true]) > .toolbarbutton-menubutton-button[open] + .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-button > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any(:hover,[open]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([disabled=true]):not([checked]):not([open]):not(:active):hover > .toolbarbutton-badge-container, +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button:not([open]):not(:active):not([disabled=true]):hover > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([buttonover]):not([open]):not(:active):hover > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon { } -/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */ -#urlbar-container > #back-button[open="true"], -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #back-button:not([disabled="true"]):hover, -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #back-button[open="true"] { - -moz-image-region: rect(54px, 40px, 74px, 20px); +.findbar-button:not([disabled=true]):-moz-any([checked="true"],:hover:active) > .toolbarbutton-text, +#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):-moz-any(:hover:active, [open]) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1[open] > .toolbarbutton-menubutton-dropmarker:not([disabled=true]) > .dropmarker-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-icon, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-text, +#nav-bar .toolbarbutton-1:not([disabled=true]):-moz-any([open],[checked],:hover:active) > .toolbarbutton-badge-container { } -/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */ -#urlbar-container > #back-button[disabled="true"], -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #back-button[disabled="true"] { - -moz-image-region: rect(54px, 60px, 74px, 40px); +#TabsToolbar .toolbarbutton-1, +#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button, +.tabbrowser-arrowscrollbox > .scrollbutton-up, +.tabbrowser-arrowscrollbox > .scrollbutton-down { } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #back-button:not([disabled="true"]):not([open="true"]):not(:active):hover { +#TabsToolbar .toolbarbutton-1:not([disabled=true]):hover, +#TabsToolbar .toolbarbutton-1[open], +#TabsToolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button:not([disabled=true]):hover, +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled=true]):hover, +.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled=true]):hover { } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #back-button:not([disabled="true"]):hover:active, -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #back-button[open="true"] { -} +/* unified back/forward button */ -#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar[currentset*="unified-back-forward-button"], -#navigator-toolbox[iconsize="large"][mode="icons"] > #nav-bar:not([currentset]) { -/* padding-top: 3px; - padding-bottom: 5px; */ +#forward-button { + -moz-box-align: stretch; /* let the button shape grow vertically with the location bar */ } -#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar[currentset*="unified-back-forward-button"], -#navigator-toolbox[iconsize="large"][mode="icons"][tabsontop="true"] > #nav-bar:not([currentset]) { -/* padding-top: 5px; */ +#forward-button > menupopup { + margin-top: 1px !important; } -/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */ -#urlbar-container > #forward-button, -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #forward-button { +#forward-button > .toolbarbutton-icon { + background-clip: padding-box !important; /*mask: url(keyhole-forward-mask.svg#mask); XXX: this regresses twinopen */ - /*clip-path: url("chrome://browser/content/browser.xul#winstripe-keyhole-forward-clip-path"); */ - -moz-margin-start: -6px !important; - padding-left: 7px; - padding-right: 3px; - margin-top: 2px; - margin-bottom: 2px; + /*clip-path: url(chrome://browser/content/browser.xul#keyhole-forward-clip-path) !important;*/ } -/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */ -#urlbar-container > #forward-button:-moz-locale-dir(ltr), -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #forward-button:-moz-locale-dir(ltr) { - border-top-right-radius: 11px; - border-bottom-right-radius: 11px; +#forward-button { + -moz-margin-start: -4px !important; + padding-left: 5px; + padding-right: 5px; + margin-top: 3px; + margin-bottom: 3px; + border-radius: 0 10000px 10000px 0; } -/* Remove selector when Australis lands - this makes it only apply post-Australis as back/forward buttons are in the urlbar-container there */ -#urlbar-container > #forward-button:-moz-locale-dir(rtl), -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #forward-button:-moz-locale-dir(rtl) { - border-top-left-radius: 11px; - border-bottom-left-radius: 11px; +#forward-button:-moz-locale-dir(rtl) { + border-radius: 10000px 0 0 10000px; } -.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr), -.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-left.gif") !important; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #forward-button { + transition: margin-left 150ms ease-out; } -.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr):hover, -.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl):hover { - list-style-image: url("chrome://global/skin/arrow/arrow-left-hover.gif") !important; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] { + margin-left: -27px !important; } -.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr), -.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) { - list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] { + /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */ + transition-delay: 100s; } -.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr):hover, -.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl):hover { - list-style-image: url("chrome://global/skin/arrow/arrow-right.gif") !important; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] { + /* when not hovered anymore, trigger a new transition to hide the forward button immediately */ + margin-left: -27.01px !important; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button > #forward-button { -/* border-top-right-radius: 0; - border-bottom-right-radius: 0; - -moz-margin-end: 0; */ +#back-button { +/* padding-top: 3px !important; + padding-bottom: 3px !important; + -moz-padding-start: 5px !important; + -moz-padding-end: 0 !important;*/ + position: relative; + z-index: 1; + border-radius: 10000px; + width: 30px; + height: 30px; + margin-top: -2px; + margin-bottom: -2px; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button:not([switchingtabs]) > #forward-button { - transition: opacity 150ms ease-out; +#back-button:-moz-locale-dir(rtl) { } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button:not(:hover) > #forward-button[disabled] { - opacity: 0; +#back-button > menupopup { + margin-top: -1px !important; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button:hover > #forward-button[disabled] { - background-color: transparent; +#back-button > .toolbarbutton-icon { + border-radius: 10000px !important; + background-clip: padding-box !important; +/* background-color: hsla(210,25%,98%,.08) !important; + padding: 6px !important; + border-style: none !important; + box-shadow: 0 1px 0 0 hsla(210,4%,10%,.25), + 0 0 0 1px hsla(210,4%,10%,.25);*/ + transition-property: background-color, box-shadow !important; + transition-duration: 250ms !important; } -/* A number of buttons use :-moz-any(#palette-box, #navigator-toolbox[iconsize]) - this makes it only apply pre-Australis as iconsize and the palette-box don't exist afterwards */ -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #stop-button { - -moz-image-region: rect(0, 54px, 18px, 36px); +#back-button:not([disabled="true"]):not([open="true"]):not(:active):hover > .toolbarbutton-icon { +/* background-color: hsla(210,4%,10%,.08) !important;*/ } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #stop-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 54px, 36px, 36px); +#back-button:not([disabled="true"]):hover:active > .toolbarbutton-icon, +#back-button[open="true"] > .toolbarbutton-icon { +/* background-color: hsla(210,4%,10%,.12) !important; + box-shadow: 0 1px 0 0 hsla(210,4%,10%,.25), + 0 0 0 1px hsla(210,4%,10%,.25), + 0 1px 0 0 hsla(210,80%,20%,.1) inset !important;*/ } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #stop-button[disabled="true"] { - -moz-image-region: rect(36px, 54px, 54px, 36px); +#back-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1); +} +/* +.unified-nav-back[_moz-menuactive]:-moz-locale-dir(ltr), +.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(rtl) { + list-style-image: url("chrome://browser/skin/menu-back.png") !important; } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #reload-button { - -moz-image-region: rect(0, 72px, 18px, 54px); +.unified-nav-forward[_moz-menuactive]:-moz-locale-dir(ltr), +.unified-nav-back[_moz-menuactive]:-moz-locale-dir(rtl) { + list-style-image: url("chrome://browser/skin/menu-forward.png") !important; } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #reload-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 72px, 36px, 54px); +#home-button.bookmark-item { + list-style-image: url("chrome://browser/skin/Toolbar.png"); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #reload-button[disabled="true"] { - -moz-image-region: rect(36px, 72px, 54px, 54px); +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > toolbaritem > :-moz-any(@nestedButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbaritem > :-moz-any(@nestedButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > :-moz-any(@primaryToolbarButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > :-moz-any(@primaryToolbarButtons@):-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#home-button.bookmark-item:-moz-lwtheme-brighttext { + position: relative; + z-index: 1; + list-style-image: url("chrome://browser/skin/Toolbar-inverted.png"); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button.bookmark-item { - list-style-image: url("chrome://browser/skin/FxToolbar.png"); +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) :-moz-any(#TabsToolbar, #toolbar-menubar) > toolbarpaletteitem > #sync-button[status="active"]:-moz-system-metric(windows-classic):not(:-moz-lwtheme) { + list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button { - -moz-image-region: rect(0, 90px, 18px, 72px); +*/ + +#downloads-button > .toolbarbutton-icon { + margin: 0; } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 90px, 36px, 72px); +/* tabview menu item */ + +#menu_tabview { + list-style-image: url("chrome://browser/skin/tabview/tabviewFx.png"); + -moz-image-region: rect(1px, 89px, 17px, 73px); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #home-button[disabled="true"] { - -moz-image-region: rect(36px, 90px, 54px, 72px); +#menu_tabview[groups="0"] { + -moz-image-region: rect(1px, 17px, 17px, 1px); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #downloads-button { - -moz-image-region: rect(0, 108px, 18px, 90px); +#menu_tabview[groups="1"] { + -moz-image-region: rect(1px, 35px, 17px, 19px); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #downloads-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 108px, 36px, 90px); +#menu_tabview[groups="2"] { + -moz-image-region: rect(1px, 53px, 17px, 37px); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #downloads-button[disabled="true"] { - -moz-image-region: rect(36px, 108px, 54px, 90px); +#menu_tabview[groups="3"] { + -moz-image-region: rect(1px, 71px, 17px, 55px); } -#downloads-button > .toolbarbutton-icon { - margin: 0; +/* undo close tab menu item */ +#alltabs_undoCloseTab { + list-style-image: url(chrome://browser/skin/undoCloseTab.png); } -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #history-button { - -moz-image-region: rect(0, 126px, 18px, 108px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #history-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 126px, 36px, 108px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #history-button[disabled="true"] { - -moz-image-region: rect(36px, 126px, 54px, 108px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-button, -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button { - list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */ - -moz-image-region: rect(0, 144px, 18px, 126px); -} - -#bookmarks-menu-button.bookmark-item { - /* list-style-image: url("chrome://browser/skin/FxToolbar.png"); */ -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button.toolbarbutton-1 { - -moz-box-orient: horizontal; -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-button:not([disabled="true"]):hover, -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button[open="true"], -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 144px, 36px, 126px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-button[disabled="true"], -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #bookmarks-menu-button[disabled="true"] { - -moz-image-region: rect(36px, 144px, 54px, 126px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #print-button { - -moz-image-region: rect(0, 162px, 18px, 144px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #print-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 162px, 36px, 144px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #print-button[disabled="true"] { - -moz-image-region: rect(36px, 162px, 54px, 144px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-tab-button { - -moz-image-region: rect(0, 180px, 18px, 162px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-tab-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 180px, 36px, 162px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-tab-button[disabled="true"] { - -moz-image-region: rect(36px, 180px, 54px, 162px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-window-button { - -moz-image-region: rect(0, 198px, 18px, 180px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-window-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 198px, 36px, 180px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #new-window-button[disabled="true"] { - -moz-image-region: rect(36px, 198px, 54px, 180px); -} - -#cut-button { - -moz-image-region: rect(0, 216px, 18px, 198px); -} - -#cut-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 216px, 36px, 198px); -} - -#cut-button[disabled="true"] { - -moz-image-region: rect(36px, 216px, 54px, 198px); -} - -#copy-button { - -moz-image-region: rect(0, 234px, 18px, 216px); -} - -#copy-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 234px, 36px, 216px); -} - -#copy-button[disabled="true"] { - -moz-image-region: rect(36px, 234px, 54px, 216px); -} - -#paste-button { - -moz-image-region: rect(0, 252px, 18px, 234px); -} - -#paste-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 252px, 36px, 234px); -} - -#paste-button[disabled="true"] { - -moz-image-region: rect(36px, 252px, 54px, 234px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #fullscreen-button { - -moz-image-region: rect(0, 270px, 18px, 252px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #fullscreen-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 270px, 36px, 252px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #fullscreen-button[disabled="true"] { - -moz-image-region: rect(36px, 270px, 54px, 252px); -} - -#zoom-out-button { - -moz-image-region: rect(0, 288px, 18px, 270px); - -moz-margin-end: 0; -} - -#zoom-in-button { - -moz-image-region: rect(0, 306px, 18px, 288px); -} - -#zoom-out-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 288px, 36px, 270px); -} - -#zoom-out-button[disabled="true"] { - -moz-image-region: rect(36px, 288px, 54px, 270px); -} - -#zoom-in-button:not([disabled="true"]):hover { - -moz-image-region: rect(18px, 306px, 36px, 288px); -} - -#zoom-in-button[disabled="true"] { - -moz-image-region: rect(36px, 306px, 54px, 288px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #sync-button:not([status]) { - list-style-image: url("chrome://browser/skin/FxToolbar.png") !important; /* for making the palette work */ - -moz-image-region: rect(0, 324px, 18px, 306px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/sync-throbber.png"); - -moz-image-region: rect(0, 18px, 18px, 0); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #sync-button[disabled="true"] { - -moz-image-region: rect(36px, 324px, 54px, 306px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #feed-button { - -moz-image-region: rect(0, 342px, 18px, 324px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #feed-button[disabled="true"] { - -moz-image-region: rect(36px, 342px, 54px, 324px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button { - -moz-image-region: rect(0, 360px, 18px, 342px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button:not([disabled="true"]):hover, -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button[open="true"] { - -moz-image-region: rect(18px, 360px, 36px, 342px); -} - -:-moz-any(#palette-box, #navigator-toolbox[iconsize]) #webrtc-status-button[disabled="true"] { - -moz-image-region: rect(36px, 360px, 54px, 342px); -} - -/* tabview button & menu item */ - -#tabview-button, -#menu_tabview { - list-style-image: url("chrome://browser/skin/tabview/tabview.png") !important; -} - -#tabview-button { - -moz-image-region: rect(0, 90px, 18px, 72px); -} - -#tabview-button[groups="0"] { - -moz-image-region: rect(0, 18px, 18px, 0); -} - -#tabview-button[groups="1"] { - -moz-image-region: rect(0, 36px, 18px, 18px); -} - -#tabview-button[groups="2"] { - -moz-image-region: rect(0, 54px, 18px, 36px); -} - -#tabview-button[groups="3"] { - -moz-image-region: rect(0, 72px, 18px, 54px); -} - -#menu_tabview { - -moz-image-region: rect(1px, 89px, 17px, 73px); -} - -#menu_tabview[groups="0"] { - -moz-image-region: rect(1px, 17px, 17px, 1px); -} - -#menu_tabview[groups="1"] { - -moz-image-region: rect(1px, 35px, 17px, 19px); +@media (min-resolution: 1.25dppx) { + #alltabs_undoCloseTab { + list-style-image: url(chrome://browser/skin/undoCloseTab@2x.png); + } + #alltabs_undoCloseTab > .toolbarbutton-icon { + width: 16px; + } } -#menu_tabview[groups="2"] { - -moz-image-region: rect(1px, 53px, 17px, 37px); -} +/* zoom control text (reset) button special case: */ -#menu_tabview[groups="3"] { - -moz-image-region: rect(1px, 71px, 17px, 55px); +#nav-bar #zoom-reset-button > .toolbarbutton-text { + /* To make this line up with the icons, it needs the same height (18px) + + * padding (2 * 2px) + border (2 * 1px), but as a minimum because otherwise + * increase in text sizes would break things... + */ + min-height: 20px; } /* ::::: fullscreen window controls ::::: */ @@ -1844,7 +1789,8 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon #minimize-button, #restore-button, #close-button { -/* padding: 0; */ +/* list-style-image: url("chrome://global/skin/icons/windowControls.png"); + padding: 0; */ } #minimize-button { @@ -1876,12 +1822,11 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon #urlbar, .searchbar-textbox { border-radius: 5px; - margin: 0; + margin: 2px 0; -moz-margin-start: 3px; } #urlbar { - width: 7em; /* make color as light as possible to deal with dark non-domain parts */ color: #FFBFFF; } @@ -1893,71 +1838,44 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon color: black; */ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button + #urlbar-container { - padding-left: 22px; - -moz-margin-start: -22px; - position: relative; - pointer-events: none; +#urlbar:-moz-lwtheme:hover:not([focused]):not([readonly]), +.searchbar-textbox:-moz-lwtheme:hover:not([focused]) { +/* background-color: rgba(255,255,255,.9);*/ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button + #urlbar-container > #urlbar { -/* -moz-border-start: none; - margin-left: 0; */ - pointer-events: all; +#urlbar:-moz-lwtheme[focused]:not([readonly]), +.searchbar-textbox:-moz-lwtheme[focused] { +/* background-color: white;*/ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button:not([switchingtabs]) + #urlbar-container > #urlbar { - transition: margin-left 150ms ease-out; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar { +/* -moz-border-start: none; + margin-left: 0;*/ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(ltr) { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(ltr) { /* border-top-left-radius: 0; border-bottom-left-radius: 0; */ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) { /* border-top-right-radius: 0; border-bottom-right-radius: 0; */ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar { - margin-left: -22px; -} - -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar { - /* delay the hiding of the forward button when hovered to avoid accidental clicks on the url bar */ - transition-delay: 100s; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper { +/* clip-path: url("chrome://browser/content/browser.xul#urlbar-back-button-clip-path");*/ +/* -moz-margin-start: -5px; */ } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar { - /* when not hovered anymore, trigger a new transition to hide the forward button immediately */ - margin-left: -22.01px; +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl), +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) { + /* let urlbar-back-button-clip-path clip the urlbar's right side for RTL */ + transform: scaleX(-1); } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button + #urlbar-container:-moz-locale-dir(rtl), -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button + #urlbar-container > #urlbar:-moz-locale-dir(rtl) { - /* let winstripe-urlbar-back-button-clip-path clip the urlbar's right side for RTL */ - transform: scaleX(-1); +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl) { + -moz-box-direction: reverse; } html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, @@ -1965,11 +1883,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, color: #E7ADE7; } -#urlbar:-moz-lwtheme[focused="true"], -.searchbar-textbox:-moz-lwtheme[focused="true"] { -/* background-color: white; */ -} - #urlbar-container { -moz-box-orient: horizontal; -moz-box-align: stretch; @@ -1981,7 +1894,6 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, .urlbar-input-box { -moz-margin-start: 0; - min-width: 4em; } #urlbar-icons { @@ -2020,7 +1932,10 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, -moz-margin-start: 0; } -#urlbar-display { +#urlbar-display-box { +} + +.urlbar-display { -moz-border-end: 1px solid #9C9CFF; -moz-margin-end: 3px; margin-top: 0; @@ -2029,6 +1944,10 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, color: #8050B0; } +#search-container { + min-width: calc(54px + 11ch); +} + /* identity box */ #identity-box { @@ -2036,51 +1955,56 @@ html|*.urlbar-input:-moz-lwtheme::-moz-placeholder, font-size: .9em; } +#identity-box:-moz-locale-dir(ltr) { +/* border-top-left-radius: 1.5px; + border-bottom-left-radius: 1.5px;*/ +} + +#identity-box:-moz-locale-dir(rtl) { +/* border-top-right-radius: 1.5px; + border-bottom-right-radius: 1.5px;*/ +} + #notification-popup-box:not([hidden]) + #identity-box { -moz-padding-start: 10px !important; border-radius: 0; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button + #urlbar-container > #urlbar > #identity-box { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { /* border-radius: 0; */ -moz-padding-start: 2px; -moz-padding-end: 2px; -moz-margin-end: 1px; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not([switchingtabs]) > #urlbar > #identity-box { + transition: padding-left, padding-right; +} + +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > + #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { padding-left: 2px; - transition: padding-left; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > + #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { padding-right: 2px; - transition: padding-right; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled]:hover:not([switchingtabs]) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:hover:not([switchingtabs]) > #forward-button[disabled] + #urlbar > + #notification-popup-box[hidden] + #identity-box { /* forward button hiding is delayed when hovered */ transition-delay: 100s; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(ltr) { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #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 */ padding-left: 2.01px; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled]:not(:hover) + #urlbar-container > #urlbar > #notification-popup-box[hidden] + #identity-box:-moz-locale-dir(rtl) { +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:not(:hover) > #forward-button[disabled] + #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 */ padding-right: 2.01px; } @@ -2103,7 +2027,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon } #identity-box.verifiedIdentity:not(:-moz-lwtheme) { - background-color: #000000; + var(--verified-identity-box-backgroundcolor); } #identity-box:-moz-focusring { @@ -2144,15 +2068,20 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon /* === BEGIN identity-block.inc.css === */ -#urlbar[pageproxystate="valid"] > #identity-box.chromeUI { +:root { + --identity-box-verified-color: #008484; /* Default theme does different color per channel, we can't as they do it build-time. */ - color: #9C9CFF; - -moz-border-end: 1px solid #9C9CFF; + --identity-box-chrome-color: #9C9CFF; +} + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI { + color: var(--identity-box-chrome-color); + -moz-border-end: 1px solid var(--identity-box-chrome-color); } #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { - color: #008484; - -moz-border-end: 1px solid #008484; + color: var(--identity-box-verified-color); + -moz-border-end: 1px solid var(--identity-box-verified-color); } #urlbar[pageproxystate="valid"] > #identity-box.chromeUI, @@ -2220,6 +2149,10 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon -moz-image-region: rect(0, 16px, 16px, 0); } +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box > #page-proxy-favicon { +/* -moz-margin-end: 1px;*/ +} + #identity-box:hover > #page-proxy-favicon { -moz-image-region: rect(0, 32px, 16px, 16px); } @@ -2268,14 +2201,25 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon height: 16px; } +richlistitem[selected="true"][current="true"] > .ac-title-box > .ac-result-type-bookmark, +.autocomplete-treebody::-moz-tree-image(selected, current, bookmark, treecolAutoCompleteImage) { +/* -moz-image-region: rect(0px 48px 16px 32px);*/ +} + .ac-result-type-keyword, -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { - list-style-image: url("chrome://global/skin/icons/Search-glass.png"); - -moz-image-region: rect(0px 32px 16px 16px); +.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage), +richlistitem[type~="action"][actiontype="searchengine"] > .ac-title-box > .ac-site-icon { + list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon"); width: 16px; height: 16px; } + .ac-result-type-keyword[selected="true"], + .autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected), + richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-title-box > .ac-site-icon { + list-style-image: url("chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted"); + } + .ac-result-type-tag, .autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { list-style-image: url("chrome://mozapps/skin/places/tagContainerIcon.png"); @@ -2284,15 +2228,16 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon } .ac-comment { - font-size: 1.15em; + font-size: 1.06em; } .ac-extra > .ac-comment { - font-size: inherit; + font-size: 1em; } .ac-url-text, .ac-action-text { + font-size: 1em; color: #9C9CFF; } @@ -2329,21 +2274,15 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- /* combined go/reload/stop button in location bar */ -#go-button, #urlbar > toolbarbutton { - list-style-image: url("chrome://browser/skin/reload-stop-go.png"); - /* margin: -2px; */ -moz-margin-start: 0; padding: 0 2px; background-origin: border-box; border: none; + list-style-image: url("chrome://browser/skin/reload-stop-goFx.png"); -moz-border-start: 1px solid #9C9CFF; } -#go-button { - padding: 0 3px; -} - #urlbar:-moz-locale-dir(ltr) > toolbarbutton { border-top-left-radius: 0px; border-bottom-left-radius: 0px; @@ -2354,39 +2293,38 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- border-bottom-right-radius: 0px; } -#urlbar > toolbarbutton:not([disabled]):active:hover, +#urlbar > toolbarbutton:not([disabled=true]):active:hover, #urlbar-reload-button:not(:hover) { -moz-border-start-style: none; -moz-padding-start: 3px; } -#urlbar > toolbarbutton:not([disabled]):active:hover { +#urlbar-reload-button { + -moz-image-region: rect(0px, 14px, 14px, 0px); } -#urlbar-go-button { - -moz-image-region: rect(0, 42px, 14px, 28px); +#urlbar-reload-button[disabled=true] { + -moz-image-region: rect(28px, 14px, 42px, 0px); } -#go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon, -#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { - transform: scaleX(-1); +#urlbar-reload-button:not([disabled=true]):hover { + -moz-image-region: rect(14px, 14px, 28px, 0px); } -#urlbar-go-button:hover, -#go-button:hover { - -moz-image-region: rect(14px, 42px, 28px, 28px); +#urlbar-reload-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1); } -#urlbar-reload-button { - -moz-image-region: rect(0px, 14px, 14px, 0px); +#urlbar-go-button { + -moz-image-region: rect(0, 42px, 14px, 28px); } -#urlbar-reload-button[disabled] { - -moz-image-region: rect(28px, 14px, 42px, 0px); +#urlbar-go-button:hover { + -moz-image-region: rect(14px, 42px, 28px, 28px); } -#urlbar-reload-button:not([disabled]):hover { - -moz-image-region: rect(14px, 14px, 28px, 0px); +#urlbar-go-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { + transform: scaleX(-1); } #urlbar-stop-button { @@ -2410,107 +2348,143 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- -moz-image-region: rect(0, 32px, 16px, 16px); } -/* social share panel */ +/* === BEGIN readinglist.inc.css === */ -#social-share-panel > iframe { -/* background: linear-gradient(to bottom, #f0f4f7, #fafbfc);*/ - width: 300px; - height: 150px; -} +/* Reading List button */ -#social-share-button { - list-style-image: url("chrome://browser/skin/social/share-button.png"); - -moz-image-region: rect(0, 16px, 16px, 0); +#urlbar:not([focused]):not(:hover) #readinglist-addremove-button { + opacity: 0; + width: 0px; } -.social-share-toolbar { - border-right: 1px solid #9C9CFF; -/* background-color: #000000; */ +#readinglist-addremove-button { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage"); + -moz-image-region: rect(0, 14px, 14px, 0); + transition: width 150ms ease-in-out, opacity 150ms ease-in-out 150ms; + opacity: 1; + width: 20px; } -#social-share-provider-buttons { - padding: 6px; +#readinglist-addremove-button:hover { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-hover"); } -#social-share-provider-buttons > .share-provider-button { - -moz-appearance: none; - padding: 5px; - margin: 1px; - border: none; - background: none; - border-radius: 2px; +#readinglist-addremove-button:active { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#addpage-active"); } -#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]), -#social-share-provider-buttons > .share-provider-button:hover, -#social-share-provider-buttons > .share-provider-button:active { - padding: 4px; +#readinglist-addremove-button[already-added="true"] { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded"); } -#social-share-provider-buttons > .share-provider-button[checked="true"]:not([disabled="true"]) { +#readinglist-addremove-button[already-added="true"]:hover { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-hover"); } -#social-share-provider-buttons > .share-provider-button > .toolbarbutton-text { - display: none; +#readinglist-addremove-button[already-added="true"]:active { + list-style-image: url("chrome://browser/skin/readinglist/icons.svg#alreadyadded-active"); } -#social-share-provider-buttons > .share-provider-button > .toolbarbutton-icon { - width: 16px; - min-height: 16px; - max-height: 16px; + +/* === END readinglist.inc.css === */ + +/* Reader mode button */ + +#reader-mode-button { + list-style-image: url("chrome://browser/skin/readerMode.svg"); + -moz-image-region: rect(0, 16px, 16px, 0); } -/* fixup corners for share panel */ -.social-panel > .social-panel-frame { - border-radius: inherit; +#reader-mode-button:hover, +#reader-mode-button[readeractive]:hover { + -moz-image-region: rect(0, 32px, 16px, 16px); } -#social-share-panel { - max-height: 600px; - min-height: 100px; - max-width: 800px; - min-width: 300px; +#reader-mode-button:hover:active, +#reader-mode-button[readeractive] { + -moz-image-region: rect(0, 48px, 16px, 32px); } +/* social share panel */ + .social-share-frame { -/* background: linear-gradient(to bottom, #f0f4f7, #fafbfc); */ - width: 330px; + min-width: 756px; height: 150px; - /* we resize our panels dynamically, make it look nice */ - transition: height 100ms ease-out, width 100ms ease-out; } -.social-share-frame:-moz-locale-dir(ltr) { - border-top-left-radius: 0; - border-bottom-left-radius: 0; - border-top-right-radius: inherit; - border-bottom-right-radius: inherit; +#share-container { + min-width: 756px; + background-color: white; + background-repeat: no-repeat; + background-position: center center; +} +#share-container[loading] { + background-image: url(chrome://browser/skin/tabbrowser/pendingpaint.png); +} +#share-container > browser { + transition: opacity 150ms ease-in-out; + opacity: 1; +} +#share-container[loading] > browser { + opacity: 0; } -.social-share-frame:-moz-locale-dir(rtl) { - border-top-left-radius: inherit; - border-bottom-left-radius: inherit; - border-top-right-radius: 0; - border-bottom-right-radius: 0; +.social-share-toolbar { + border-bottom: 1px solid #9C9CFF; + padding: 2px; } -#social-share-panel > .social-share-toolbar:-moz-locale-dir(ltr) { - border-top-left-radius: inherit; - border-bottom-left-radius: inherit; +#social-share-provider-buttons { + padding: 0; + margin: 0; } -#social-share-panel > .social-share-toolbar:-moz-locale-dir(rtl) { - border-top-right-radius: inherit; +.share-provider-button { + padding: 5px; + margin: 2px; +} + +.share-provider-button > .toolbarbutton-text { + display: none; +} +.share-provider-button > .toolbarbutton-icon { + width: 16px; + min-height: 16px; + max-height: 16px; +} + +toolbarbutton[type="socialmark"] > .toolbarbutton-icon { + width: auto; + height: auto; + max-width: 32px; + max-height: 24px; +} + +/* fixup corners for share panel */ +.social-panel > .social-panel-frame { + border-radius: inherit; +} + +#social-share-panel { + min-height: 100px; + min-width: 766px; +} + +#share-container, +.social-share-frame { + border-top-left-radius: 0; + border-bottom-left-radius: inherit; + border-top-right-radius: 0; border-bottom-right-radius: inherit; } -#social-share-provider-buttons:-moz-locale-dir(ltr) { +#social-share-panel > .social-share-toolbar { border-top-left-radius: inherit; - border-bottom-left-radius: inherit; + border-top-right-radius: inherit; } -#social-share-provider-buttons:-moz-locale-dir(rtl) { +#social-share-provider-buttons { + border-top-left-radius: inherit; border-top-right-radius: inherit; - border-bottom-right-radius: inherit; } /* social recommending panel */ @@ -2519,35 +2493,40 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- -moz-image-region: rect(0, 16px, 16px, 0); } -/* star button */ +/* bookmarks menu-button */ -/* #urlbar-container only directly contains the urlbar pre-Australis, don't assign an icon in Australis */ -#urlbar-container > #urlbar > #urlbar-icons > #star-button { - list-style-image: url("chrome://communicator/skin/bookmarks/bookmark.png"); - -moz-image-region: rect(16px 16px 32px 0px); +#bookmarks-menu-button.bookmark-item { + list-style-image: url("chrome://browser/skin/places/bookmark.png"); + -moz-image-region: rect(0px 16px 16px 0px); } -#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover { - -moz-image-region: rect(16px 32px 32px 16px); +#bookmarks-menu-button.bookmark-item[starred] { + -moz-image-region: rect(0px 32px 16px 16px); } -#urlbar-container > #urlbar > #urlbar-icons > #star-button:hover:active { - -moz-image-region: rect(16px 48px 32px 32px); +#bookmarks-menu-button.bookmark-item > .toolbarbutton-menubutton-button > .toolbarbutton-icon { + -moz-margin-start: 5px; } -#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"] { - -moz-image-region: rect(0px 16px 16px 0px); +#bookmarks-menu-button[cui-areatype="toolbar"]:not(.bookmark-item):not([overflowedItem=true]) > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { + padding-top: 2px; + padding-bottom: 2px; } -#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover { - -moz-image-region: rect(0px 32px 16px 16px); +#BMB_bookmarksPopup[side="top"], +#BMB_bookmarksPopup[side="bottom"] { + margin-left: -20px; + margin-right: -20px; } -#urlbar-container > #urlbar > #urlbar-icons > #star-button[starred="true"]:hover:active { - -moz-image-region: rect(0px 48px 16px 32px); +#BMB_bookmarksPopup[side="left"], +#BMB_bookmarksPopup[side="right"] { + margin-top: -20px; + margin-bottom: -20px; } /* bookmarking panel */ + #editBookmarkPanelStarIcon { list-style-image: url("chrome://browser/skin/places/starred48.png"); width: 48px; @@ -2573,8 +2552,8 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- } .panel-promo-box { - margin: 5px -6px -6px; - padding: 5px; + margin: 5px 0 -6px; + padding: 5px 0; border-top: 1px solid #9C9CFF; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px; @@ -2602,51 +2581,67 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- .panel-promo-closebutton > .toolbarbutton-text { padding: 0; - margin: 0; } /* ::::: content area ::::: */ +#sidebar-box { + background-color: #9C9CFF; + color: #000000; +} + #sidebar { - background-color: Window; + background-color: #000000; +} + +#sidebar-splitter { + -moz-margin-start: 0; +} + +#sidebar-header { + color: #000000; + padding: 2px; } #sidebar-title { -moz-padding-start: 0px; } -.browserContainer > findbar { -/* - background-color: -moz-dialog; - color: -moz-DialogText; -*/ +#sidebar-header > .close-icon { +/* padding: 4px 2px; + margin: 0; + border: none;*/ + list-style-image: url("chrome://global/skin/icons/close-button.gif"); } -/* ::::: throbber ::::: */ +#sidebar-header > .close-icon:hover, +#sidebar-header > .close-icon:hover:active { + list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); +} -#navigator-throbber { - width: 16px; - min-height: 16px; - margin: 0 3px; +#sidebar-splitter:-moz-locale-dir(ltr), +#sidebar:-moz-locale-dir(ltr) { + border-radius: 0 5px 0 0; } -#navigator-throbber[busy="true"] { - list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png"); +#sidebar-splitter:-moz-locale-dir(rtl), +#sidebar:-moz-locale-dir(rtl) { + border-radius: 5px 0 0 0; } -#navigator-throbber, -#wrapper-navigator-throbber > #navigator-throbber { - list-style-image: url("chrome://communicator/skin/brand/throbber16-single.png"); +.browserContainer > findbar { +/* + background-color: -moz-dialog; + color: -moz-DialogText; +*/ } /* Tabstrip */ -/* Remove selector when Australis lands - this makes it only apply post-Australis as iconsize doesn't exist there */ -#navigator-toolbox:not([iconsize]) > #TabsToolbar, #TabsToolbar { min-height: 0; padding: 0; - -moz-binding: url("chrome://global/content/bindings/toolbar.xml#toolbar"); + -moz-binding: url("chrome://browser/content/customizableui/toolbar.xml#toolbar"); } #TabsToolbar .toolbar-holder { @@ -2658,12 +2653,22 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- border-bottom: 1px solid #008484; } +/* === BEGIN tabs.inc.css === */ + +:root { + /* --tab-toolbar-navbar-overlap: 1px; */ + /* --tab-min-height: 31px; */ + /* --tab-curve-width: 30px; */ + /* --tab-curve-half-width: 15px; */ +} + .tabbrowser-tab, -.tabs-newtab-button { +.tabs-newtab-button, +#TabsToolbar > #new-tab-button { margin-top: 0px; } -.tabbrowser-tab{ +.tabbrowser-tab { padding: 1px 4px 2px; } @@ -2671,12 +2676,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- -moz-margin-start: 2px; } -.tabs-newtab-button { +.tabs-newtab-button, +#TabsToolbar > #new-tab-button { border-radius: 8px 8px 0px 0px; -moz-margin-start: 0; } -.tabs-newtab-button:not(:hover) { +.tabs-newtab-button:not(:hover), +#TabsToolbar > #new-tab-button:not(:hover) { background-color: #C09070; } @@ -2684,56 +2691,51 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- text-decoration: underline; } -.tabbrowser-tab:hover, -.tabs-newtab-button:hover { -} - -.tabbrowser-tab[selected="true"] { -} - -#main-window[tabsontop=false]:not([disablechrome]) .tabbrowser-tab[selected=true]:not(:-moz-lwtheme) { -} - -.tabbrowser-tab:-moz-lwtheme { +/* The selected tab should appear above adjacent tabs, .tabs-newtab-button and the highlight of #nav-bar */ +.tabbrowser-tab[selected=true] { +/* position: relative; + z-index: 2;*/ } -.tabbrowser-tab[selected="true"]:-moz-lwtheme { +.tab-background-middle { } -.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]), -.tabs-newtab-button:-moz-lwtheme-brighttext { +.tab-content { } -.tabbrowser-tab:-moz-lwtheme-brighttext:not([selected="true"]):hover, -.tabs-newtab-button:-moz-lwtheme-brighttext:hover { +.tab-content[pinned] { } -.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]), -.tabs-newtab-button:-moz-lwtheme-darktext { +.tab-throbber, +.tab-icon-image, +.tab-close-button { } -.tabbrowser-tab:-moz-lwtheme-darktext:not([selected="true"]):hover, -.tabs-newtab-button:-moz-lwtheme-darktext:hover { +.tab-throbber, +.tab-icon-image { + height: 16px; + width: 16px; + -moz-margin-end: 3px; } -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { - background-color: #E7ADE7; -} -.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover { - background-color: #3333FF; - color: #000000; +.tab-icon-image { + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } -.tab-throbber, -.tab-icon-image { +.tab-icon-overlay { width: 16px; height: 16px; - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); - -moz-image-region: auto; - -moz-margin-end: 3px; + /* margin-top: 10px; */ + -moz-margin-start: -16px; + display: none; +} + +.tab-icon-overlay[crashed] { + display: -moz-box; + list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } -.tab-throbber { +.tab-throbber[busy] { list-style-image: url("chrome://communicator/skin/brand/throbber16-anim-connect.png"); } @@ -2747,11 +2749,115 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- -moz-margin-end: 2px; } +.tab-label { + /* this needs to add up to the 16px of the icon image */ + height: 12px; + margin-top: 2px !important; + margin-bottom: 2px !important; +} + +.tab-close-button { + margin-top: 1px; + padding: 0; +} + +.tab-background, +.tabs-newtab-button { + /* overlap the tab curves */ +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox { +} + +/* Tab Overflow */ +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]), +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) { +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:-moz-locale-dir(rtl), +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:-moz-locale-dir(ltr) { +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator:not([collapsed]) { +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator:not([collapsed]) { +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator[collapsed], +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator[collapsed] { +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-start-indicator, +.tabbrowser-arrowscrollbox > .arrowscrollbox-overflow-end-indicator { +} + +.tab-background-start[selected=true]::after, +.tab-background-start[selected=true]::before, +.tab-background-start, +.tab-background-end, +.tab-background-end[selected=true]::after, +.tab-background-end[selected=true]::before { +} + +.tabbrowser-tab:not([selected=true]), +.tabbrowser-tab:-moz-lwtheme { +} + /* tabbrowser-tab focus ring */ -.tabbrowser-tab:focus > .tab-stack { +.tabbrowser-tab:focus { outline: 1px dotted; } +/* Selected tab */ + +.tabbrowser-tab[selected="true"] { +} + +/* End selected tab */ + +/* Tab pointer-events */ +/* +.tabbrowser-tab { + pointer-events: none; +} + +.tab-background-middle, +.tabs-newtab-button, +.tab-close-button { + pointer-events: auto; +} +*/ +/* Pinned tabs */ + +.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]) { + background-color: #E7ADE7; +} + +.tabbrowser-tab[pinned][titlechanged]:not([selected="true"]):hover { + background-color: #3333FF; + color: #000000; +} + +/* New tab button */ + +.tabs-newtab-button { + width: 28px; + /* width: calc(36px + var(--tab-curve-width)); */ +} + +/* === END tabs.inc.css === */ + +/* Background tabs: + * + * Decrease the height of the hoverable region of background tabs whenever the tabs are at the top + * of the window (e.g. no menubar, tabs in titlebar, etc.) to make it easier to drag the window by + * the titlebar. We don't need this in fullscreen since window dragging is not an issue there. + */ +#main-window[tabsintitlebar][sizemode=normal] #toolbar-menubar[autohide="true"][inactive] + #TabsToolbar .tab-background-middle:not([selected=true]) { +/* clip-path: url(chrome://browser/content/browser.xul#tab-hover-clip-path);*/ +} + /* Tab DnD indicator */ .tab-drop-indicator { list-style-image: url("chrome://browser/skin/tabbrowser/tabDragIndicator.png"); @@ -2760,9 +2866,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- /* Tab close button */ .tab-close-button { - border: none; - padding: 0px; - margin-top: 1px; list-style-image: url("chrome://global/skin/icons/close-button.gif"); } @@ -2783,12 +2886,39 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- margin: 0; padding-top: 0; padding-bottom: 0; + background-origin: border-box; +} + +#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) .tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-lwtheme-brighttext, +.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-lwtheme-brighttext { + } + +.tabbrowser-arrowscrollbox > .scrollbutton-up[disabled], +.tabbrowser-arrowscrollbox > .scrollbutton-down[disabled] { + } + +.tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(rtl), +.tabbrowser-arrowscrollbox > .scrollbutton-down:-moz-locale-dir(ltr) { +/* transform: scaleX(-1);*/ +} + +.tabbrowser-arrowscrollbox > .scrollbutton-down { + transition: 1s background-color ease-out; } .tabbrowser-arrowscrollbox > .scrollbutton-down[notifybgtab] { background-color: #008484; } +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]), +.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]) { +/* border-width: 0 2px 0 0; + border-style: solid; + border-image: url("chrome://browser/skin/tabbrowser/tab-overflow-border.png") 0 2 0 2 fill;*/ +} + .tabs-newtab-button > .toolbarbutton-icon { margin-top: -1px; margin-bottom: -1px; @@ -2796,31 +2926,33 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- .tabs-newtab-button, #TabsToolbar > #new-tab-button, -#TabsToolbar > toolbarpaletteitem > #new-tab-button { - list-style-image: url("chrome://browser/skin/tabbrowser/newtab.png"); +#TabsToolbar > toolbarpaletteitem > #new-tab-button, +#TabsToolbar > toolbarpaletteitem > #new-tab-button[cui-areatype="toolbar"] { + list-style-image: url("chrome://browser/skin/tabbrowser/newtabFx.png"); -moz-image-region: rect(0, 16px, 18px, 0); } -.tabs-newtab-button { - width: 28px; -} - -#TabsToolbar > #new-tab-button { - width: 26px; -} - .tabs-newtab-button, .tabs-newtab-button:hover, +#TabsToolbar > #new-tab-button, #TabsToolbar > #new-tab-button:hover { -moz-image-region: rect(0, 32px, 18px, 16px); } -#alltabs-button { - list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); +#main-window[tabsintitlebar]:not([inFullscreen]) .tabs-newtab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > #new-tab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#main-window[tabsintitlebar]:not([inFullscreen]) #TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +.tabs-newtab-button:-moz-lwtheme-brighttext, +#TabsToolbar > #new-tab-button:-moz-lwtheme-brighttext, +#TabsToolbar > toolbarpaletteitem > #new-tab-button:-moz-lwtheme-brighttext { } -#alltabs-button > .toolbarbutton-menu-dropmarker { - display: none; +#TabsToolbar > #new-tab-button { + width: 26px; +} + +#alltabs-button { + list-style-image: url("chrome://global/skin/arrow/arrow-down.gif"); } #alltabs-button:hover, @@ -2829,6 +2961,18 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- list-style-image: url("chrome://global/skin/arrow/arrow-down-hover.gif"); } +#main-window[tabsintitlebar]:not([inFullscreen]) #alltabs-button:-moz-system-metric(windows-classic):not(:-moz-lwtheme), +#alltabs-button:-moz-lwtheme-brighttext { +} + +#alltabs-button > .toolbarbutton-icon { +/* margin: 0 2px;*/ +} + +#alltabs-button > .toolbarbutton-menu-dropmarker { + display: none; +} + /* All tabs menupopup */ .alltabs-item > .menu-iconic-left > .menu-iconic-icon { list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); @@ -2847,26 +2991,6 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- background-color: #402800; } -/* Tabstrip close button */ -.tabs-closebutton { - -moz-box-flex: 1; - margin: 0px; - padding: 2px; - list-style-image: url("chrome://global/skin/icons/close-button.gif"); -} - -.tabs-closebutton > .toolbarbutton-icon { -} - -.tabs-closebutton > .toolbarbutton-text { - display: none; -} - -.tabs-closebutton:hover, -.tabs-closebutton:hover:active { - list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); -} - toolbarbutton.chevron { list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important; } @@ -2874,7 +2998,11 @@ toolbarbutton.chevron { toolbarbutton.chevron:hover { list-style-image: url("chrome://global/skin/toolbar/chevron-hover.gif") !important; } - +/* +toolbar[brighttext] toolbarbutton.chevron { + list-style-image: url("chrome://global/skin/toolbar/chevron-inverted.png") !important; +} +*/ toolbarbutton.chevron:-moz-locale-dir(rtl) > .toolbarbutton-icon, toolbarbutton.chevron:-moz-locale-dir(rtl):hover > .toolbarbutton-icon { transform: scaleX(-1); @@ -2889,10 +3017,6 @@ toolbarbutton.chevron > .toolbarbutton-icon { margin: 0; } -toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon { - display: -moz-box; /* display chevron icon in text mode */ -} - #sidebar-throbber[loading="true"] { list-style-image: url("chrome://global/skin/icons/loading.gif"); -moz-margin-end: 4px; @@ -2993,6 +3117,24 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://browser/skin/Secure24.png"); } +#identity-popup-help-icon { + border: none; + margin: 7px 0 0 -3px; + background: none; + min-width: 0; + list-style-image: url("chrome://global/skin/icons/question-16.png"); + cursor: pointer; +} + +#identity-popup-help-icon > .button-box > .button-text { + display: none; +} + +#identity-popup-help-icon > .button-box > .button-icon { + height: 16px; + width: 16px; +} + #identity-popup-more-info-button { margin-top: 6px; margin-bottom: 0; @@ -3039,10 +3181,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://mozapps/skin/plugins/pluginBlocked-64.png"); } -.popup-notification-icon[popupid="plugins-not-found"] { - list-style-image: url("chrome://browser/skin/pluginInstall-64.png"); -} - .popup-notification-icon[popupid="web-notifications"] { list-style-image: url("chrome://browser/skin/notification-64.png"); } @@ -3079,7 +3217,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { } .popup-notification-icon[popupid="indexedDB-permissions-prompt"], -.popup-notification-icon[popupid="indexedDB-quota-prompt"], .popup-notification-icon[popupid*="offline-app-requested"], .popup-notification-icon[popupid="offline-app-usage"] { list-style-image: url("chrome://global/skin/icons/alert-question.gif"); @@ -3095,8 +3232,13 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://global/skin/icons/webapps-64.png"); } -.popup-notification-icon[popupid="mixed-content-blocked"] { - list-style-image: url("chrome://browser/skin/mixed-content-blocked-64.png"); +.popup-notification-icon[popupid="bad-content"] { + list-style-image: url("chrome://browser/skin/bad-content-blocked-64.png"); +} + +.popup-notification-icon[popupid="bad-content"][mixedblockdisabled], +.popup-notification-icon[popupid="bad-content"][trackingblockdisabled] { + list-style-image: url(chrome://browser/skin/bad-content-unblocked-64.png); } .popup-notification-icon[popupid="webRTC-sharingDevices"], @@ -3104,11 +3246,25 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url("chrome://browser/skin/webRTC-shareDevice-64.png"); } +.popup-notification-icon[popupid="webRTC-sharingMicrophone"], +.popup-notification-icon[popupid="webRTC-shareMicrophone"] { + list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-64.png"); +} + +.popup-notification-icon[popupid="webRTC-sharingScreen"], +.popup-notification-icon[popupid="webRTC-shareScreen"] { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-64.png); +} + .popup-notification-icon[popupid="pointerLock"] { list-style-image: url("chrome://browser/skin/pointerLock-64.png"); } /* Notification icon box */ +#notification-popup .panel-promo-box { +/* margin: 10px -10px -10px; */ +} + #notification-popup-box { position: relative; background-color: #000000; @@ -3121,10 +3277,8 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { border-right-width: 8px; } -window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icons] > - :-moz-any(#nav-bar[currentset*="unified-back-forward-button,urlbar-container"],#nav-bar:not([currentset])) > - #unified-back-forward-button[forwarddisabled] + #urlbar-container > #urlbar > #notification-popup-box { -/* padding-left: 5px; */ +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #forward-button[disabled] + #urlbar > #notification-popup-box { +/* padding-left: 7px; */ } #notification-popup-box:-moz-locale-dir(rtl), @@ -3140,7 +3294,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon .notification-anchor-icon:-moz-focusring { outline: 1px dotted #008484; -/* outline-offset: -3px; */ } .default-notification-icon, @@ -3179,30 +3332,22 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon list-style-image: url("chrome://browser/skin/notification-pluginNormal.png"); } -#alert-plugins-notification-icon { +#plugins-notification-icon.plugin-hidden { list-style-image: url("chrome://browser/skin/notification-pluginAlert.png"); } -#blocked-plugins-notification-icon { +#plugins-notification-icon.plugin-blocked { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -#plugins-notification-icon, -#alert-plugins-notification-icon, -#blocked-plugins-notification-icon { +#plugins-notification-icon { /* -moz-image-region: rect(0, 16px, 16px, 0);*/ } -#plugins-notification-icon:hover, -#alert-plugins-notification-icon:hover, -#blocked-plugins-notification-icon:hover { +#plugins-notification-icon:hover { /* -moz-image-region: rect(0, 32px, 16px, 16px);*/ } -#plugin-install-notification-icon { - list-style-image: url("chrome://browser/skin/pluginInstall-16.png"); -} - #notification-popup-box[hidden] { /* Override display:none to make the pluginBlockedNotification animation work when showing the notification repeatedly. */ @@ -3210,7 +3355,7 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon visibility: collapse; } -#blocked-plugins-notification-icon[showing] { +#plugins-notification-icon.plugin-blocked[showing] { animation: pluginBlockedNotification 500ms ease 0s 5 alternate both; } @@ -3223,9 +3368,14 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon } } -.mixed-content-blocked-notification-icon, -#mixed-content-blocked-notification-icon { - list-style-image: url("chrome://browser/skin/mixed-content-blocked-16.png"); +.bad-content-blocked-notification-icon, +#bad-content-blocked-notification-icon { + list-style-image: url("chrome://browser/skin/bad-content-blocked-16.png"); +} + +.bad-content-unblocked-notification-icon, +#bad-content-unblocked-notification-icon { + list-style-image: url(chrome://browser/skin/bad-content-unblocked-16.png); } .webRTC-shareDevices-notification-icon, @@ -3238,6 +3388,26 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon list-style-image: url("chrome://browser/skin/webRTC-sharingDevice-16.png"); } +.webRTC-shareMicrophone-notification-icon, +#webRTC-shareMicrophone-notification-icon { + list-style-image: url("chrome://browser/skin/webRTC-shareMicrophone-16.png"); +} + +.webRTC-sharingMicrophone-notification-icon, +#webRTC-sharingMicrophone-notification-icon { + list-style-image: url("chrome://browser/skin/webRTC-sharingMicrophone-16.png"); +} + +.webRTC-shareScreen-notification-icon, +#webRTC-shareScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); +} + +.webRTC-sharingScreen-notification-icon, +#webRTC-sharingScreen-notification-icon { + list-style-image: url(chrome://browser/skin/webRTC-sharingScreen-16.png); +} + .web-notifications-notification-icon, #web-notifications-notification-icon { list-style-image: url("chrome://browser/skin/notification-16.png"); @@ -3250,14 +3420,119 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon margin: 0px; } -#download-monitor { - list-style-image: url("chrome://browser/skin/FxToolbar.png"); - -moz-image-region: rect(0, 108px, 18px, 90px); +/* Translation infobar */ + +/* === BEGIN infobar.inc.css === */ + +notification[value="translation"] .messageImage { + list-style-image: url("chrome://browser/skin/translation-16.png"); + -moz-image-region: rect(0, 32px, 16px, 16px); +} + +@media (min-resolution: 1.25dppx) { + notification[value="translation"] .messageImage { + list-style-image: url("chrome://browser/skin/translation-16@2x.png"); + -moz-image-region: rect(0, 64px, 32px, 32px); + } +} + +notification[value="translation"][state="translating"] .messageImage { + list-style-image: url("chrome://browser/skin/translating-16.png"); + -moz-image-region: auto; +} + +@media (min-resolution: 1.25dppx) { + notification[value="translation"][state="translating"] .messageImage { + list-style-image: url("chrome://browser/skin/translating-16@2x.png"); + } +} + +notification[value="translation"] button, +notification[value="translation"] menulist { + min-width: 0; +} + +notification[value="translation"] menulist > .menulist-dropmarker { +} + +.translation-menupopup arrowscrollbox { + padding-bottom: 0; +} + +.translation-attribution { + cursor: pointer; + -moz-box-align: end; + font-size: small; +} + +.translation-attribution > label { + margin-bottom: 0; +} + +.translation-attribution > image { + width: 70px; +} + +.translation-welcome-panel { + width: 305px; +} + +.translation-welcome-logo { + height: 32px; + width: 32px; + list-style-image: url(chrome://browser/skin/translation-16@2x.png); + -moz-image-region: rect(0, 64px, 32px, 32px); +} + +.translation-welcome-content { + -moz-margin-start: 16px; +} + +.translation-welcome-headline { + font-size: larger; + font-weight: bold; +} + +.translation-welcome-body { + padding: 1em 0; + margin: 0 0; +} + +/* === END infobar.inc.css === */ + +notification[value="translation"] { + min-height: 40px; +} + +.translate-notification-icon, +#translate-notification-icon { + list-style-image: url("chrome://browser/skin/translation-16.png"); + -moz-image-region: rect(0px, 16px, 16px, 0px); +} + +.translated-notification-icon, +#translated-notification-icon { + list-style-image: url("chrome://browser/skin/translation-16.png"); + -moz-image-region: rect(0px, 32px, 16px, 16px); +} + +.translation-menupopup { + -moz-appearance: none; +} + +/* Loop/ Hello browser styles */ + +notification[value="loop-sharing-notification"] .button-menubutton-button { + min-width: 0; + border: 0; + margin: 0; +} + +notification[value="loop-sharing-notification"] .messageImage { + list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); } /* Bookmarks roots menu-items */ -#appmenu_subscribeToPage:not([disabled]), -#appmenu_subscribeToPageMenu, #subscribeToPageMenuitem:not([disabled]), #subscribeToPageMenupopup, #BMB_subscribeToPageMenuitem:not([disabled]), @@ -3266,18 +3541,24 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon } #bookmarksToolbarFolderMenu, -#appmenu_bookmarksToolbar, -#BMB_bookmarksToolbar { +#BMB_bookmarksToolbar, +#panelMenu_bookmarksToolbar { list-style-image: url("chrome://communicator/skin/bookmarks/bookmarksToolbar.png"); -moz-image-region: auto; } -#appmenu_unsortedBookmarks, -#BMB_unsortedBookmarks { +#BMB_unsortedBookmarks, +#panelMenu_unsortedBookmarks { list-style-image: url("chrome://communicator/skin/bookmarks/unsortedBookmarks.png"); -moz-image-region: auto; } +#menu_readingList, +#BMB_readingList { + list-style-image: url("chrome://browser/skin/readinglist/readinglist-icon.svg"); + -moz-image-region: auto; +} + /* ::::: Keyboard UI Panel ::::: */ .KUI-panel { @@ -3338,57 +3619,33 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon margin-top: .5em; } -/* Add-on bar */ - -#addon-bar { - min-height: 20px; - border-top: 3px solid #000000; - border-bottom-width: 0; -} - -#addon-bar .toolbar-holder { - background-color: #8050B0; - color: #FFCF00; -} - -#addon-bar .toolbar-holder { - background-color: #8050B0; - color: #FFCF00; -} +/* Sync Panel */ -#addon-bar .toolbar-startcap, -#addon-bar .toolbar-endcap{ - background-color: #6000CF; +.sync-panel-icon { + height:32px; + width: 32px; + background: url("chrome://browser/content/abouthome/sync.png") top left no-repeat; } -#status-bar { - -moz-binding: url("chrome://global/content/bindings/general.xml#statusbar"); - margin-top: .3em; - border-width: 0; +.sync-panel-inner { + width: 0; + padding-left: 10px; } -#addon-bar[customizing] > #status-bar { - opacity: .5; -/* background-image: -moz-repeating-linear-gradient(-45deg, - rgba(255,255,255,.3), rgba(255,255,255,.3) 5px, - rgba(0,0,0,.3) 5px, rgba(0,0,0,.3) 10px);*/ +.sync-panel-button-box { + margin-top: 1em; } -/* Remove all borders from statusbarpanel children of - the statusbar. -#status-bar > statusbarpanel { - border-width: 0; -} */ - -#addonbar-closebutton { - border: none; - padding: 3px 5px; - list-style-image: url("chrome://global/skin/icons/close-button.gif"); +#sync-error-panel-title, +#sync-start-panel-title { + font-size: 120%; + font-weight: bold; + margin-bottom: 5px; } -#addonbar-closebutton:hover, -#addonbar-closebutton:hover:active { - list-style-image: url("chrome://global/skin/icons/close-button-hover.gif"); +#sync-start-panel-subtitle, +#sync-error-panel-subtitle { + margin: 0; } /* Status panel */ @@ -3423,120 +3680,6 @@ window:not([chromehidden~=toolbar]) #navigator-toolbox[iconsize=large][mode=icon background-color: transparent !important; } -/* Highlighter */ - -.highlighter-outline { - box-shadow: 0 0 0 1px black; - outline: 1px dashed white; -} - -.highlighter-outline[locked] { - box-shadow: 0 0 0 1px rgba(0,0,0,0.3); - outline-color: rgba(255,255,255,0.7); -} - -/* Highlighter - Node Infobar */ - -.highlighter-nodeinfobar { - color: #FF9F00; - border: 1px solid rgba(156, 156, 255, .5); - border-radius: 3px; - background-color: #000000; - background-clip: padding-box; -} - -/* Highlighter - Node Infobar - text */ - -.highlighter-nodeinfobar-text { - /* 100% - size of the buttons and margins */ - max-width: calc(100% - 2 * (26px + 6px)); - padding-bottom: 1px; -} - -html|*.highlighter-nodeinfobar-tagname { - color: #FFCF00; -} - -html|*.highlighter-nodeinfobar-id { - color: #9C9CFF; -} - -html|*.highlighter-nodeinfobar-pseudo-classes { - color: #FF9F00; -} - -/* Highlighter - Node Infobar - buttons */ - -.highlighter-nodeinfobar-button { - padding: 0; - width: 26px; - min-height: 26px; -} - -.highlighter-nodeinfobar-inspectbutton { - list-style-image: url("chrome://browser/skin/devtools/inspect-button.png"); - -moz-image-region: rect(0px 16px 16px 0px); - -moz-margin-start: 0px; - -moz-margin-end: 2px; -} - -.highlighter-nodeinfobar-inspectbutton:-moz-locale-dir(rtl) { -} - -.highlighter-nodeinfobar-inspectbutton:hover, -.highlighter-nodeinfobar-inspectbutton:hover:active/*, -.highlighter-nodeinfobar-container:not([locked]) > .highlighter-nodeinfobar > .highlighter-nodeinfobar-inspectbutton*/ { - -moz-image-region: rect(0px 32px 16px 16px); -} - -.highlighter-nodeinfobar-menu { -} - -.highlighter-nodeinfobar-menu:-moz-locale-dir(rtl) { -} - -.highlighter-nodeinfobar-menu > .toolbarbutton-menu-dropmarker { - -moz-box-align: center; - -moz-margin-start: -1px; -} - -/* Highlighter - Node Infobar - box & arrow */ - -.highlighter-nodeinfobar-arrow { - width: 14px; - height: 14px; - -moz-margin-start: calc(50% - 7px); - transform: rotate(-45deg); - border: 1px solid transparent; - background-clip: padding-box; - background-repeat: no-repeat; -} - -.highlighter-nodeinfobar-arrow-top { - margin-bottom: -8px; - margin-top: 8px; - border-right-color: rgba(0, 132, 132, .5); - border-top-color: rgba(0, 132, 132, .5); - background-image: linear-gradient(to bottom left, transparent 50%, rgb(0, 132, 132) 50%); -} - -.highlighter-nodeinfobar-arrow-bottom { - margin-top: -8px; - margin-bottom: 8px; - border-left-color: rgba(0, 132, 132, .5); - border-bottom-color: rgba(0, 132, 132, .5); - background-image: linear-gradient(to top right, transparent 50%, rgb(0, 132, 132) 50%); -} - -.highlighter-nodeinfobar-container[position="top"] > .highlighter-nodeinfobar, -.highlighter-nodeinfobar-container[position="overlap"] > .highlighter-nodeinfobar { - box-shadow: 0 1px 0 hsla(0, 0%, 100%, .1) inset; -} - -.highlighter-nodeinfobar-container[hide-arrow] > .highlighter-nodeinfobar { - margin: 7px 0; -} - #full-screen-warning-message { background-color: #000000; color: #FF9F00; @@ -3592,7 +3735,7 @@ html|*.highlighter-nodeinfobar-pseudo-classes { min-height: 32px; */ } -.developer-toolbar-button { +#developer-toolbar > toolbarbutton { /* margin: 0; padding: 0 10px; width: 32px; */ @@ -3606,6 +3749,12 @@ html|*.highlighter-nodeinfobar-pseudo-classes { display: none; } +.developer-toolbar-button > .toolbarbutton-icon, +#developer-toolbar-closebutton > .toolbarbutton-icon { + width: 16px; + height: 16px; +} + #developer-toolbar-toolbox-button { list-style-image: url("chrome://browser/skin/devtools/toggle-tools.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); @@ -3621,6 +3770,50 @@ html|*.highlighter-nodeinfobar-pseudo-classes { -moz-image-region: rect(0px, 32px, 16px, 16px); } +@media (min-resolution: 2dppx) { + #developer-toolbar-toolbox-button { + list-style-image: url("chrome://browser/skin/devtools/toggle-tools@2x.png"); + -moz-image-region: rect(0px, 32px, 32px, 0px); + } + + #developer-toolbar-toolbox-button:hover, + #developer-toolbar-toolbox-button:hover:active, + #developer-toolbar-toolbox-button[checked=true] { + -moz-image-region: rect(0px, 64px, 32px, 32px); + } +} + +#developer-toolbar-closebutton { + list-style-image: url("chrome://browser/skin/devtools/close.png"); + -moz-image-region: rect(0px, 16px, 16px, 0px); + min-width: 16px; + width: 16px; +} + +#developer-toolbar-closebutton > .toolbarbutton-icon { +} + +#developer-toolbar-closebutton > .toolbarbutton-text { + display: none; +} + +#developer-toolbar-closebutton:hover, +#developer-toolbar-closebutton:hover:active { + -moz-image-region: rect(0px, 32px, 16px, 16px); +} + +@media (min-resolution: 2dppx) { + #developer-toolbar-closebutton { + list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); + -moz-image-region: rect(0px, 32px, 32px, 0px); + } + + #developer-toolbar-closebutton:hover, + #developer-toolbar-closebutton:hover:active { + -moz-image-region: rect(0px, 64px, 32px, 32px); + } +} + /* GCLI */ html|*#gcli-tooltip-frame, @@ -3647,14 +3840,36 @@ html|*#gcli-output-frame { } .gclitoolbar-input-node { - padding-left: 20px; /* line-height: 32px; outline-style: none; */ - background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 16, 16, 0); + background-repeat: no-repeat; + background-color: rgba(0, 0, 0, .75); } .gclitoolbar-input-node[focused="true"] { - background-image: -moz-image-rect(url("chrome://browser/skin/devtools/commandline-icon.png"), 0, 32, 16, 16); + background-color: #000000; +} + +.gclitoolbar-input-node::before { + content: ""; + display: inline-block; + -moz-box-ordinal-group: 0; + width: 16px; + height: 16px; + margin: 0 2px; + background-image: url("chrome://browser/skin/devtools/commandline-icon.png"); + background-position: 0 center; + background-size: 32px 16px; +} + +.gclitoolbar-input-node[focused="true"]::before { + background-position: -16px center; +} + +@media (min-resolution: 2dppx) { + .gclitoolbar-input-node::before { + background-image: url("chrome://browser/skin/devtools/commandline-icon@2x.png"); + } } .gclitoolbar-input-node:not([focused="true"]) { @@ -3713,7 +3928,7 @@ html|*#gcli-output-frame { /* Responsive Mode */ .browserContainer[responsivemode] { - background: #221500 url("chrome://browser/skin/devtools/responsive-background.png"); + background-color: #221500; padding: 0 20px 20px 20px; } @@ -3723,41 +3938,159 @@ html|*#gcli-output-frame { .devtools-responsiveui-toolbar { background: transparent; + /* text color is textColor from dark theme, since no theme is applied to + * the responsive toolbar. + */ + color: #FF9F00; margin: 10px 0; padding: 0; box-shadow: none; border-bottom-width: 0; } -.devtools-responsiveui-toolbar > menulist, -.devtools-responsiveui-toolbar > toolbarbutton { - min-width: 22px; -/* border-radius: 0; */ +.devtools-responsiveui-menulist, +.devtools-responsiveui-toolbarbutton { + -moz-box-align: center; + min-width: 32px; +/* min-height: 22px;*/ +/* margin: 0 3px; */ } -.devtools-responsiveui-toolbar:-moz-locale-dir(ltr) > *:first-child, -.devtools-responsiveui-toolbar:-moz-locale-dir(rtl) > *:last-child { - margin-left: 3px; +.devtools-responsiveui-menulist .menulist-editable-box { + background-color: transparent; } -.devtools-responsiveui-close { - list-style-image: url("chrome://browser/skin/devtools/close.png"); - -moz-image-region: rect(0px,16px,16px,0px); +.devtools-responsiveui-menulist html|*.menulist-editable-input { + color: inherit; + text-align: center; } -.devtools-responsiveui-close:hover { - -moz-image-region: rect(0px,32px,16px,16px); +.devtools-responsiveui-menulist html|*.menulist-editable-input::-moz-selection { +/* background: hsla(212,7%,57%,.35);*/ } -.devtools-responsiveui-rotate { - list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); - -moz-image-region: rect(0px,16px,16px,0px); -} +.devtools-responsiveui-toolbarbutton > .toolbarbutton-icon { + width: 16px; + height: 16px; +} + +.devtools-responsiveui-toolbarbutton > .toolbarbutton-menubutton-button { + -moz-box-orient: horizontal; +} + +.devtools-responsiveui-menulist:-moz-focusring, +.devtools-responsiveui-toolbarbutton:-moz-focusring { +/* outline: 1px dotted hsla(210,30%,85%,0.7); + outline-offset: -4px;*/ +} + +.devtools-responsiveui-toolbarbutton:not([label]) > .toolbarbutton-text { + display: none; +} + +.devtools-responsiveui-toolbarbutton:not([checked=true]):hover:active { +/* border-color: hsla(210,8%,5%,.6); + background: linear-gradient(hsla(220,6%,10%,.3), hsla(212,7%,57%,.15) 65%, hsla(212,7%,57%,.3)); + box-shadow: 0 0 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15); */ +} + +.devtools-responsiveui-menulist[open=true], +.devtools-responsiveui-toolbarbutton[open=true], +.devtools-responsiveui-toolbarbutton[checked=true] { +/* border-color: hsla(210,8%,5%,.6) !important; + background: linear-gradient(hsla(220,6%,10%,.6), hsla(210,11%,18%,.45) 75%, hsla(210,11%,30%,.4)); + box-shadow: 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 3px hsla(210,8%,5%,.25) inset, 0 1px 0 hsla(210,16%,76%,.15); */ +} + +.devtools-responsiveui-toolbarbutton[checked=true] { +/* color: hsl(208,100%,60%); */ +} + +.devtools-responsiveui-toolbarbutton[checked=true]:hover { +/* background-color: transparent !important;*/ +} + +.devtools-responsiveui-toolbarbutton[checked=true]:hover:active { +/* background-color: hsla(210,8%,5%,.2) !important;*/ +} + +.devtools-responsiveui-menulist > .menulist-label-box { + text-align: center; +} + +.devtools-responsiveui-menulist > .menulist-dropmarker { +/* display: -moz-box; + background-color: transparent; + list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg"); + -moz-box-align: center; + border-width: 0; + min-width: 16px;*/ +} + +.devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-button { +/* color: inherit; + border-width: 0; + -moz-border-end: 1px solid hsla(210,8%,5%,.45); + box-shadow: -1px 0 0 hsla(210,16%,76%,.15) inset, 1px 0 0 hsla(210,16%,76%,.15);*/ +} + +.devtools-responsiveui-toolbarbutton[type=menu-button]:-moz-locale-dir(rtl) > .toolbarbutton-menubutton-button { +/* box-shadow: 1px 0 0 hsla(210,16%,76%,.15) inset, -1px 0 0 hsla(210,16%,76%,.15);*/ +} + +.devtools-responsiveui-toolbarbutton[type=menu-button] { +/* padding: 0 1px;*/ + -moz-box-align: stretch; +} + +.devtools-responsiveui-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker, +.devtools-responsiveui-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker { +/* list-style-image: url("chrome://browser/skin/devtools/dropmarker.svg"); + -moz-box-align: center; + padding: 0 3px;*/ +} + +.devtools-responsiveui-toolbar:-moz-locale-dir(ltr) > *:first-child, +.devtools-responsiveui-toolbar:-moz-locale-dir(rtl) > *:last-child { + margin-left: 3px; +} + +.devtools-responsiveui-close { + list-style-image: url("chrome://browser/skin/devtools/close.png"); + -moz-image-region: rect(0px,16px,16px,0px); +} + +.devtools-responsiveui-close:hover { + -moz-image-region: rect(0px,32px,16px,16px); +} + +.devtools-responsiveui-rotate { + list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate.png"); + -moz-image-region: rect(0px,16px,16px,0px); +} .devtools-responsiveui-rotate:hover { -moz-image-region: rect(0px,32px,16px,16px); } +@media (min-resolution: 2dppx) { + .devtools-responsiveui-close { + list-style-image: url("chrome://browser/skin/devtools/close@2x.png"); + } + + .devtools-responsiveui-close:hover { + -moz-image-region: rect(0px,64px,32px,32px); + } + + .devtools-responsiveui-rotate { + list-style-image: url("chrome://browser/skin/devtools/responsiveui-rotate@2x.png"); + } + + .devtools-responsiveui-rotate:hover { + -moz-image-region: rect(0px,64px,32px,32px); + } +} + .devtools-responsiveui-touch { list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch.png"); -moz-image-region: rect(0px,16px,16px,0px); @@ -3769,6 +4102,19 @@ html|*#gcli-output-frame { -moz-image-region: rect(0px,32px,16px,16px); } +@media (min-resolution: 2dppx) { + .devtools-responsiveui-touch { + list-style-image: url("chrome://browser/skin/devtools/responsiveui-touch@2x.png"); + -moz-image-region: rect(0px,32px,32px,0px); + } + + .devtools-responsiveui-touch:hover, + .devtools-responsiveui-touch[checked], + .devtools-responsiveui-touch[checked]:hover { + -moz-image-region: rect(0px,64px,32px,32px); + } +} + .devtools-responsiveui-screenshot { list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot.png"); -moz-image-region: rect(0px,16px,16px,0px); @@ -3778,11 +4124,22 @@ html|*#gcli-output-frame { -moz-image-region: rect(0px,32px,16px,16px); } +@media (min-resolution: 2dppx) { + .devtools-responsiveui-screenshot { + list-style-image: url("chrome://browser/skin/devtools/responsiveui-screenshot@2x.png"); + } + + .devtools-responsiveui-screenshot:hover { + -moz-image-region: rect(0px,64px,32px,32px); + } +} + .devtools-responsiveui-resizebarV { width: 7px; height: 24px; cursor: ew-resize; transform: translate(12px, -12px); + background-size: cover; background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer.png"); } @@ -3791,6 +4148,7 @@ html|*#gcli-output-frame { height: 7px; cursor: ns-resize; transform: translate(-12px, 12px); + background-size: cover; background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer.png"); } @@ -3799,87 +4157,140 @@ html|*#gcli-output-frame { height: 16px; cursor: se-resize; transform: translate(12px, 12px); + background-size: cover; background-image: url("chrome://browser/skin/devtools/responsive-se-resizer.png"); } -/* === END responsivedesign.inc.css === */ +/* FxOS custom mode with additional buttons and phone look'n feel */ -/* === including indicator.css is done at the start of the file === */ +/* Hide devtools manual resizer */ +.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizehandle, +.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarH, +.browserStack[responsivemode].fxos-mode .devtools-responsiveui-resizebarV { + display: none; +} -/* Error counter */ +/* Gives responsive mode a phone look'n feel */ +.browserStack[responsivemode].fxos-mode { + padding: 60px 15px 0; -#developer-toolbar-toolbox-button[error-count]:before { - color: #000000; - min-width: 16px; - text-shadow: none; - background-color: #FF0000; - border-radius: 1px; - -moz-margin-end: 5px; + border-radius: 25px / 20px; + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + border: 1px solid #FFFFFF; + border-bottom-width: 0; + + background-color: #353535; + + box-shadow: 0 3px 0.7px 1px #777777, 0 5px rgba(0, 0, 0, 0.4) inset; + + background-image: linear-gradient(to right, #111 11%, #333 56%); + min-width: 320px; } -/* Social toolbar item */ +.devtools-responsiveui-hardware-buttons { + -moz-appearance: none; + padding: 20px; -#social-provider-button { - -moz-image-region: rect(0, 16px, 16px, 0); - list-style-image: url("chrome://browser/skin/social/services-16.png"); + border: 1px solid #FFFFFF; + border-bottom-left-radius: 25px; + border-bottom-right-radius: 25px; + border-top-width: 0; + + box-shadow: 0 3px 0.7px 1px #777777, 0 -7px rgba(0, 0, 0, 0.4) inset; + + background-image: linear-gradient(to right, #111 11%, #333 56%); } -#social-provider-button > .toolbarbutton-menu-dropmarker { - display: none; +.devtools-responsiveui-home-button { + width: 40px; + height: 30px; + list-style-image: url("chrome://browser/skin/devtools/responsiveui-home.png"); } -.toolbarbutton-badge-container { - margin: 0; - padding: 0; - position: relative; +.devtools-responsiveui-sleep-button { + -moz-appearance: none; + /* compensate browserStack top padding */ + margin-top: -67px; + margin-right: 10px; + + min-width: 10px; + width: 50px; + height: 5px; + + border: 1px solid #444; + border-top-right-radius: 12px; + border-top-left-radius: 12px; + border-bottom-color: transparent; + + background-image: linear-gradient(to top, #111 11%, #333 56%); } -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar .toolbarbutton-1 > .toolbarbutton-badge-container { - padding: 2px 2px; +.devtools-responsiveui-sleep-button:hover:active { + background-image: linear-gradient(to top, #aaa 11%, #ddd 56%); } -.toolbarbutton-1 > .toolbarbutton-badge-container > .toolbar-icon { - position: absolute; - top: 2px; - right: 2px; +.devtools-responsiveui-volume-buttons { + margin-left: -29px; } -.toolbarbutton-badge-container > .toolbarbutton-icon[label]:not([label=""]) { - -moz-margin-end: 0; +.devtools-responsiveui-volume-up-button, +.devtools-responsiveui-volume-down-button { + -moz-appearance: none; + border: 1px solid red; + min-width: 8px; + height: 40px; + + border: 1px solid #444; + border-right-color: transparent; + + background-image: linear-gradient(to right, #111 11%, #333 56%); } -.toolbarbutton-badge[badge=""] { - display: none; +.devtools-responsiveui-volume-up-button:hover:active, +.devtools-responsiveui-volume-down-button:hover:active { + background-image: linear-gradient(to right, #aaa 11%, #ddd 56%); } -.toolbarbutton-badge[badge]:not([badge=""])::after { - /* The |content| property is set in the content stylesheet. */ - font-size: 9px; - font-weight: bold; - padding: 0 1px; - color: #FF9F00; - background-color: #000000; - border: 1px solid #9C9CFF; - border-radius: 2px; - position: absolute; - top: 0; - right: 0; + +.devtools-responsiveui-volume-up-button { + border-top-left-radius: 12px; } -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""])::after { - top: 1px; - right: 1px; +.devtools-responsiveui-volume-down-button { + border-bottom-left-radius: 12px; } -.toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 0; - right: auto; +@media (min-resolution: 2dppx) { + .devtools-responsiveui-resizebarV { + background-image: url("chrome://browser/skin/devtools/responsive-vertical-resizer@2x.png"); + } + + .devtools-responsiveui-resizebarH { + background-image: url("chrome://browser/skin/devtools/responsive-horizontal-resizer@2x.png"); + } + + .devtools-responsiveui-resizehandle { + background-image: url("chrome://browser/skin/devtools/responsive-se-resizer@2x.png"); + } } -#navigator-toolbox[iconsize=large][mode=icons] > #nav-bar *|* > .toolbarbutton-badge[badge]:not([badge=""]):-moz-locale-dir(rtl)::after { - left: 1px; - right: auto; +/* === END responsivedesign.inc.css === */ + +/* === including indicator.css is done at the start of the file === */ + +/* Error counter */ + +#developer-toolbar-toolbox-button[error-count]:before { + color: #000000; + min-width: 16px; + text-shadow: none; + background-color: #FF0000; + border-radius: 1px; + -moz-margin-end: 5px; } +/* Social toolbar item */ + #social-notification-icon-mentions { background-color: #000000; border-radius: 3px; @@ -3904,8 +4315,7 @@ html|*#gcli-output-frame { #servicesInstall-notification-icon { list-style-image: url("chrome://browser/skin/social/services-16.png"); } -#social-undoactivation-button, -#servicesInstall-learnmore-link { +#social-undoactivation-button { -moz-margin-start: 0; /* override default label margin to match description margin */ } @@ -3973,6 +4383,48 @@ html|*#gcli-output-frame { /* === BEGIN chat.inc.css === */ +#social-sidebar-header { + padding: 3px; +} + +#manage-share-providers, +#social-sidebar-button { + list-style-image: url("chrome://browser/skin/ToolbarFx.png"); + -moz-image-region: rect(0, 468px, 18px, 450px); +} + +#social-sidebar-button { + -moz-appearance: none; + border: none; + padding: 0; + margin: 2px; +} +#manage-share-providers > .toolbarbutton-icon, +#social-sidebar-button > .toolbarbutton-icon { + min-height: 18px; + min-width: 18px; +} +#manage-share-providers:hover, +#manage-share-providers:hover:active, +#social-sidebar-button:hover, +#social-sidebar-button:hover:active { + -moz-image-region: rect(18px, 468px, 36px, 450px); +} +#social-sidebar-button > .toolbarbutton-menu-dropmarker { + display: none; +} + +#social-sidebar-button[loading="true"] { + list-style-image: url("chrome://global/skin/icons/loading.gif"); +} + +#social-sidebar-favico { + max-height: 16px; + max-width: 16px; + padding: 0; + margin: 2px; +} + .chat-status-icon { max-height: 16px; max-width: 16px; @@ -3982,10 +4434,17 @@ html|*#gcli-output-frame { .chat-toolbarbutton { -moz-appearance: none; border: none; - padding: 0; + padding: 0 3px; margin: 0; background: none; - width: 16px; +} + +.chat-toolbarbutton:hover { +/* background-color: rgba(255,255,255,.35);*/ +} + +.chat-toolbarbutton:hover:active { +/* background-color: rgba(255,255,255,.5);*/ } .chat-toolbarbutton > .toolbarbutton-text { @@ -3993,52 +4452,37 @@ html|*#gcli-output-frame { } .chat-toolbarbutton > .toolbarbutton-icon { - width: inherit; -} - -.chat-toolbarbutton.notification-anchor-icon > .toolbarbutton-icon { - width: inherit; - margin-top: -2px; + width: 16px; + height: 16px; } .chat-close-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(0, 16px, 16px, 0); + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close"); } -.chat-close-button:hover, -.chat-close-button:hover:active { - -moz-image-region: rect(0, 32px, 16px, 16px); +.chat-close-button:-moz-any(:hover,:hover:active) { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#close-active"); } .chat-minimize-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(16px, 16px, 32px, 0); + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize"); } -.chat-minimize-button:hover:active, -.chat-minimize-button:hover { - -moz-image-region: rect(16px, 32px, 32px, 16px); +.chat-minimize-button:-moz-any(:hover,:hover:active) { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-active"); } .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(48px, 16px, 64px, 0); + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand"); + transform: rotate(180deg); } -.chat-swap-button:hover:active, -.chat-swap-button:hover { - -moz-image-region: rect(48px, 32px, 64px, 16px); +.chat-swap-button:-moz-any(:hover,:hover:active) { + list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-active"); } chatbar > chatbox > .chat-titlebar > .chat-swap-button { - list-style-image: url('chrome://browser/skin/social/chat-icons.png'); - -moz-image-region: rect(32px, 16px, 48px, 0); -} - -chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover:active, -chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { - -moz-image-region: rect(32px, 32px, 48px, 16px); + transform: none; } .chat-title { @@ -4051,12 +4495,11 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { .chat-titlebar { background-color: #9C9CFF; color: #000000; - height: 20px; - min-height: 16px; + height: 30px; + min-height: 30px; width: 100%; margin: 0; - padding: 2px; - -moz-padding-start: 6px; + padding: 7px 6px; border: none; border-bottom: 1px solid #008484; cursor: pointer; @@ -4079,6 +4522,18 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button:hover { background-color: #E7ADE7; } +chatbox[dark=true] > .chat-titlebar, +chatbox[dark=true] > .chat-titlebar[selected] { +/* border-bottom: none; + background-color: #000; + background-image: none;*/ +} + +chatbox[dark=true] > .chat-titlebar > hbox > .chat-title { +/* font-weight: normal; + color: #c1c1c1;*/ +} + .chat-frame { padding: 0; margin: 0; @@ -4175,6 +4630,36 @@ window > chatbox { /* === END chat.inc.css === */ +.chat-titlebar { +/* background-color: #c4cfde; */ +} + +.chat-titlebar[selected] { +/* background-color: #dae3f0; */ +} + +.chatbar-button { + -moz-appearance: none; +/* background-color: #c4cfde; */ +} + +.chatbar-button > .toolbarbutton-icon { +/* -moz-margin-end: 0; */ +} + +.chatbar-button:hover, +.chatbar-button[open="true"] { +/* background-color: #dae3f0; */ +} + +.chatbar-button[activity]:not([open="true"]) { +} + +chatbox { +/* border-top-left-radius: 2.5px; + border-top-right-radius: 2.5px; */ +} + /* === BEGIN plugin-doorhanger.inc.css === */ /** @@ -4185,10 +4670,6 @@ window > chatbox { padding: 6px 1px 2px; } -.click-to-play-plugins-notification-content { - width: 28em; -} - .click-to-play-plugins-notification-center-box { } @@ -4232,72 +4713,262 @@ window > chatbox { margin: 0; } -/* Customization mode */ - -/* === END plugin-doorhanger.inc.css === */ - -#main-window[privatebrowsingmode=temporary] #toolbar-menubar { - background-image: url("chrome://browser/skin/privatebrowsing-dark.png"); - background-position: top right; - background-repeat: no-repeat; +.messageImage[value="plugin-hidden"] { + list-style-image: url("chrome://browser/skin/notification-pluginNormal.png"); } -#main-window[privatebrowsingmode=temporary] #toolbar-menubar:-moz-locale-dir(rtl) { - background-position: top left; +/* Keep any changes to this style in sync with pluginProblem.css */ +notification.pluginVulnerable { } -#main-window[privatebrowsingmode=temporary] #appmenu-button > .button-box > .box-inherit > .button-icon { - list-style-image: url("chrome://browser/skin/privatebrowsing-light.png"); - width: 20px; - height: 16px; +notification.pluginVulnerable .messageImage { + list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } -/* === BEGIN customizeMode.inc.css === */ +/* === END plugin-doorhanger.inc.css === */ -/* Customization mode */ -#nav-bar[customize-entered] > #nav-bar-customization-target { - margin: 1px 3px; -} +/* === BEGIN badcontent-doorhanger.inc.css === */ -#nav-bar[customize-entered] > #nav-bar-customization-target, -#PanelUI-contents > .panel-customization-placeholder { - outline: 1px dashed transparent; +.popup-notification-item-title[popupid="bad-content"] { + font-weight: bold; } -#main-window[customizing-movingItem] #nav-bar-customization-target, -#main-window[customizing-movingItem] .panel-customization-placeholder { - outline-color: #9C9CFF; +.popup-notification-item-message[popupid="bad-content"] { + width: 17em; } -#PanelUI-contents > .panel-customization-placeholder { - cursor: auto; - outline-offset: -5px; +.popup-notification-item-message[popupid="bad-content"][mixedblockdisabled]:not(.popup-notification-item-message-critical), +.popup-notification-item-message[popupid="bad-content"][trackingblockdisabled]:not(.popup-notification-item-message-critical) { + color: #8050B0; } -#main-window[customize-entered] .customization-target { - min-width: 100px; - padding-left: 10px; - padding-right: 10px; +.popup-notification-item-message-critical[popupid="bad-content"] { + color: #FF0000; + font-style: italic; } -#customization-container { - background-color: #000000; +.popup-notification-footer[popupid="bad-content"] { + padding-top: 1em; } -#customization-palette-container { - padding: 25px; +/* === END badcontent-doorhanger.inc.css === */ + +/* EME notifications */ + +.popup-notification-icon[popupid="drmContentPlaying"], +#eme-notification-icon { + list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); +} + +#eme-notification-icon:hover:active { + list-style-image: url("chrome://browser/skin/drm-icon.svg#chains-pressed"); +} + +#eme-notification-icon[firstplay=true] { + animation: emeTeachingMoment 0.2s linear 0s 5 normal; +} + +@keyframes emeTeachingMoment { + 0% {transform: translateX(0); } + 25% {transform: translateX(3px) } + 75% {transform: translateX(-3px) } + 100% { transform: translateX(0); } +} + +/* === BEGIN customizeMode.inc.css === */ + +/* Customization mode */ + +#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox { + margin-bottom: 1em; +} + +#main-window:-moz-any([customize-entering],[customize-entered]) #content-deck, +#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox, +#main-window:-moz-any([customize-entering],[customize-entered]) #navigator-toolbox { + margin-left: 1em; + margin-right: 1em; +} + +#main-window:-moz-any([customize-entering],[customize-exiting]) #tab-view-deck { + pointer-events: none; +} + +#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before, +#PanelUI-contents > .panel-customization-placeholder { + -moz-outline-radius: 2.5px; + outline: 1px dashed transparent; +} + +#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before { + /* Prevent jumping of tabs when switching a window between inactive and active (bug 853415). */ + -moz-box-ordinal-group: 0; + content: ""; + display: -moz-box; + height: 100%; + left: 0; + outline-offset: -2px; + pointer-events: none; + position: absolute; + top: 0; + width: 100%; +} + +/* Shift the TabsToolbar outline up 2px since the #nav-bar is shifted up by 1px and the + #TabsToolbar::after is a pixel higher to draw the bottom border of the tabstrip so this makes the + offset from the bottom effectively the same as other targets (-2px). */ +#main-window[customize-entered] #TabsToolbar.customization-target::before { +/* top: -2px;*/ +} + +/* The parents of the outline pseudo-elements need to be positioned so that the outline is positioned relative to it. */ +#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)):hover, +#main-window[customize-entered] .customization-target[customizing-dragovertarget]:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)), +#main-window[customize-entered] #nav-bar-customization-target.customization-target { + position: relative; +} + +/* Most target outlines are shown on hover and drag over but the panel menu uses + placeholders instead. */ +#main-window[customize-entered] .customization-target:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar)):hover::before, +#main-window[customize-entered] .customization-target[customizing-dragovertarget]:not(:-moz-any(#PanelUI-contents, #TabsToolbar, #toolbar-menubar))::before, +/* nav-bar and panel outlines are always shown */ +#nav-bar[showoutline=true] > #nav-bar-customization-target.customization-target::before { + outline-color: #A09090; +} + +#nav-bar[showoutline=true] > #nav-bar-customization-target.customization-target::before { + transition: outline-color 250ms linear; +} + +#PanelUI-contents[showoutline=true] > .panel-customization-placeholder { + transition: outline-color 250ms linear; + outline-color: #9C9CFF; +} + +#PanelUI-contents > .panel-customization-placeholder { + cursor: auto; + outline-offset: -5px; +} + +#main-window[customizing] .customization-target:not(#PanelUI-contents) { + min-width: 100px; +/* padding-left: 10px; + padding-right: 10px;*/ +} + +#main-window:-moz-any([customize-entering],[customize-entered]) #tab-view-deck { + padding: 0 2em 2em; +} + +#customization-container { + background-color: #000000; + color: #FF9F00; +} + +#customization-palette, +#customization-empty { + padding: 0 15px 15px; } #customization-header { - font-size: 1.5em; - line-height: 1.5em; + font-size: 1.75em; + line-height: 1.75em; color: #9C9CFF; - font-weight: lighter; - margin-bottom: 1em; + font-weight: 200; + margin: 25px 25px 12px; + padding-bottom: 12px; + border-bottom: 1px solid #A09090; } #customization-panel-container { - padding: 15px 25px 25px; + padding: 10px 10px 0px; +} + +#main-window:-moz-any([customize-entering],[customize-entered]) #browser-bottombox, +#customization-footer { + /*background-color: rgb(236,236,236);*/ +} + +#customization-footer { + border-top: 1px solid #9C9CFF; + padding: 10px; +} + +.customizationmode-button { + margin: 5px; +} + +.customizationmode-button:hover { +} + +#customization-titlebar-visibility-button[checked], +#customization-devedition-theme-button[checked] { + background-color: #008484; +} + +#customization-titlebar-visibility-button[checked]:hover, +#customization-devedition-theme-button[checked]:hover { + background-color: #FFCF00; +} + +#customization-titlebar-visibility-button[checked]:hover:active, +#customization-devedition-theme-button[checked]:hover:active { + background-color: #FF9F00; +} + +.customizationmode-button[disabled="true"] { +} + +.customizationmode-button > .box-inherit > .box-inherit > .button-icon, +.customizationmode-button > .button-box > .button-icon { +/* height: 24px;*/ +} + +#customization-titlebar-visibility-button { + list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); + -moz-image-region: rect(0, 16px, 16px, 0); + padding: 0px 5px; +} + +#customization-titlebar-visibility-button:hover { + -moz-image-region: rect(16px, 16px, 32px, 0); +} + +#customization-titlebar-visibility-button > .button-box { + padding-top: 0; + padding-bottom: 1px; +} + +#customization-titlebar-visibility-button:hover:active > .button-box { + padding-top: 1px; + padding-bottom: 0; +} + +#customization-titlebar-visibility-button > .button-box > .button-text { + /* Sadly, button.css thinks its margins are perfect for everyone. */ + -moz-margin-start: 5px !important; +} + +#customization-titlebar-visibility-button > .button-box > .button-icon { + vertical-align: middle; +} + +#customization-titlebar-visibility-button[checked] { + -moz-image-region: rect(0, 32px, 16px, 16px); + background-color: #008484; +} + +#customization-titlebar-visibility-button[checked]:hover { + -moz-image-region: rect(16px, 32px, 32px, 16px); + background-color: #FFCF00; +} + +#customization-titlebar-visibility-button[checked]:hover:active { + background-color: #FF9F00; +} + +#main-window[customize-entered] #customization-panel-container { background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"); background-position: left top; background-repeat: repeat; @@ -4305,10 +4976,8 @@ window > chatbox { background-attachment: fixed; } -toolbarpaletteitem { - transition: background-color, border-color, box-shadow, border-width; - transition-duration: 10ms, 10ms, 10ms, 250ms; - transition-timing-function: linear, linear, linear, ease-in-out; +toolbarpaletteitem[place="toolbar"] { + transition: border-width 250ms ease-in-out; } toolbarpaletteitem[mousedown] { @@ -4320,23 +4989,39 @@ toolbarpaletteitem[mousedown] { .panel-customization-placeholder, toolbarpaletteitem[place="palette"], toolbarpaletteitem[place="panel"] { - transition: background-color, border-color, box-shadow, transform; - transition-duration: 10ms, 10ms, 10ms, 250ms; - transition-timing-function: linear, linear, linear, ease-in-out; + transition: transform .3s ease-in-out; +} + +#customization-palette { + transition: opacity .3s ease-in-out; + opacity: 0; } +#customization-palette[showing="true"] { + opacity: 1; +} + +toolbarpaletteitem[notransition].panel-customization-placeholder, +toolbarpaletteitem[notransition][place="toolbar"], toolbarpaletteitem[notransition][place="palette"], toolbarpaletteitem[notransition][place="panel"] { - transition: background-color, border-color, box-shadow; - transition-duration: 10ms, 10ms, 10ms; - transition-timing-function: linear, linear, linear; + transition: none; +} + +toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon, +toolbarpaletteitem > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon, +toolbarpaletteitem > toolbaritem.panel-wide-item, +toolbarpaletteitem > toolbarbutton[type="menu-button"] { + transition: transform .3s cubic-bezier(.6, 2, .75, 1.5) !important; } -toolbarpaletteitem > toolbarbutton > .toolbarbutton-icon { - transition: transform 50ms ease-in-out; +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon, +toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-badge-container > .toolbarbutton-icon { + transform: scale(1.3); } -toolbarpaletteitem[mousedown] > toolbarbutton > .toolbarbutton-icon { +toolbarpaletteitem[mousedown] > toolbaritem.panel-wide-item, +toolbarpaletteitem[mousedown] > toolbarbutton[type="menu-button"] { transform: scale(1.1); } @@ -4352,44 +5037,45 @@ toolbarpaletteitem[place="toolbar"] { margin-bottom: 25px; } -/* Remove |:-moz-any(#customization-palette, #panelUI-contents)| selector when Australis lands - this makes it only apply post-Australis as those elements only exist there */ -#customization-palette > #wrapper-edit-controls, -:-moz-any(#customization-palette, #panelUI-contents) > #customization-palette > #wrapper-zoom-controls { - width: 225px; -} - -#wrapper-edit-controls[place="palette"] > .toolbarpaletteitem-box, -#wrapper-zoom-controls[place="palette"] > .toolbarpaletteitem-box { - width: 225px; - max-width: 225px; -} - #wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton, #wrapper-edit-controls[place="palette"] > #edit-controls > separator, -:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton, -:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > separator { - margin-top: 24px; +#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton, +#wrapper-zoom-controls[place="palette"] > #zoom-controls > separator { + margin-top: 20px; } #wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton, -:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton { +#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton { margin-left: 0; margin-right: 0; - max-width: 70px; - min-width: 70px; + max-width: 24px; + min-width: 24px; max-height: 24px; - height: 24px; + min-height: 24px; + padding: 4px; } -#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-text, -:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button > .toolbarbutton-text { - display: inline; +#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-icon, +#wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton > .toolbarbutton-icon { + width: 16px; } -#wrapper-edit-controls[place="palette"] > #edit-controls > toolbarbutton > .toolbarbutton-icon, -:-moz-any(#customization-palette, #panelUI-contents) > #wrapper-zoom-controls[place="palette"] > #zoom-controls > toolbarbutton > .toolbarbutton-icon { - margin: 0; - -moz-margin-start: 5px; +#wrapper-edit-controls > #edit-controls > toolbarbutton > .toolbarbutton-icon { + opacity: 1; /* To ensure these buttons always look enabled in customize mode */ +} + +#wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button, +#wrapper-zoom-controls[place="palette"] > #zoom-controls > #zoom-reset-button + separator { + display: none; +} + +#wrapper-personal-bookmarks:not([place="toolbar"]) > #personal-bookmarks { + -moz-box-pack: center; + min-height: 48px; +} + +#personal-bookmarks[cui-areatype="toolbar"]:not([overflowedItem=true]) > #bookmarks-toolbar-placeholder > .toolbarbutton-icon { + -moz-margin-end: 5px; } #customization-palette > toolbarpaletteitem > label { @@ -4398,55 +5084,676 @@ toolbarpaletteitem[place="toolbar"] { margin-right: 0; } +#customization-lwtheme-menu > .panel-arrowcontainer > .panel-arrowcontent { + -moz-box-orient: vertical; + /* Make the panel padding uniform across all platforms due to the + styling of the section headers and footer. */ + padding: 10px; +} + +.customization-lwtheme-menu-theme > .toolbarbutton-icon { + width: 32px; + height: 32px; +} + +.customization-lwtheme-menu-theme { + -moz-appearance: none; + margin: 0 -5px 5px; + padding-top: 0; + -moz-padding-end: 5px; + padding-bottom: 0; + -moz-padding-start: 0; +} + +.customization-lwtheme-menu-theme[defaulttheme] { + list-style-image: url(chrome://browser/skin/Fxtheme-switcher-icon.png); +} + +.customization-lwtheme-menu-theme[active="true"] { + background-color: #008484; +} + +.customization-lwtheme-menu-theme > .toolbarbutton-icon { + margin: 5px; +} + +.customization-lwtheme-menu-theme > .toolbarbutton-text { + text-align: start; +} + +#customization-lwtheme-menu-header, +#customization-lwtheme-menu-recommended { + padding: 10px; + margin-bottom: 5px; +} + +#customization-lwtheme-menu-header, +#customization-lwtheme-menu-recommended, +#customization-lwtheme-menu-footer { + background-color: #A09090; + color: #000000; + margin-right: -10px; + margin-left: -10px; +} + +#customization-lwtheme-menu-header { + margin-top: -10px; + border-top-right-radius: 3px; + border-top-left-radius: 3px; +} + +#customization-lwtheme-menu-recommended { +} + +#customization-lwtheme-menu-footer { + margin-bottom: -10px; + border-bottom-right-radius: 3px; + border-bottom-left-radius: 3px; +} + +.customization-lwtheme-menu-footeritem { + -moz-appearance: none; + -moz-box-flex: 1; + background-color: #C09070; + color: #000000; + border: 1px solid transparent; + padding: 10px; + margin-left: 0; + margin-right: 0; +} + +.customization-lwtheme-menu-footeritem:hover { + background-color: #FFCF00; +} + +.customization-lwtheme-menu-footeritem:first-child { +} + /* === END customizeMode.inc.css === */ -#main-window[customizing] { +/* === BEGIN customizeTip.inc.css === */ + +#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent { + padding: 0; + margin: 0; + min-width: 400px; + max-width: 1000px; + min-height: 200px; + border-radius: 3px; +/* background-image: linear-gradient(90deg, #a0dfff 0%, #ceeeff 100%);*/ + border: 1px solid #9C9CFF; + color: #FF9F00; +} + +#customization-tipPanel > .panel-arrowcontainer > .panel-arrowcontent:-moz-locale-dir(rtl) { +/* background-image: linear-gradient(90deg, #ceeeff 0%, #a0dfff 100%);*/ +} + +.customization-tipPanel-infoBox { + margin: 20px 25px 25px; + width: 25px; + background-image: url("chrome://browser/skin/customizableui/info-icon-customizeTip.png"); + background-repeat: no-repeat; +} + +.customization-tipPanel-content { + margin: 25px 0; + font-size: 12px; + line-height: 18px; +} + +.customization-tipPanel-em { + margin: 0; + font-weight: bold; +} + +.customization-tipPanel-contentImage { + margin-top: 25px; + list-style-image: url("chrome://browser/skin/customizableui/customize-illustration.png"); + min-width: 300px; + max-width: 300px; + min-height: 190px; + max-height: 190px; + display: -moz-box; +} + +.customization-tipPanel-contentImage:-moz-locale-dir(rtl) { + list-style-image: url("chrome://browser/skin/customizableui/customize-illustration-rtl.png"); +} + +.customization-tipPanel-link { + -moz-appearance: none; + background: transparent; + border: none; + box-shadow: none; + color: #3333FF; + margin: 0; + cursor: pointer; +} + +.customization-tipPanel-link > .button-box > .button-text { + margin: 0 !important; +} + +.customization-tipPanel-closeBox > .close-icon { + -moz-appearance: none; + border: 0; + -moz-margin-end: -25px; +} + +#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"], +#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] { + list-style-image: url("chrome://browser/skin/customizableui/panelarrow-customizeTip.png"); +} + +/* === END customizeTip.inc.css === */ + +/** + * This next rule is a hack to disable subpixel anti-aliasing on all + * labels during the customize mode transition. Subpixel anti-aliasing + * on Windows with Direct2D layers acceleration is particularly slow to + * paint, so this hack is how we sidestep that performance bottleneck. + */ +#main-window:-moz-any([customize-entering],[customize-exiting]) label { + transform: perspective(0.01px); +} + +#main-window[customize-entered] > #tab-view-deck { background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"); background-attachment: fixed; } -#main-window:-moz-any([customize-entering],[customize-entered]) #tab-view-deck { - padding: 0 2em 2em; +#main-window[customization-lwtheme] > #tab-view-deck:-moz-lwtheme { + background-repeat: no-repeat; + background-position: right top; + background-attachment: fixed; + /* The image will get set from CustomizeMode.jsm */ + background-image: none; + background-color: transparent; } -#customization-container { +#main-window[customization-lwtheme]:-moz-lwtheme { + background-image: url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"); + background-repeat: repeat; + background-attachment: fixed; + background-position: left top; +} + +#main-window[customize-entered] #browser-bottombox, +#main-window[customize-entered] #customization-container { border-left: 1px solid #9C9CFF; border-right: 1px solid #9C9CFF; background-clip: padding-box; } +#main-window[customize-entered] #browser-bottombox { + border-bottom: 1px solid #9C9CFF; +} + +#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="left"] { + margin-right: -2px; +} + +#customization-tipPanel > .panel-arrowcontainer > .panel-arrowbox > .panel-arrow[side="right"] { + margin-left: -2px; +} + /* End customization mode */ -#main-window[privatebrowsingmode=temporary] #TabsToolbar::after { - content: ""; +/* Private browsing indicators */ + +/** + * Currently, we have two places where we put private browsing indicators on + * Windows. When tabsintitlebar is enabled, we draw the indicator in the titlebar. + * When tabsintitlebar is disabled, we draw the indicator at the end of the + * tabstrip. The titlebar indicator is the fiddliest of the bunch, since we + * want the bottom border of the image to line up with the bottom of the window + * caption buttons. That's why there's so much special-casing going on in here. + */ +.private-browsing-indicator { + display: none; + pointer-events: none; +} + +#private-browsing-indicator-titlebar { + display: block; + position: absolute; +} + +#main-window[privatebrowsingmode=temporary][tabsintitlebar] #private-browsing-indicator-titlebar > .private-browsing-indicator { + display: block; +} + +#main-window[privatebrowsingmode=temporary]:-moz-any([inFullscreen],:not([tabsintitlebar])) #TabsToolbar > .private-browsing-indicator { display: -moz-box; +} + +#TabsToolbar > .private-browsing-indicator { + background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") no-repeat center -3px; + -moz-margin-start: 4px; + width: 48px; +} + +/* Bug 1008183: We're intentionally using the titlebar asset here for fullscreen + * mode, since the tabstrip "mimics" the titlebar in that case with its own + * min/max/close window buttons. + */ +#private-browsing-indicator-titlebar > .private-browsing-indicator, +#main-window[inFullscreen] #TabsToolbar > .private-browsing-indicator { + background: url("chrome://browser/skin/privatebrowsing-mask-titlebar.png") no-repeat center 0px; + -moz-margin-end: 4px; width: 40px; - background: url("chrome://browser/skin/privatebrowsing-indicator.png") no-repeat center center; + height: 20px; + position: relative; } +/* This one is for Linux */ +#main-window[privatebrowsingmode=temporary] #private-browsing-indicator { + background: url("chrome://browser/skin/privatebrowsing-mask-tabstrip.png") center no-repeat; + width: 48px; +} + +/* End private browsing indicators */ + /* === BEGIN UITour.inc.css === */ /* UI Tour */ -html|div#UITourHighlight { - border-radius: 20px; - border: 2px #9C9CFF solid; +#UITourHighlightContainer { + -moz-appearance: none; + border: none; + background-color: transparent; + /* This is a buffer to compensate for the movement in the "wobble" effect */ + padding: 4px; +} + +#UITourHighlight { + background-image: radial-gradient(50% 100%, rgba(0,132,132,0.4) 50%, rgba(0,132,132,0.6) 100%); + border-radius: 40px; + border: 1px solid #9C9CFF; + /* The box-shadow opacity needs to be < 0.5 so it doesn't appear at 100% opacity + on Linux without an X compositor where opacity is either 0 or 1. */ + box-shadow: 0 0 3px 0 rgba(0,0,0,0.49); min-height: 32px; min-width: 32px; } -#UITourTooltip { - max-width: 20em; +#UITourTooltipBody { + -moz-margin-end: 14px; +} + +#UITourTooltipBody > vbox { + padding-top: 4px; +} + +#UITourTooltipIconContainer { + -moz-margin-start: -16px; +} + +#UITourTooltipIcon { + width: 48px; + height: 48px; + -moz-margin-start: 28px; + -moz-margin-end: 28px; +} + +#UITourTooltipTitle, +#UITourTooltipDescription { + max-width: 20rem; } #UITourTooltipTitle { - font-size: 130%; + font-size: 1.45rem; font-weight: bold; - margin: 0 0 5px 0; + -moz-margin-start: 0; + -moz-margin-end: 0; + margin: 0 0 9px 0; } #UITourTooltipDescription { - max-width: 20em; + -moz-margin-start: 0; + -moz-margin-end: 0; + font-size: 1.15rem; + line-height: 1.8rem; + margin-bottom: 0; /* Override global.css */ +} + +#UITourTooltipClose { + -moz-appearance: none; + border: none; + background-color: transparent; + min-width: 0; + -moz-margin-start: 4px; + margin-top: -2px; +} + +#UITourTooltipClose > .toolbarbutton-text { + display: none; +} + +#UITourTooltipButtons { + -moz-box-pack: end; + background-color: rgba(0,0,0,.2); + border-top: 1px solid rgba(0,0,0,.4); + margin: 24px -16px -16px; + padding: 2em 15px; +} + +#UITourTooltipButtons > button { + margin: 0 15px; +} + +#UITourTooltipButtons > button:first-child { + -moz-margin-start: 0; +} + +#UITourTooltipButtons > button[image] > .button-box > .button-icon { + width: 16px; + height: 16px; + -moz-margin-end: 5px; +} + +#UITourTooltipButtons > button .button-text { + font-size: 1.15rem; +} + +#UITourTooltipButtons > button:not(.button-link) { + -moz-appearance: none; + background-color: #C09070; + border-radius: 3000px; + border: none; + color: #000000; + padding: 4px 30px; + transition-property: background-color, color; + transition-duration: 150ms; +} + +#UITourTooltipButtons > button:not(.button-link):not(:active):hover { + background-color: #FFCF00; + color: #000000; +} + +#UITourTooltipButtons > button.button-link { + -moz-appearance: none; + background: transparent; + border: none; + box-shadow: none; + color: rgba(0,0,0,0.35); + padding-left: 10px; + padding-right: 10px; +} + +#UITourTooltipButtons > button.button-link:hover { + color: black; +} + +/* The primary button gets the same color as the customize button. */ +#UITourTooltipButtons > button.button-primary { + background-color: #A06060; /* LCARS default button background color */ + color: #000000; + padding-left: 30px; + padding-right: 30px; +} + +#UITourTooltipButtons > button.button-primary:not(:active):hover { + background-color: #FFCF00; + color: #000000; +} + +/* Notification overrides for Heartbeat UI */ + +notification.heartbeat { + background-color: #A09090; +/* height: 40px;*/ +} + +@keyframes pulse-onshow { + 0% { + opacity: 0; + transform: scale(1.0); + } + 25% { + opacity: 1; + transform: scale(1.1); + } + 50% { + transform: scale(1.0); + } + 75% { + transform: scale(1.1); + } + 100% { + transform: scale(1.0); + } +} + +@keyframes pulse-twice { + 0% { + transform: scale(1.1); + } + 50% { + transform: scale(0.8); + } + 100% { + transform: scale(1); + } +} + +.messageText.heartbeat { + color: #000000; +/* text-shadow: none; */ + -moz-margin-start: 0px; +} + +.messageImage.heartbeat { + width: 24px; + height: 24px; + -moz-margin-start: 8px; + -moz-margin-end: 8px; +} + +.messageImage.heartbeat.pulse-onshow { + animation-name: pulse-onshow; + animation-duration: 1.5s; + animation-iteration-count: 1; + animation-timing-function: cubic-bezier(.7,1.8,.9,1.1); +} + +.messageImage.heartbeat.pulse-twice { + animation-name: pulse-twice; + animation-duration: 1s; + animation-iteration-count: 2; + animation-timing-function: linear; +} + +/* Learn More link styles */ +.heartbeat > .text-link { + color: #3333FF; + -moz-margin-start: 0px; +} + +.heartbeat > .text-link:hover { + color: #9C9CFF; + text-decoration: none; +} + +.heartbeat > .text-link:hover:active { + color: #FF9F00; +} + +/* Heartbeat UI Rating Star Classes */ +.heartbeat > #star-rating-container { + display: -moz-box; +/* margin-bottom: 4px;*/ +} + +.heartbeat > #star-rating-container > #star5 { + -moz-box-ordinal-group: 5; +} + +.heartbeat > #star-rating-container > #star4 { + -moz-box-ordinal-group: 4; +} + +.heartbeat > #star-rating-container > #star3 { + -moz-box-ordinal-group: 3; +} + +.heartbeat > #star-rating-container > #star2 { + -moz-box-ordinal-group: 2; +} + +.heartbeat > #star-rating-container > .star-x { + background: url("chrome://browser/skin/heartbeat-star-off.svg"); + cursor: pointer; + /* Overrides the -moz-margin-end for all platforms defined in the .plain class */ + -moz-margin-end: 4px !important; + width: 16px; + height: 16px; +} + +.heartbeat > #star-rating-container > .star-x:hover, +.heartbeat > #star-rating-container > .star-x:hover ~ .star-x { + background: url("chrome://browser/skin/heartbeat-star-lit.svg"); } /* === END UITour.inc.css === */ + +#UITourTooltipButtons { + margin: 24px -4px -4px; +} + +/* === BEGIN contextmenu.inc.css === */ + +menugroup > .menuitem-iconic[disabled="true"] > .menu-iconic-left { +} + +#context-navigation > .menuitem-iconic { + -moz-box-flex: 1; + -moz-box-pack: center; + -moz-box-align: center; +} + +#context-navigation > .menuitem-iconic[disabled="true"] { + background-color: transparent; +} + +#context-navigation > .menuitem-iconic > .menu-iconic-left { + -moz-appearance: none; +} + +#context-back > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back"); */ + list-style-image: url("chrome://browser/skin/ToolbarFx.png"); + -moz-image-region: rect(0, 54px, 18px, 36px); +} + +#context-back:not([disabled="true"]):hover > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-active"); */ + -moz-image-region: rect(18px, 54px, 36px, 36px); +} + +#context-back[disabled="true"] > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#back-disabled"); */ + -moz-image-region: rect(36px, 54px, 54px, 36px); +} + +#context-forward > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward"); */ + list-style-image: url("chrome://browser/skin/ToolbarFx.png"); + -moz-image-region: rect(0, 72px, 18px, 54px); +} + +#context-forward:not([disabled="true"]):hover > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-active"); */ + -moz-image-region: rect(18px, 72px, 36px, 54px); +} + +#context-forward[disabled="true"] > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#forward-disabled"); */ + -moz-image-region: rect(36px, 72px, 54px, 54px); +} + +#context-reload > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload"); */ + list-style-image: url("chrome://browser/skin/reload-stop-goFx.png"); + -moz-image-region: rect(0, 14px, 14px, 0); +} + +#context-reload:not([disabled="true"]):hover > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-active"); */ + -moz-image-region: rect(14px, 14px, 28px, 0); +} + +#context-reload[disabled="true"] > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#reload-disabled"); */ + -moz-image-region: rect(28px, 14px, 42px, 0); +} + +#context-stop > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop"); */ + list-style-image: url("chrome://browser/skin/reload-stop-goFx.png"); + -moz-image-region: rect(0, 28px, 14px, 14px); +} + +#context-stop:not([disabled="true"]):hover > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-active"); */ + -moz-image-region: rect(14px, 28px, 28px, 14px); +} + +#context-stop[disabled="true"] > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#stop-disabled"); */ + -moz-image-region: rect(28px, 28px, 42px, 14px); +} + +#context-bookmarkpage > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark"); */ + list-style-image: url("chrome://browser/skin/ToolbarFx.png"); + -moz-image-region: rect(0, 144px, 18px, 126px); +} + +#context-bookmarkpage:not([disabled="true"]):hover > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-active"); */ + -moz-image-region: rect(18px, 144px, 36px, 126px); +} + +#context-bookmarkpage[disabled="true"] > .menu-iconic-left { + /* list-style-image: url("chrome://browser/skin/content-contextmenu.svg#bookmark-disabled"); */ + -moz-image-region: rect(36px, 144px, 54px, 126px); +} + +#context-back:-moz-locale-dir(rtl), +#context-forward:-moz-locale-dir(rtl), +#context-reload:-moz-locale-dir(rtl) { + transform: scaleX(-1); +} + +#context-navigation > .menuitem-iconic > .menu-iconic-left > .menu-iconic-icon { + width: 18px; /*16px;*/ + height: 18px; /*16px;*/ + margin: 7px; +} + +#context-navigation > #context-reload > .menu-iconic-left > .menu-iconic-icon, +#context-navigation > #context-stop > .menu-iconic-left > .menu-iconic-icon { + width: 14px; + height: 14px; + margin: 9px; +} + +#context-media-eme-learnmore { + list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); +} + +#context-media-eme-learnmore { + list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); +} + +/* === END contextmenu.inc.css === */ + +#context-navigation { +} + +#context-sep-navigation { +/* margin-top: -4px; */ +}