diff options
89 files changed, 832 insertions, 2254 deletions
diff --git a/arc-firefox-theme/chrome/browser/Toolbar-inverted.png b/arc-firefox-theme/chrome/browser/Toolbar-inverted.png Binary files differindex e2ee578..99d7481 100644 --- a/arc-firefox-theme/chrome/browser/Toolbar-inverted.png +++ b/arc-firefox-theme/chrome/browser/Toolbar-inverted.png diff --git a/arc-firefox-theme/chrome/browser/Toolbar.png b/arc-firefox-theme/chrome/browser/Toolbar.png Binary files differindex d05345d..b8151d1 100644 --- a/arc-firefox-theme/chrome/browser/Toolbar.png +++ b/arc-firefox-theme/chrome/browser/Toolbar.png diff --git a/arc-firefox-theme/chrome/browser/aboutCertError.css b/arc-firefox-theme/chrome/browser/aboutCertError.css index e406eec..636f878 100644 --- a/arc-firefox-theme/chrome/browser/aboutCertError.css +++ b/arc-firefox-theme/chrome/browser/aboutCertError.css @@ -53,11 +53,25 @@ body { flex: 1; } -/* Pressing the retry button will cause the cursor to flicker from a pointer to - * not-allowed. Override the disabled cursor behaviour since we will never show - * the button disabled as the initial state. Remove this in Bug 1219861. */ -button:disabled { - cursor: pointer; +#certificateErrorDebugInformation { + display: none; + background-color: var(--in-content-box-background-hover) !important; + border-top: 1px solid var(--in-content-border-color); + position: absolute; + left: 0%; + top: 100%; + width: 65%; + padding: 1em 17.5%; +} + +#certificateErrorText { + font-family: monospace; + white-space: pre-wrap; + padding: 1em 0; +} + +#errorCode { + white-space: nowrap; } #returnButton { diff --git a/arc-firefox-theme/chrome/browser/aboutCertError_sectionCollapsed-rtl.png b/arc-firefox-theme/chrome/browser/aboutCertError_sectionCollapsed-rtl.png Binary files differdeleted file mode 100644 index 84ba18c..0000000 --- a/arc-firefox-theme/chrome/browser/aboutCertError_sectionCollapsed-rtl.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/aboutCertError_sectionCollapsed.png b/arc-firefox-theme/chrome/browser/aboutCertError_sectionCollapsed.png Binary files differdeleted file mode 100644 index c9805f6..0000000 --- a/arc-firefox-theme/chrome/browser/aboutCertError_sectionCollapsed.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/aboutCertError_sectionExpanded.png b/arc-firefox-theme/chrome/browser/aboutCertError_sectionExpanded.png Binary files differdeleted file mode 100644 index 128cef9..0000000 --- a/arc-firefox-theme/chrome/browser/aboutCertError_sectionExpanded.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css index 7a4eca3..872841e 100644 --- a/arc-firefox-theme/chrome/browser/aboutNetError.css +++ b/arc-firefox-theme/chrome/browser/aboutNetError.css @@ -34,7 +34,7 @@ ul { } #errorTitle { - background: url("aboutNetError_info.svg") left 0 no-repeat; + background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat; background-size: 3em; -moz-margin-start: -5em; -moz-padding-start: 5em; @@ -51,7 +51,7 @@ ul { #errorTitle[sslv3=true], #errorTitle[weakCrypto=true] { - background-image: url("aboutNetError_alert.svg"); + background-image: url("cert-error.svg"); } #errorTryAgain { @@ -79,7 +79,46 @@ button:disabled { cursor: pointer; } -div#certificateErrorReporting, +#learnMoreContainer { + display: none; +} + +#buttonContainer { + display: none; + flex-flow: row wrap; +} + +#buttonSpacer { + flex: 1; +} + +#returnButton { + background-color: var(--in-content-primary-button-background); + border: none; + color: var(--in-content-selected-text); + min-width: 250px; + margin-inline-start: 0; +} + +#returnButton:hover { + background-color: var(--in-content-primary-button-background-hover) !important; +} + +#returnButton:hover:active { + background-color: var(--in-content-primary-button-background-active) !important; +} + +#advancedButton { + display: none; + min-width: 150px; +} + +#certificateErrorReporting, +#reportCertificateError, +#reportSentMessage { + display: none; +} + div#weakCryptoAdvanced { display: none; float: right; @@ -88,12 +127,10 @@ div#weakCryptoAdvanced { -moz-margin-end: 24px; } -div#certificateErrorReporting a, div#weakCryptoAdvanced a { text-decoration: none; } -div#certificateErrorReporting a:hover, div#weakCryptoAdvanced a:hover { text-decoration: underline; } @@ -106,7 +143,6 @@ span.downArrow { transform: scaleY(0.7); } -div#certificateErrorReportingPanel, div#weakCryptoAdvancedPanel { /* Hidden until the link is clicked */ display: none; @@ -118,28 +154,16 @@ div#weakCryptoAdvancedPanel { box-shadow: 0 0 4px #ddd; font-size: 0.9em; position: absolute; - width: 75%; - margin-top: 10px; -} - -div#certificateErrorReportingPanel:-moz-dir(ltr), -div#weakCryptoAdvancedPanel:-moz-dir(ltr) { - left: 34%; } -div#certificateErrorReportingPanel:-moz-dir(rtl), -div#weakCryptoAdvancedPanel:-moz-dir(rtl) { - right: 0; -} - -#errorStatePanel, #overrideWeakCryptoPanel { - display: flex; + display: none; flex-direction: row; flex-wrap: wrap; justify-content: space-between; align-content: space-between; align-items: flex-start; + margin-top: 1em; } span#hostname { @@ -149,3 +173,9 @@ span#hostname { #automaticallyReportInFuture { cursor: pointer; } + +#errorCode { + color: var(--in-content-page-color); + cursor: text; + text-decoration: none; +} diff --git a/arc-firefox-theme/chrome/browser/aboutNetError_alert.svg b/arc-firefox-theme/chrome/browser/aboutNetError_alert.svg deleted file mode 100644 index b19c1c7..0000000 --- a/arc-firefox-theme/chrome/browser/aboutNetError_alert.svg +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- This Source Code Form is subject to the terms of the Mozilla Public - - License, v. 2.0. If a copy of the MPL was not distributed with this - - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 40"> - <defs> - <linearGradient id="gradient1" gradientUnits="userSpaceOnUse" x1="20" y1="4" x2="20" y2="36"> - <stop offset="0" style="stop-color: #e63b2e"/> - <stop offset="1" style="stop-color: #c33931"/> - </linearGradient> - <linearGradient id="gradient2" gradientUnits="userSpaceOnUse" x1="20" y1="0" x2="20" y2="40"> - <stop offset="0" style="stop-color: #e63b2e"/> - <stop offset="1" style="stop-color: #c33931"/> - </linearGradient> - </defs> - <path fill="url(#gradient1)" d="M13.373,4L4,13.372v13.256L13.373,36h13.255L36,26.628V13.372L26.627,4H13.373z M22.176,8.704 l-0.48,14.304h-3.424L17.76,8.704H22.176z M20,31.296c-1.44,0-2.592-1.184-2.592-2.592c0-1.44,1.152-2.592,2.592-2.592 c1.472,0,2.592,1.152,2.592,2.592C22.592,30.112,21.472,31.296,20,31.296z"/> - <path fill="url(#gradient2)" d="M28.284,0H11.716L0,11.716v16.569L11.716,40h16.569L40,28.284V11.716L28.284,0z M38,27.456 L27.456,38H12.544L2,27.456V12.544L12.544,2h14.911L38,12.544V27.456z"/> -</svg> diff --git a/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css b/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css index ba1a542..737f484 100644 --- a/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css +++ b/arc-firefox-theme/chrome/browser/aboutProviderDirectory.css @@ -5,7 +5,7 @@ } #errorTitle { - background: url("aboutNetError_info.svg") left 0 no-repeat; + background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat; background-size: 2em; -moz-padding-start: 3em; } diff --git a/arc-firefox-theme/chrome/browser/aboutSocialError.css b/arc-firefox-theme/chrome/browser/aboutSocialError.css index cb4a890..fffc18d 100644 --- a/arc-firefox-theme/chrome/browser/aboutSocialError.css +++ b/arc-firefox-theme/chrome/browser/aboutSocialError.css @@ -5,7 +5,7 @@ } #errorTitle { - background: url("aboutNetError_info.svg") left 0 no-repeat; + background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat; background-size: 2em; -moz-padding-start: 3em; } diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css index e7c3a52..dabd4cb 100644 --- a/arc-firefox-theme/chrome/browser/browser.css +++ b/arc-firefox-theme/chrome/browser/browser.css @@ -482,8 +482,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { max-width: 16px; } -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon, -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { max-width: 18px; } @@ -508,9 +508,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-property: background-color, border-color; transition-duration: 150ms; } -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-icon, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-badge-stack, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon, @@ -621,23 +621,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { margin-left: 2px; margin-right: 2px; } -/* tabview menu item */ -#menu_tabview { - list-style-image: url(chrome://browser/skin/tabview/tabview.png); - -moz-image-region: rect(0, 80px, 16px, 64px); } - -#menu_tabview[groups="0"] { - -moz-image-region: rect(0, 16px, 16px, 0); } - -#menu_tabview[groups="1"] { - -moz-image-region: rect(0, 32px, 16px, 16px); } - -#menu_tabview[groups="2"] { - -moz-image-region: rect(0, 48px, 16px, 32px); } - -#menu_tabview[groups="3"] { - -moz-image-region: rect(0, 64px, 16px, 48px); } - /* undo close tab menu item */ #alltabs_undoCloseTab { list-style-image: url(chrome://browser/skin/undoCloseTab.png); } @@ -655,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; } /* Menu panel buttons */ -:-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, #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, #webide-button, #loop-button, #pocket-button), +:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/light/toolbar-icons.svg"); } - #TabsToolbar :-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, #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, #webide-button, #loop-button, #pocket-button), #TabsToolbar + #TabsToolbar :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #TabsToolbar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/light/tabbar-icons.svg"); } -#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { +#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); } #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon, @@ -705,14 +688,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0, 252px, 18px, 234px); } #sync-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 270px, 18px, 252px); } - -#sync-button[cui-areatype="toolbar"][status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png"); - -moz-image-region: rect(0, 18px, 18px, 0px); } - -toolbar[brighttext] #sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); } + -moz-image-region: rect(0, 792px, 18px, 774px); } #feed-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 288px, 18px, 270px); } @@ -756,13 +732,6 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } -#PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; - -moz-image-region: auto !important; } - -toolbar[brighttext] #PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } - #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -784,9 +753,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #nav-bar-overflow-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#tabview-button { - -moz-image-region: rect(0, 648px, 18px, 630px); } - #email-link-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 666px, 18px, 648px); } @@ -802,35 +768,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#loop-button { - list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg"); - -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button { - list-style-image: url("chrome://browser/skin/custom_images/light/loop-tabbar-icons.svg"); } - -#nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } - -#loop-button[state="disabled"], -#loop-button[disabled="true"] { - -moz-image-region: rect(0, 36px, 18px, 18px); } - -#loop-button:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 54px, 18px, 36px); } - -#loop-button:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 72px, 18px, 54px); } - -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 90px, 18px, 72px); } - -#loop-button:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 108px, 18px, 90px); } - -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 126px, 18px, 108px); } - #webide-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 738px, 18px, 720px); } @@ -849,8 +786,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { @media not all and (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image); } #home-button[cui-areatype="menu-panel"], @@ -889,11 +826,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 384px, 32px, 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); } + -moz-image-region: rect(0px, 1024px, 32px, 992px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -929,10 +862,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 576px, 32px, 544px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 608px, 32px, 576px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 640px, 32px, 608px); } @@ -988,34 +917,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - 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 { - -moz-image-region: rect(0, 32px, 32px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 64px, 32px, 32px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 96px, 32px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 128px, 32px, 96px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 160px, 32px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 192px, 32px, 160px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 224px, 32px, 192px); } - /* Wide panel control icons */ #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, @@ -1049,8 +950,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { /* Menu panel and palette styles */ @media (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image-2x); } #home-button[cui-areatype="menu-panel"], @@ -1089,11 +990,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 768px, 64px, 704px); } - - #sync-button[cui-areatype="menu-panel"][status="active"] { - list-style-image: url(chrome://browser/skin/syncProgress-menuPanel@2x.png); - -moz-image-region: rect(0px, 64px, 64px, 0px); } + -moz-image-region: rect(0px, 2048px, 64px, 1984px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -1132,34 +1029,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); - -moz-image-region: rect(0, 64px, 64px, 0); } - - /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button { - -moz-image-region: rect(0, 64px, 64px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 128px, 64px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 192px, 64px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 256px, 64px, 192px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 320px, 64px, 256px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 384px, 64px, 320px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 448px, 64px, 384px); } - #new-tab-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 1088px, 64px, 1024px); } @@ -1168,10 +1037,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 1152px, 64px, 1088px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 1216px, 64px, 1152px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 1280px, 64px, 1216px); } @@ -1335,6 +1200,12 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #urlbar-icons { -moz-box-align: center; } +.urlbar-icon { + padding: 0 1px; + /* 16x16 icon with border-box sizing */ + width: 16px; + height: 16px; } + #urlbar-search-footer { border-top: 1px solid rgba(24, 26, 27, 0.14); background-color: rgba(24, 26, 27, 0.07); } @@ -1462,12 +1333,35 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { border-radius: 0; } +/* MAIN IDENTITY ICON */ +#identity-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-icon.svg#normal); } + +#identity-box:hover > #identity-icon, +#identity-box[open=true] > #identity-icon { + list-style-image: url(chrome://browser/skin/identity-icon.svg#hover); } + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } + +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon { + opacity: 0.3; } + +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); + width: 16px; + height: 16px; + opacity: 1; } + /* TRACKING PROTECTION ICON */ #tracking-protection-icon { width: 16px; height: 16px; - margin-inline-start: 0; - margin-inline-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 0; list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); opacity: 1; } @@ -1478,49 +1372,41 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } #tracking-protection-icon:not([state]) { - margin-inline-start: -18px; + margin-inline-end: -18px; pointer-events: none; opacity: 0; /* Only animate the shield in, when it disappears hide it immediately. */ transition: none; } -#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { +#urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon { visibility: collapse; } -/* MAIN IDENTITY ICON */ -#page-proxy-favicon { +/* CONNECTION ICON */ +#connection-icon { width: 16px; height: 16px; - list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - -.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - -.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-secure.svg); } - -.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } + margin-inline-start: 2px; + visibility: collapse; } -.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-secure.svg); + visibility: visible; } -.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); + visibility: visible; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } -#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { - -moz-image-region: inherit; - list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); - width: 16px; - height: 16px; - opacity: 1; } +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); + visibility: visible; } .popup-notification-icon { width: 64px; @@ -1944,13 +1830,6 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } -/* Loop/ Hello browser styles */ -notification[value="loop-sharing-notification"] .button-menubutton-button { - min-width: 0; } - -notification[value="loop-sharing-notification"] .messageImage { - list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); } - #treecolAutoCompleteImage { max-width: 36px; } @@ -1991,7 +1870,7 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t color: -moz-nativehyperlinktext; font-size: 0.9em; } -richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { +richlistitem[type~="action"][actiontype$="tab"] > .ac-url-box > .ac-action-icon { list-style-image: url("chrome://browser/skin/actionicon-tab.png"); padding: 0 3px; } @@ -2561,8 +2440,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- See browser-lightweightTheme.css for information about run-time changes to LWT styles. */ .tab-background-middle[visuallyselected=true]:-moz-lwtheme { background-color: transparent; - background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); - /*, + background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); + /*, lwtHeader;*/ /* Don't stretch the LWT header images */ background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } @@ -2570,7 +2449,7 @@ lwtHeader;*/ /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before { - background-image: linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); } + background-image: linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); } .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before, @@ -3232,7 +3111,7 @@ html|*#fullscreen-exit-button { :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { - filter: url("chrome://devtools/skin/images/filters.svg#invert"); } + filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon, #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3786,36 +3665,11 @@ toolbar[brighttext] #downloads-indicator-counter { chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } -chatbox[src^="about:loopconversation#"] .chat-minimize-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); } - -chatbox[src^="about:loopconversation#"] .chat-swap-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); } - -.chat-loop-hangup { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); - background-color: #d13f1a; - border: 1px solid #d13f1a; - border-top-right-radius: 4px; - width: 32px; - height: 26px; - margin-top: -6px; - margin-bottom: -5px; - -moz-margin-start: 6px; - -moz-margin-end: -5px; } - -.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { - background-color: #ef6745; - border-color: #ef6745; } - .chat-title { color: #666; text-shadow: none; cursor: inherit; } -chatbox[src^="about:loopconversation#"] .chat-title { - color: white; } - .chat-titlebar { height: 26px; min-height: 26px; @@ -3832,10 +3686,6 @@ chatbox[src^="about:loopconversation#"] .chat-title { .chat-titlebar[selected] { background-color: #f0f0f0; } -chatbox[src^="about:loopconversation#"] > .chat-titlebar { - background-color: #00a9dc; - border-color: #00a9dc; } - .chat-titlebar > .notification-anchor-icon { margin-left: 2px; margin-right: 2px; } diff --git a/arc-firefox-theme/chrome/browser/cert-error.svg b/arc-firefox-theme/chrome/browser/cert-error.svg index 4bf5077..9d23267 100644 --- a/arc-firefox-theme/chrome/browser/cert-error.svg +++ b/arc-firefox-theme/chrome/browser/cert-error.svg @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> <svg version="1.1" xmlns="http://www.w3.org/2000/svg" diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg index dffaa8f..e00d95b 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/tabbar-icons.svg @@ -12,9 +12,9 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - width="774" + width="792" height="36" - viewBox="0 0 774 36" + viewBox="0 0 792 36" sodipodi:docname="tabbar-icons.svg"> <metadata id="metadata8"> @@ -24,7 +24,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -55,8 +55,8 @@ showguides="false" inkscape:guide-bbox="true" inkscape:zoom="16" - inkscape:cx="9.4650557" - inkscape:cy="28.375735" + inkscape:cx="781.75853" + inkscape:cy="18.070693" inkscape:current-layer="layer2" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" @@ -1457,12 +1457,17 @@ inkscape:connector-curvature="0" id="path5066" d="m 6,6 6,6" - style="fill:#afb8c5;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path inkscape:connector-curvature="0" id="path5068" d="M 12,6 6,12" - style="fill:#afb8c5;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#afb8c5;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> + <path + inkscape:connector-curvature="0" + style="display:inline;opacity:1;fill:#afb8c5;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667" + d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z" + id="rect4403" /> </g> </svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg index d794bdf..4a90b76 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/dark/toolbar-icons.svg @@ -12,9 +12,9 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - width="774" + width="792" height="36" - viewBox="0 0 774 36" + viewBox="0 0 792 36" sodipodi:docname="toolbar-icons.svg"> <metadata id="metadata8"> @@ -24,7 +24,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -54,9 +54,9 @@ inkscape:snap-bbox-edge-midpoints="true" showguides="false" inkscape:guide-bbox="true" - inkscape:zoom="2" - inkscape:cx="655.4002" - inkscape:cy="-12.158216" + inkscape:zoom="22.627417" + inkscape:cx="781.96918" + inkscape:cy="24.96189" inkscape:current-layer="layer2" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" @@ -1019,8 +1019,9 @@ style="fill:#d3dae3;fill-opacity:1"> <path style="opacity:1;fill:#d3dae3;fill-opacity:1;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="M 238 3 L 238 3.9003906 L 238 14.099609 L 238 15 L 248 15 L 248 14.099609 L 248 7 L 244 3 L 238 3 z M 244 4.4140625 L 246.58594 7 L 244 7 L 244 6.0996094 L 244 4.4140625 z " - id="rect4365" /> + d="m 238,3 0,0.9003906 0,10.1992184 L 238,15 248,15 248,14.099609 248,7 244,3 238,3 Z M 244,4.4140625 246.58594,7 244,7 l 0,-0.9003906 0,-1.6855469 z" + id="rect4365" + inkscape:connector-curvature="0" /> </g> <g id="g4396" @@ -1449,12 +1450,17 @@ inkscape:connector-curvature="0" id="path5066" d="m 6,6 6,6" - style="fill:#d3dae3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#d3dae3;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path inkscape:connector-curvature="0" id="path5068" d="M 12,6 6,12" - style="fill:#d3dae3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#d3dae3;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> + <path + inkscape:connector-curvature="0" + style="display:inline;opacity:1;fill:#d3dae3;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667" + d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z" + id="rect4403" /> </g> </svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg index 548d974..b206c94 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/tabbar-icons.svg @@ -12,9 +12,9 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - width="774" + width="792" height="36" - viewBox="0 0 774 36" + viewBox="0 0 792 36" sodipodi:docname="tabbar-icons.svg"> <metadata id="metadata8"> @@ -24,7 +24,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -54,9 +54,9 @@ inkscape:snap-bbox-edge-midpoints="true" showguides="false" inkscape:guide-bbox="true" - inkscape:zoom="11.313708" - inkscape:cx="23.557359" - inkscape:cy="23.773956" + inkscape:zoom="15.999999" + inkscape:cx="778.45947" + inkscape:cy="25.866874" inkscape:current-layer="layer2" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" @@ -1457,12 +1457,17 @@ inkscape:connector-curvature="0" id="path5066" d="m 6,6 6,6" - style="fill:#70788d;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path inkscape:connector-curvature="0" id="path5068" d="M 12,6 6,12" - style="fill:#70788d;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#70788d;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> + <path + inkscape:connector-curvature="0" + style="display:inline;opacity:1;fill:#70788d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667" + d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z" + id="rect4403" /> </g> </svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg b/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg index f4f8390..74d2f6b 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/light/toolbar-icons.svg @@ -12,9 +12,9 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - width="774" + width="792" height="36" - viewBox="0 0 774 36" + viewBox="0 0 792 36" sodipodi:docname="toolbar-icons.svg"> <metadata id="metadata8"> @@ -54,9 +54,9 @@ inkscape:snap-bbox-edge-midpoints="true" showguides="false" inkscape:guide-bbox="true" - inkscape:zoom="1" - inkscape:cx="274.95973" - inkscape:cy="-1.0049715" + inkscape:zoom="11.313708" + inkscape:cx="770.98611" + inkscape:cy="24.666931" inkscape:current-layer="layer2" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" @@ -1428,5 +1428,10 @@ d="M 12,6 6,12" style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> + <path + inkscape:connector-curvature="0" + style="display:inline;opacity:1;fill:#5c616c;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667" + d="m 779,3 c -0.554,0 -1,0.446 -1,1 l 0,7 -1,0 c -0.554,0 -1,0.446 -1,1 l 0,2 c 0,0.554 0.446,1 1,1 l 12,0 c 0.554,0 1,-0.446 1,-1 l 0,-2 c 0,-0.554 -0.446,-1 -1,-1 l -1,0 0,-7 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z" + id="rect4403" /> </g> </svg> diff --git a/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg b/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg index 33e1bc5..d7c0520 100644 --- a/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg +++ b/arc-firefox-theme/chrome/browser/custom_images/toolbar-icons-active.svg @@ -12,9 +12,9 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - width="774" + width="792" height="36" - viewBox="0 0 774 36" + viewBox="0 0 792 36" sodipodi:docname="toolbar-icons-active.svg"> <metadata id="metadata8"> @@ -54,9 +54,9 @@ inkscape:snap-bbox-edge-midpoints="true" showguides="false" inkscape:guide-bbox="true" - inkscape:zoom="1.4142136" - inkscape:cx="-138.40712" - inkscape:cy="-21.707986" + inkscape:zoom="22.627417" + inkscape:cx="778.29154" + inkscape:cy="30.486221" inkscape:current-layer="layer2" inkscape:object-paths="true" inkscape:snap-intersection-paths="true" @@ -1019,8 +1019,9 @@ style="fill:#ffffff;fill-opacity:1"> <path style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - d="M 238 3 L 238 3.9003906 L 238 14.099609 L 238 15 L 248 15 L 248 14.099609 L 248 7 L 244 3 L 238 3 z M 244 4.4140625 L 246.58594 7 L 244 7 L 244 6.0996094 L 244 4.4140625 z " - id="rect4365" /> + d="m 238,3 0,0.9003906 0,10.1992184 L 238,15 248,15 248,14.099609 248,7 244,3 238,3 Z M 244,4.4140625 246.58594,7 244,7 l 0,-0.9003906 0,-1.6855469 z" + id="rect4365" + inkscape:connector-curvature="0" /> </g> <g id="g4396" @@ -1449,12 +1450,16 @@ inkscape:connector-curvature="0" id="path5066" d="m 6,6 6,6" - style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path inkscape:connector-curvature="0" id="path5068" d="M 12,6 6,12" - style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> </g> + <path + style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.26666667" + d="M 779 3 C 778.446 3 778 3.446 778 4 L 778 11 L 777 11 C 776.446 11 776 11.446 776 12 L 776 14 C 776 14.554 776.446 15 777 15 L 789 15 C 789.554 15 790 14.554 790 14 L 790 12 C 790 11.446 789.554 11 789 11 L 788 11 L 788 4 C 788 3.446 787.554 3 787 3 L 779 3 z " + id="rect4403" /> </g> </svg> diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css index 4095e76..330a0f9 100644 --- a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css +++ b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css @@ -664,7 +664,86 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { list-style-image: url(chrome://browser/skin/sync-horizontalbar.png); } -#PanelUI-footer-fxa[syncstatus="active"] > #PanelUI-fxa-icon { +.PanelUI-remotetabs-instruction-label, +#PanelUI-remotetabs-mobile-promo { + margin: 15px; + text-align: center; + text-shadow: none; + max-width: 15em; + color: GrayText; +} + +/* The boxes with "instructions" get extra padding for space around the + illustration and buttons */ +.PanelUI-remotetabs-instruction-box { + padding: 30px 15px 15px 15px; +} + +.PanelUI-remotetabs-prefs-button { + -moz-appearance: none; + background-color: #0096dd; + color: white; + border-radius: 2px; + margin-top: 10px; + margin-bottom: 10px; + padding: 8px; + text-shadow: none; + min-width: 200px; +} + +.PanelUI-remotetabs-prefs-button:hover, +.PanelUI-remotetabs-prefs-button:hover:active { + background-color: #018acb; +} + +.remotetabs-promo-link { + margin: 0; +} + +.PanelUI-remotetabs-notabsforclient-label { + color: GrayText; + /* This margin is to line this label up with the labels in toolbarbuttons. */ + margin-left: 28px; +} + +.fxaSyncIllustration { + width: 180px; + list-style-image: url(chrome://browser/skin/fxa/sync-illustration.svg); +} + +.PanelUI-remotetabs-prefs-button > .toolbarbutton-text { + /* !important to override ".cui-widget-panel toolbarbutton > .toolbarbutton-text" above. */ + text-align: center !important; + text-shadow: none; +} + +#PanelUI-remotetabs[mainview] { /* panel anchored to toolbar button might be too skinny */ + min-width: 19em; +} + +/* Work around bug 1224412 - these boxes will cause scrollbars to appear when + the panel is anchored to a toolbar button. +*/ +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-setupsync, +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-reauthsync, +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-nodevicespane, +#PanelUI-remotetabs[mainview] #PanelUI-remotetabs-tabsdisabledpane { + min-height: 30em; +} + +#PanelUI-remotetabs-tabslist > label[itemtype="client"] { + color: GrayText; +} + +/* Collapse the non-active vboxes in the remotetabs deck to use only the + height the active box needs */ +#PanelUI-remotetabs-deck:not([selectedIndex="1"]) > #PanelUI-remotetabs-tabsdisabledpane, +#PanelUI-remotetabs-deck:not([selectedIndex="2"]) > #PanelUI-remotetabs-fetching, +#PanelUI-remotetabs-deck:not([selectedIndex="3"]) > #PanelUI-remotetabs-nodevicespane { + visibility: collapse; +} + +#PanelUI-fxa-icon[syncstatus="active"] { list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar.png); } @@ -1062,10 +1141,19 @@ menuitem.panel-subview-footer:not([disabled])[_moz-menuactive]:active, color: GrayText; } +#PanelUI-remotetabs-tabslist > toolbarbutton, #PanelUI-historyItems > toolbarbutton { list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); } +@media (min-resolution: 1.1dppx) { + #PanelUI-remotetabs-tabslist > toolbarbutton, + #PanelUI-historyItems > toolbarbutton { + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon@2x.png"); + } +} + +#PanelUI-remotetabs-tabslist > toolbarbutton > .toolbarbutton-icon, #PanelUI-recentlyClosedWindows > toolbarbutton > .toolbarbutton-icon, #PanelUI-recentlyClosedTabs > toolbarbutton > .toolbarbutton-icon, #PanelUI-historyItems > toolbarbutton > .toolbarbutton-icon { @@ -1523,7 +1611,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { list-style-image: url(chrome://browser/skin/sync-horizontalbar@2x.png); } - #PanelUI-footer-fxa[syncstatus="active"] > #PanelUI-fxa-icon { + #PanelUI-fxa-icon[syncstatus="active"] { list-style-image: url(chrome://browser/skin/syncProgress-horizontalbar@2x.png); } diff --git a/arc-firefox-theme/chrome/browser/customizableui/thumburger-inverted.png b/arc-firefox-theme/chrome/browser/customizableui/thumburger-inverted.png Binary files differdeleted file mode 100755 index 5bd6385..0000000 --- a/arc-firefox-theme/chrome/browser/customizableui/thumburger-inverted.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/customizableui/thumburger.png b/arc-firefox-theme/chrome/browser/customizableui/thumburger.png Binary files differdeleted file mode 100755 index bd75b44..0000000 --- a/arc-firefox-theme/chrome/browser/customizableui/thumburger.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css index 9f0796a..22d7cd3 100644 --- a/arc-firefox-theme/chrome/browser/devedition.css +++ b/arc-firefox-theme/chrome/browser/devedition.css @@ -47,7 +47,6 @@ /* Url and search bars */ --url-and-searchbar-background-color: #171B1F; - --url-and-searchbar-color: #fff; --urlbar-separator-color: #5F6670; --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px); @@ -62,7 +61,8 @@ :root[devtoolstheme="dark"] #identity-box { --identity-box-chrome-color: #46afe3; --identity-box-verified-background-color: transparent; - --identity-box-selected-background-color: rgba(231,230,230,.2); + --identity-box-hover-background-color: rgba(231,230,230,.2); + --identity-box-selected-background-color: rgba(211,210,210,.2); } :root[devtoolstheme="light"] { @@ -166,11 +166,6 @@ color: var(--chrome-color); } -.browserContainer > .findbar-textbox { - background-color: var(--url-and-searchbar-background-color) !important; - color: var(--url-and-searchbar-color); -} - /* Default findbar text color doesn't look good - Bug 1125677 */ .browserContainer > findbar .findbar-find-status, .browserContainer > findbar .found-matches { @@ -200,7 +195,7 @@ toolbar[brighttext] #downloads-indicator-counter { #navigator-toolbox .searchbar-textbox { background-color: var(--url-and-searchbar-background-color) !important; background-image: none !important; - color: var(--url-and-searchbar-color) !important; + color: inherit !important; border: 1px solid var(--chrome-nav-bar-controls-border-color) !important; box-shadow: none !important; } @@ -312,6 +307,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper { background-image: none; } +:root { + --forwardbutton-width: 29px; +} + .tab-close-button[visuallyselected]:not(:hover) { background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); } diff --git a/arc-firefox-theme/chrome/browser/downloads/contentAreaDownloadsView.css b/arc-firefox-theme/chrome/browser/downloads/contentAreaDownloadsView.css index 73e42fb..aef7df1 100644 --- a/arc-firefox-theme/chrome/browser/downloads/contentAreaDownloadsView.css +++ b/arc-firefox-theme/chrome/browser/downloads/contentAreaDownloadsView.css @@ -8,8 +8,9 @@ padding: 18px; } -#downloadsRichListBox:not(:-moz-focusring) { +#downloadsRichListBox:empty { border-color: transparent; + background-color: transparent; } .downloadButton:not([disabled="true"]):hover, diff --git a/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css b/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css index b3c0b37..f165003 100644 --- a/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css +++ b/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css @@ -5,25 +5,3 @@ .alwaysUse { padding: 5px; } - -.handlersMenuPopup > menuitem { - -moz-padding-start: 23px; -} - -.handlersMenuPopup > menuitem.menuitem-iconic { - -moz-padding-start: 2px; -} - -.handlersMenuPopup > .menuitem-iconic > .menu-iconic-left { - display: -moz-box; - min-width: 16px; - -moz-padding-end: 2px; -} - -.chooseApplicationMenuItem { - list-style-image: url("moz-icon://dummy.exe?size=16"); -} - -#feedHeader[dir="rtl"] .handlersMenuList > menupopup { - direction: rtl; -} diff --git a/arc-firefox-theme/chrome/browser/feeds/subscribe.css b/arc-firefox-theme/chrome/browser/feeds/subscribe.css index 03b534a..8389c30 100644 --- a/arc-firefox-theme/chrome/browser/feeds/subscribe.css +++ b/arc-firefox-theme/chrome/browser/feeds/subscribe.css @@ -7,6 +7,20 @@ html { font: 3mm tahoma,arial,helvetica,sans-serif; } +#subscribeUsingDescription, +#subscribeButton { + display: block; +} + +#subscribeUsingDescription { + margin-bottom: 0.5em; +} + +#subscribeButton { + margin-top: 0.5em; + margin-inline-start: auto; +} + #feedBody { border: 1px solid THreeDShadow; padding: 3em; @@ -21,9 +35,14 @@ html { margin: -4em auto 0 auto; background-color: InfoBackground; -moz-appearance: -moz-gtk-info-bar; + display: flex; +} + +#feedHeaderContainerSpacer { + flex-grow: 1; } -#feedHeader { +#feedHeader { margin-top: 4.9em; margin-bottom: 1em; -moz-margin-start: 1.4em; @@ -65,6 +84,7 @@ html { #feedSubscribeLine { padding-top: 0.2em; + padding-inline-start: 0.5em; } /* Don't print subscription UI */ diff --git a/arc-firefox-theme/chrome/browser/fxa/sync-illustration.svg b/arc-firefox-theme/chrome/browser/fxa/sync-illustration.svg new file mode 100644 index 0000000..dd2b7bd --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/sync-illustration.svg @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" preserveAspectRatio="xMidYMid" width="320" height="280" viewBox="0 0 320 280"> + <g fill="#cdcdcd"> + <path d="M46.352,148.919 L46.352,148.919 L44.938,150.333 L43.523,148.919 L43.523,148.919 L37.866,143.262 L39.281,141.848 L44.938,147.505 L50.594,141.848 L52.009,143.262 L46.352,148.919 ZM43.937,134.000 L45.938,134.000 L45.938,142.000 L43.937,142.000 L43.937,134.000 ZM43.937,122.000 L45.938,122.000 L45.938,130.000 L43.937,130.000 L43.937,122.000 Z"/> + <path d="M306.641,132.110 L300.984,126.453 L295.328,132.110 L293.913,130.696 L300.984,123.625 L308.055,130.696 L306.641,132.110 ZM302.000,223.969 L300.000,223.969 L300.000,215.969 L302.000,215.969 L302.000,223.969 ZM302.000,211.969 L300.000,211.969 L300.000,203.969 L302.000,203.969 L302.000,211.969 ZM302.000,199.969 L300.000,199.969 L300.000,191.969 L302.000,191.969 L302.000,199.969 ZM302.000,187.969 L300.000,187.969 L300.000,179.969 L302.000,179.969 L302.000,187.969 ZM302.000,175.969 L300.000,175.969 L300.000,167.969 L302.000,167.969 L302.000,175.969 ZM302.000,163.969 L300.000,163.969 L300.000,155.969 L302.000,155.969 L302.000,163.969 ZM300.000,131.969 L302.000,131.969 L302.000,139.969 L300.000,139.969 L300.000,131.969 ZM302.000,151.969 L300.000,151.969 L300.000,143.969 L302.000,143.969 L302.000,151.969 ZM300.000,227.969 L302.000,227.969 L302.000,232.000 L302.000,234.000 L300.000,234.000 L292.000,234.000 L292.000,232.000 L300.000,232.000 L300.000,227.969 Z"/> + <path d="M101.335,236.009 L99.921,234.594 L105.578,228.938 L99.921,223.281 L101.335,221.866 L108.406,228.938 L101.335,236.009 ZM100.000,229.938 L92.000,229.938 L92.000,227.937 L100.000,227.937 L100.000,229.938 ZM80.000,227.937 L88.000,227.937 L88.000,229.938 L80.000,229.938 L80.000,227.937 Z"/> + <path d="M182.000,54.000 L182.000,52.000 L190.000,52.000 L190.000,54.000 L182.000,54.000 ZM170.000,52.000 L178.000,52.000 L178.000,54.000 L170.000,54.000 L170.000,52.000 ZM168.488,60.071 L161.417,53.000 L168.488,45.929 L169.902,47.343 L164.245,53.000 L169.902,58.657 L168.488,60.071 Z"/> + <path d="M297.688,276.000 L102.312,276.000 C97.721,276.000 94.000,272.279 94.000,267.688 L94.000,260.000 L306.000,260.000 L306.000,267.688 C306.000,272.279 302.279,276.000 297.688,276.000 ZM117.906,150.312 C117.906,145.721 121.628,142.000 126.218,142.000 L273.688,142.000 C278.279,142.000 282.000,145.721 282.000,150.312 L282.000,256.000 L117.906,256.000 L117.906,150.312 ZM132.000,242.000 L270.000,242.000 L270.000,156.000 L132.000,156.000 L132.000,242.000 Z"/> + <path d="M307.074,115.969 L206.926,115.969 C203.101,115.969 200.000,112.868 200.000,109.042 L200.000,38.926 C200.000,35.101 203.101,32.000 206.926,32.000 L307.074,32.000 C310.899,32.000 314.000,35.101 314.000,38.926 L314.000,109.042 C314.000,112.868 310.899,115.969 307.074,115.969 ZM210.000,65.875 C210.000,64.770 209.105,63.875 208.000,63.875 C206.895,63.875 206.000,64.770 206.000,65.875 L206.000,82.000 C206.000,83.105 206.895,84.000 208.000,84.000 C209.105,84.000 210.000,83.105 210.000,82.000 L210.000,65.875 ZM302.000,42.000 L216.000,42.000 L216.000,106.000 L302.000,106.000 L302.000,42.000 Z"/> + <path d="M65.844,240.000 L26.156,240.000 C23.861,240.000 22.000,238.139 22.000,235.844 L22.000,162.156 C22.000,159.861 23.861,158.000 26.156,158.000 L65.844,158.000 C68.139,158.000 70.000,159.861 70.000,162.156 L70.000,235.844 C70.000,238.139 68.139,240.000 65.844,240.000 ZM46.000,236.000 C48.287,236.000 50.141,234.195 50.141,231.969 C50.141,229.742 48.287,227.938 46.000,227.938 C43.713,227.938 41.859,229.742 41.859,231.969 C41.859,234.195 43.713,236.000 46.000,236.000 ZM66.000,168.000 L26.000,168.000 L26.000,224.000 L66.000,224.000 L66.000,168.000 Z"/> + <path d="M171.906,86.156 C171.906,102.329 159.026,115.469 143.017,115.797 L143.039,115.955 L28.850,115.955 L28.869,115.797 C12.872,115.475 -0.000,102.333 -0.000,86.156 C-0.000,71.661 10.336,59.603 23.994,57.019 C23.620,55.457 23.401,53.834 23.401,52.156 C23.401,40.714 32.606,31.438 43.962,31.438 C47.561,31.438 50.941,32.375 53.884,34.012 C53.883,33.930 53.878,33.848 53.878,33.766 C53.878,17.137 67.301,3.656 83.858,3.656 C97.763,3.656 109.453,13.164 112.843,26.059 C116.677,23.334 121.343,21.719 126.393,21.719 C139.394,21.719 149.933,32.331 149.933,45.422 C149.933,49.572 148.868,53.468 147.007,56.861 C161.114,59.082 171.906,71.351 171.906,86.156 Z"/> + </g> +</svg> diff --git a/arc-firefox-theme/chrome/browser/identity-icon.svg b/arc-firefox-theme/chrome/browser/identity-icon.svg new file mode 100644 index 0000000..531aec4 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/identity-icon.svg @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+ width="48" height="16" viewBox="0 0 32 16">
+ <defs>
+ <circle id="shape-circle-base" cx="8" cy="8" r="7" />
+ <g id="shape-i">
+ <circle cx="8" cy="5" r="1" />
+ <rect x="7" y="7" width="2" height="5" rx="1" ry="1" />
+ </g>
+ <mask id="mask-ring-cutout">
+ <rect width="16" height="16" fill="#000" />
+ <use xlink:href="#shape-circle-base" fill="#fff" />
+ <circle cx="8" cy="8" r="6" fill="#000" />
+ </mask>
+ </defs>
+
+ <view id="normal" viewBox="0 0 16 16"/>
+ <g>
+ <use xlink:href="#shape-circle-base" mask="url(#mask-ring-cutout)" fill="#999" />
+ <use xlink:href="#shape-i" fill="#999" />
+ </g>
+
+ <view id="hover" viewBox="16 0 16 16"/>
+ <g transform="translate(16)">
+ <use xlink:href="#shape-circle-base" fill="#4c9ed9" />
+ <use xlink:href="#shape-i" fill="#fff" />
+ </g>
+</svg>
diff --git a/arc-firefox-theme/chrome/browser/loop/menuPanel.png b/arc-firefox-theme/chrome/browser/loop/menuPanel.png Binary files differdeleted file mode 100644 index 31f3671..0000000 --- a/arc-firefox-theme/chrome/browser/loop/menuPanel.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/loop/menuPanel@2x.png b/arc-firefox-theme/chrome/browser/loop/menuPanel@2x.png Binary files differdeleted file mode 100644 index f52cf22..0000000 --- a/arc-firefox-theme/chrome/browser/loop/menuPanel@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/loop/toolbar-inverted.png b/arc-firefox-theme/chrome/browser/loop/toolbar-inverted.png Binary files differdeleted file mode 100644 index 31c0256..0000000 --- a/arc-firefox-theme/chrome/browser/loop/toolbar-inverted.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/loop/toolbar-inverted@2x.png b/arc-firefox-theme/chrome/browser/loop/toolbar-inverted@2x.png Binary files differdeleted file mode 100644 index 1178851..0000000 --- a/arc-firefox-theme/chrome/browser/loop/toolbar-inverted@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/loop/toolbar.png b/arc-firefox-theme/chrome/browser/loop/toolbar.png Binary files differdeleted file mode 100644 index 8ba10aa..0000000 --- a/arc-firefox-theme/chrome/browser/loop/toolbar.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/loop/toolbar@2x.png b/arc-firefox-theme/chrome/browser/loop/toolbar@2x.png Binary files differdeleted file mode 100644 index c1fc1de..0000000 --- a/arc-firefox-theme/chrome/browser/loop/toolbar@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/menuPanel.png b/arc-firefox-theme/chrome/browser/menuPanel.png Binary files differindex ccdc35b..f8c7f88 100644 --- a/arc-firefox-theme/chrome/browser/menuPanel.png +++ b/arc-firefox-theme/chrome/browser/menuPanel.png diff --git a/arc-firefox-theme/chrome/browser/menuPanel@2x.png b/arc-firefox-theme/chrome/browser/menuPanel@2x.png Binary files differindex d1d5256..28176a1 100644 --- a/arc-firefox-theme/chrome/browser/menuPanel@2x.png +++ b/arc-firefox-theme/chrome/browser/menuPanel@2x.png diff --git a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css b/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css deleted file mode 100644 index b308d91..0000000 --- a/arc-firefox-theme/chrome/browser/preferences/aboutPermissions.css +++ /dev/null @@ -1,136 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -@import url("chrome://global/skin/in-content/common.css"); - -#permissions-content { - padding-top: 48px; - -moz-padding-end: 0; /* no padding to move the scroll bar to the edge */ -} - -/* sites box */ - -#sites-box { - width: 25em; -} - -#sites-filter { - margin: 0; -} - -#sites-list { - margin: 5px 0 0 0; -} - -.site { - padding: 4px; - border-bottom: 1px solid ThreeDLightShadow; -} - -.site-favicon { - height: 16px; - width: 16px; - -moz-margin-end: 4px; - list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); -} - -#all-sites-item > .site-container > .site-favicon { - list-style-image: none; -} - -/* permissions box */ - -#permissions-box { - -moz-padding-start: 10px; -} - -#permissions-list { - overflow-y: auto; - padding-top: 5px; - -moz-padding-end: 44px; -} - -#site-description { - font-size: 125%; -} - -#site-label { - font-weight: bold; - margin-top: 0; - margin-bottom: 0; -} - -#defaults-description { - font-size: 125%; - font-weight: bold; -} - -#header-deck { - -moz-margin-end: 44px; -} - -#site-header, -#defaults-header { - margin-bottom: 1px; -} - -.pref-item { - margin-bottom: 10px; -} - -.pref-icon { - width: 36px; - height: 36px; - -moz-margin-end: 10px; -} - -.pref-icon[type="password"] { - list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); -} -.pref-icon[type="cookie"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} -.pref-icon[type="geo"] { - list-style-image: url(chrome://browser/skin/Geolocation-64.png); -} -.pref-icon[type="desktop-notification"] { - list-style-image: url(chrome://browser/skin/web-notifications-icon.svg); -} -.pref-icon[type="indexedDB"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} -.pref-icon[type="install"] { - list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png); -} -.pref-icon[type="popup"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} -.pref-icon[type="image"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} -.pref-icon[type="plugins"] { - list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png); -} -.pref-icon[type="camera"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} -.pref-icon[type="microphone"] { - list-style-image: url(chrome://global/skin/icons/question-64.png); -} - -.pref-title { - font-size: 125%; - -moz-margin-start: 4px; - margin-bottom: 0; - font-weight: bold; -} - -.pref-menulist { - min-width: 10em; - } - -#cookies-label, -#passwords-label { - -moz-margin-start: 4px; /* align with the menulists */ -} diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css index a7bf8c5..92108a8 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css @@ -372,28 +372,6 @@ description > html|a { } /** - * Sync migration - */ -#sync-migrate-upgrade-description { - /* description elts need a min-width to wrap correctly - bug 630864? */ - min-width: 100px -} - -#sync-migration { - border: 1px solid rgba(0, 0, 0, 0.32); - background-color: InfoBackground; - color: InfoText; - text-shadow: none; - margin: 5px 0 0 0; - animation: fadein 3000ms; -} - -@keyframes fadein { - from { opacity: 0; } - to { opacity: 1; } -} - -/** * Sync */ @@ -466,46 +444,6 @@ description > html|a { background-color: #FF9500; } -#sync-migration-buttons-deck { - visibility: collapse; -} - -#learnMoreLink { - margin: 0; - color: #FBFBFB; - text-decoration: underline; -} - -#syncStatusMessage[message-type="migration"] #sync-migration-buttons-deck { - visibility: visible; -} - -#sync-migration-buttons-deck { - margin-top: 20px; -} - -#sync-migration-buttons-deck button { - margin: 0 10px 0 0; - border: 0; - border-radius: 2px; -} - -#sync-migrate-upgrade, -#sync-migrate-resend { - background-color: #0095DD; - color: #FBFBFB; -} - -#sync-migrate-upgrade:hover, -#sync-migrate-resend:hover { - background-color: #008ACB; -} - -#sync-migrate-upgrade:hover:active, -#sync-migrate-resend:hover:active { - background-color: #006B9D; -} - #syncStatusMessageWrapper { -moz-box-flex: 1; padding-right: 5px; diff --git a/arc-firefox-theme/chrome/browser/preferences/preferences.css b/arc-firefox-theme/chrome/browser/preferences/preferences.css index 8d68b81..95820e2 100644 --- a/arc-firefox-theme/chrome/browser/preferences/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/preferences.css @@ -1,3 +1,9 @@ +/* +# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +*/ /* Global Styles */ #BrowserPreferences radio[pane] { @@ -178,25 +184,3 @@ label.small { #noFxaAccount > label:first-child { margin-bottom: 0.6em; } - -/** - * Sync migration - */ -#sync-migration { - border: 1px solid rgba(0, 0, 0, 0.32); - background-color: InfoBackground; - color: InfoText; - text-shadow: none; - margin: 5px 0 0 0; - animation: fadein 3000ms; -} - -#sync-migration description { - margin: 8px; -} - -@keyframes fadein { - from { opacity: 0; } - to { opacity: 1; } -} - diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss index cdd94fb..3757954 100644 --- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss +++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss @@ -605,8 +605,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { max-width: 16px; } -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon, -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { max-width: 18px; } @@ -635,9 +635,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-duration: 150ms; } -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-icon, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-badge-stack, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } @@ -829,29 +829,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { // margin-left: -30.01px; //} -/* tabview menu item */ - -#menu_tabview { - list-style-image: url(chrome://browser/skin/tabview/tabview.png); - -moz-image-region: rect(0, 80px, 16px, 64px); -} - -#menu_tabview[groups="0"] { - -moz-image-region: rect(0, 16px, 16px, 0); -} - -#menu_tabview[groups="1"] { - -moz-image-region: rect(0, 32px, 16px, 16px); -} - -#menu_tabview[groups="2"] { - -moz-image-region: rect(0, 48px, 16px, 32px); -} - -#menu_tabview[groups="3"] { - -moz-image-region: rect(0, 64px, 16px, 48px); -} - /* undo close tab menu item */ #alltabs_undoCloseTab { list-style-image: url(chrome://browser/skin/undoCloseTab.png); @@ -872,7 +849,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { /* Menu panel buttons */ -:-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, #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, #webide-button, #loop-button, #pocket-button), +:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/toolbar-icons.svg"); @@ -880,7 +857,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { } -#back-button, #back-button, #forward-button, #home-button, #print-button, #downloads-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, #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, #webide-button, #loop-button, #pocket-button { +#back-button, #back-button, #forward-button, #home-button, #print-button, #downloads-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button { #nav-bar &:not([disabled=true]):-moz-any([open],[checked],:hover:active), #TabsToolbar &:not([disabled=true]):-moz-any([open],[checked],:hover:active) { @@ -897,9 +874,9 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active. } -//toolbar[brighttext] :-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, #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, #loop-button, #pocket-button), +//toolbar[brighttext] :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), //toolbar[brighttext] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { -// list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-dark.svg"); +// list-style-image: url(chrome://browser/skin/Toolbar-inverted.png); //} #back-button { @@ -947,16 +924,7 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active. } #sync-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 270px, 18px, 252px); -} - -#sync-button[cui-areatype="toolbar"][status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png"); - -moz-image-region: rect(0, 18px, 18px, 0px); -} - -toolbar[brighttext] #sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); + -moz-image-region: rect(0, 792px, 18px, 774px); } #feed-button[cui-areatype="toolbar"] { @@ -1015,15 +983,6 @@ toolbar[brighttext] #sync-button[status="active"] { -moz-image-region: rect(0, 486px, 18px, 468px); } -#PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; - -moz-image-region: auto !important; -} - -toolbar[brighttext] #PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; -} - #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -1052,10 +1011,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { transform: scaleX(-1); } -#tabview-button { - -moz-image-region: rect(0, 648px, 18px, 630px); -} - #email-link-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 666px, 18px, 648px); } @@ -1076,47 +1031,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { transform: scaleX(-1); } -#loop-button { - list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/loop-toolbar-icons.svg"); - -moz-image-region: rect(0, 18px, 18px, 0); - - #TabsToolbar & { list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/loop-tabbar-icons.svg"); } -} - -#nav-bar #loop-button:not([disabled=true]):-moz-any([open],[checked],:hover:active), -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open],[checked],:hover:active) { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; -} - -//toolbar[brighttext] #loop-button { -// list-style-image: url(chrome://browser/skin/loop/toolbar-inverted.png); -//} - -#loop-button[state="disabled"], -#loop-button[disabled="true"] { - -moz-image-region: rect(0, 36px, 18px, 18px); -} - -#loop-button:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 54px, 18px, 36px); -} - -#loop-button:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 72px, 18px, 54px); -} - -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) { - -moz-image-region: rect(0, 90px, 18px, 72px); -} - -#loop-button:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 108px, 18px, 90px); -} - -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) { - -moz-image-region: rect(0, 126px, 18px, 108px); -} - #webide-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 738px, 18px, 720px); } @@ -1141,8 +1055,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { @media not all and (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image); } @@ -1191,12 +1105,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 384px, 32px, 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); + -moz-image-region: rect(0px, 1024px, 32px, 992px); } #feed-button[cui-areatype="menu-panel"], @@ -1242,11 +1151,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-image-region: rect(0px, 576px, 32px, 544px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 608px, 32px, 576px); - } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 640px, 32px, 608px); @@ -1317,42 +1221,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - 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 { - -moz-image-region: rect(0, 32px, 32px, 0) !important; - } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 64px, 32px, 32px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 96px, 32px, 64px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 128px, 32px, 96px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) { - -moz-image-region: rect(0, 160px, 32px, 128px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 192px, 32px, 160px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) { - -moz-image-region: rect(0, 224px, 32px, 192px); - } - /* Wide panel control icons */ #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, @@ -1396,8 +1264,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { /* Menu panel and palette styles */ @media (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image-2x); } @@ -1446,12 +1314,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 768px, 64px, 704px); - } - - #sync-button[cui-areatype="menu-panel"][status="active"] { - list-style-image: url(chrome://browser/skin/syncProgress-menuPanel@2x.png); - -moz-image-region: rect(0px, 64px, 64px, 0px); + -moz-image-region: rect(0px, 2048px, 64px, 1984px); } #feed-button[cui-areatype="menu-panel"], @@ -1501,42 +1364,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); - -moz-image-region: rect(0, 64px, 64px, 0); - } - - /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button { - -moz-image-region: rect(0, 64px, 64px, 0) !important; - } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 128px, 64px, 64px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 192px, 64px, 128px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 256px, 64px, 192px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover,:hover:active,[open]) { - -moz-image-region: rect(0, 320px, 64px, 256px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 384px, 64px, 320px); - } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover,:hover:active,[open]) { - -moz-image-region: rect(0, 448px, 64px, 384px); - } - #new-tab-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 1088px, 64px, 1024px); @@ -1547,11 +1374,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-image-region: rect(0px, 1152px, 64px, 1088px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 1216px, 64px, 1152px); - } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 1280px, 64px, 1216px); @@ -1778,9 +1600,12 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { -moz-box-align: center; } -//.urlbar-icon { -// padding: 0 3px; -//} +.urlbar-icon { + padding: 0 1px; + /* 16x16 icon with border-box sizing */ + width: 16px; + height: 16px; +} #urlbar-search-footer { border-top: 1px solid hsla(210,4%,10%,.14); @@ -1932,10 +1757,18 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { //#identity-box:hover, //#identity-box[open=true] { -// background-color: var(--identity-box-selected-background-color); // border-image-source: none; //} +//#identity-box:hover { +// background-color: var(--identity-box-hover-background-color); +//} + +//#identity-box:hover:active, +//#identity-box[open=true] { +// background-color: var(--identity-box-selected-background-color); +//} + #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity { color: var(--identity-box-verified-color); } @@ -1973,13 +1806,42 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box // padding-inline-start: calc(var(--backbutton-urlbar-overlap) + 4.01px); //} +/* MAIN IDENTITY ICON */ + +#identity-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-icon.svg#normal); +} + +#identity-box:hover > #identity-icon, +#identity-box[open=true] > #identity-icon { + list-style-image: url(chrome://browser/skin/identity-icon.svg#hover); +} + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); +} + +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon { + opacity: 0.3; +} + +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); + width: 16px; + height: 16px; + opacity: 1; +} + /* TRACKING PROTECTION ICON */ #tracking-protection-icon { width: 16px; height: 16px; - margin-inline-start: 0; - margin-inline-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 0; list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); opacity: 1; } @@ -1993,59 +1855,48 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box } #tracking-protection-icon:not([state]) { - margin-inline-start: -18px; + margin-inline-end: -18px; pointer-events: none; opacity: 0; /* Only animate the shield in, when it disappears hide it immediately. */ transition: none; } -#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { +#urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon { visibility: collapse; } -/* MAIN IDENTITY ICON */ +/* CONNECTION ICON */ -#page-proxy-favicon { +#connection-icon { width: 16px; height: 16px; - list-style-image: url(chrome://browser/skin/identity-not-secure.svg); -} - -.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); + margin-inline-start: 2px; + visibility: collapse; } -.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { +#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon { list-style-image: url(chrome://browser/skin/identity-secure.svg); + visibility: visible; } -.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { +#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon { list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); + visibility: visible; } -.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } -.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon { list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); -} - -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; -} - -#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { - -moz-image-region: inherit; - list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); - width: 16px; - height: 16px; - opacity: 1; + visibility: visible; } @@ -2593,16 +2444,6 @@ notification[value="translation"] menulist > .menulist-dropmarker { display: block; } -/* Loop/ Hello browser styles */ - -notification[value="loop-sharing-notification"] .button-menubutton-button { - min-width: 0; -} - -notification[value="loop-sharing-notification"] .messageImage { - list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); -} - #treecolAutoCompleteImage { max-width : 36px; } @@ -2651,7 +2492,7 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t font-size: 0.9em; } -richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { +richlistitem[type~="action"][actiontype$="tab"] > .ac-url-box > .ac-action-icon { list-style-image: url("chrome://browser/skin/actionicon-tab.png"); padding: 0 3px; } @@ -3424,7 +3265,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- .tab-background-middle[visuallyselected=true]:-moz-lwtheme { background-color: transparent; background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), - linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, rgba(255,255,255,.3));/*, + linear-gradient(transparent 2px, rgba(255,255,255,.4) 2px, rgba(255,255,255,.4));/*, lwtHeader;*/ /* Don't stretch the LWT header images */ background-size: var(--tab-stroke-background-size), auto 100%, auto auto; @@ -3433,7 +3274,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before { - background-image: linear-gradient(transparent 0px, transparent 2px, hsla(0,0%,100%,0.35) 2px, hsla(0,0%,100%,0.35) 3px, hsla(0,0%,100%,0.65) 3px, hsla(0,0%,100%,0.65) 4px, rgba(255,255,255,.3)); + background-image: linear-gradient(transparent 2px, rgba(255,255,255,.4) 2px, rgba(255,255,255,.4)); } .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, @@ -4284,7 +4125,7 @@ html|*#fullscreen-exit-button { :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { - filter: url("chrome://devtools/skin/images/filters.svg#invert"); + filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon, @@ -4650,19 +4491,22 @@ notification.pluginVulnerable .messageImage { #downloads-button[cui-areatype="toolbar"] > #downloads-indicator-anchor > #downloads-indicator-icon, #nav-bar #downloads-button[cui-areatype="toolbar"] > #downloads-indicator-anchor > #downloads-indicator-icon { - background: -moz-image-rect(url("chrome://browser/skin/custom_images/#{$asset_path}/toolbar-icons.svg"), 0, 198, 18, 180) center no-repeat; + background: -moz-image-rect(url("chrome://browser/skin/custom_images/#{$asset_path}/toolbar-icons.svg"), + 0, 198, 18, 180) center no-repeat; min-width: 18px; min-height: 18px; } #TabsToolbar #downloads-button[cui-areatype="toolbar"] > #downloads-indicator-anchor > #downloads-indicator-icon { - background: -moz-image-rect(url("chrome://browser/skin/custom_images/#{$asset_path}/tabbar-icons.svg"), 0, 198, 18, 180) center no-repeat; + background: -moz-image-rect(url("chrome://browser/skin/custom_images/#{$asset_path}/tabbar-icons.svg"), + 0, 198, 18, 180) center no-repeat; } #downloads-button[cui-areatype="toolbar"]:not([disabled=true]):-moz-any([open],[checked],:hover:active) > #downloads-indicator-anchor > #downloads-indicator-icon, #TabsToolbar #downloads-button[cui-areatype="toolbar"]:not([disabled=true]):-moz-any([open],[checked],:hover:active) > #downloads-indicator-anchor > #downloads-indicator-icon, #nav-bar #downloads-button[cui-areatype="toolbar"]:not([disabled=true]):-moz-any([open],[checked],:hover:active) > #downloads-indicator-anchor > #downloads-indicator-icon { - background: -moz-image-rect(url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"), 0, 198, 18, 180) center no-repeat; + background: -moz-image-rect(url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"), + 0, 198, 18, 180) center no-repeat; } //toolbar[brighttext] #downloads-button[cui-areatype="toolbar"]:not([attention]) > #downloads-indicator-anchor > #downloads-indicator-icon { @@ -4673,7 +4517,8 @@ notification.pluginVulnerable .messageImage { #downloads-button[cui-areatype="toolbar"][attention] > #downloads-indicator-anchor > #downloads-indicator-icon, #nav-bar #downloads-button[cui-areatype="toolbar"][attention] > #downloads-indicator-anchor > #downloads-indicator-icon, #TabsToolbar #downloads-button[cui-areatype="toolbar"][attention] > #downloads-indicator-anchor > #downloads-indicator-icon { - background-image: -moz-image-rect(url("chrome://browser/skin/custom_images/#{$asset_path}/toolbar-icons.svg"), 18, 198, 36, 180); + background-image: -moz-image-rect(url("chrome://browser/skin/custom_images/#{$asset_path}/toolbar-icons.svg"), + 18, 198, 36, 180); } #downloads-button[cui-areatype="menu-panel"][attention] { @@ -4968,42 +4813,12 @@ chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } -chatbox[src^="about:loopconversation#"] .chat-minimize-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); -} - -chatbox[src^="about:loopconversation#"] .chat-swap-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); -} - -.chat-loop-hangup { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); - background-color: #d13f1a; - border: 1px solid #d13f1a; - border-top-right-radius: 4px; - width: 32px; - height: 26px; - margin-top: -6px; - margin-bottom: -5px; - -moz-margin-start: 6px; - -moz-margin-end: -5px; -} - -.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover,:hover:active) { - background-color: #ef6745; - border-color: #ef6745; -} - .chat-title { color: #666; text-shadow: none; cursor: inherit; } -chatbox[src^="about:loopconversation#"] .chat-title { - color: white; -} - .chat-titlebar { height: 26px; min-height: 26px; @@ -5022,11 +4837,6 @@ chatbox[src^="about:loopconversation#"] .chat-title { background-color: #f0f0f0; } -chatbox[src^="about:loopconversation#"] > .chat-titlebar { - background-color: #00a9dc; - border-color: #00a9dc; -} - .chat-titlebar > .notification-anchor-icon { margin-left: 2px; margin-right: 2px; diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css index 41f7494..fa16d69 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css @@ -482,8 +482,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { max-width: 16px; } -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon, -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { max-width: 18px; } @@ -508,9 +508,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-property: background-color, border-color; transition-duration: 150ms; } -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-icon, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-badge-stack, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon, @@ -621,23 +621,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { margin-left: 2px; margin-right: 2px; } -/* tabview menu item */ -#menu_tabview { - list-style-image: url(chrome://browser/skin/tabview/tabview.png); - -moz-image-region: rect(0, 80px, 16px, 64px); } - -#menu_tabview[groups="0"] { - -moz-image-region: rect(0, 16px, 16px, 0); } - -#menu_tabview[groups="1"] { - -moz-image-region: rect(0, 32px, 16px, 16px); } - -#menu_tabview[groups="2"] { - -moz-image-region: rect(0, 48px, 16px, 32px); } - -#menu_tabview[groups="3"] { - -moz-image-region: rect(0, 64px, 16px, 48px); } - /* undo close tab menu item */ #alltabs_undoCloseTab { list-style-image: url(chrome://browser/skin/undoCloseTab.png); } @@ -655,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; } /* Menu panel buttons */ -:-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, #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, #webide-button, #loop-button, #pocket-button), +:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/dark/toolbar-icons.svg"); } - #TabsToolbar :-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, #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, #webide-button, #loop-button, #pocket-button), #TabsToolbar + #TabsToolbar :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #TabsToolbar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/dark/tabbar-icons.svg"); } -#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { +#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); } #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon, @@ -705,14 +688,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0, 252px, 18px, 234px); } #sync-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 270px, 18px, 252px); } - -#sync-button[cui-areatype="toolbar"][status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png"); - -moz-image-region: rect(0, 18px, 18px, 0px); } - -toolbar[brighttext] #sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); } + -moz-image-region: rect(0, 792px, 18px, 774px); } #feed-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 288px, 18px, 270px); } @@ -756,13 +732,6 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } -#PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; - -moz-image-region: auto !important; } - -toolbar[brighttext] #PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } - #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -784,9 +753,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #nav-bar-overflow-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#tabview-button { - -moz-image-region: rect(0, 648px, 18px, 630px); } - #email-link-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 666px, 18px, 648px); } @@ -802,35 +768,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#loop-button { - list-style-image: url("chrome://browser/skin/custom_images/dark/loop-toolbar-icons.svg"); - -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button { - list-style-image: url("chrome://browser/skin/custom_images/dark/loop-tabbar-icons.svg"); } - -#nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } - -#loop-button[state="disabled"], -#loop-button[disabled="true"] { - -moz-image-region: rect(0, 36px, 18px, 18px); } - -#loop-button:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 54px, 18px, 36px); } - -#loop-button:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 72px, 18px, 54px); } - -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 90px, 18px, 72px); } - -#loop-button:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 108px, 18px, 90px); } - -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 126px, 18px, 108px); } - #webide-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 738px, 18px, 720px); } @@ -849,8 +786,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { @media not all and (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image); } #home-button[cui-areatype="menu-panel"], @@ -889,11 +826,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 384px, 32px, 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); } + -moz-image-region: rect(0px, 1024px, 32px, 992px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -929,10 +862,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 576px, 32px, 544px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 608px, 32px, 576px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 640px, 32px, 608px); } @@ -988,34 +917,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - 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 { - -moz-image-region: rect(0, 32px, 32px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 64px, 32px, 32px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 96px, 32px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 128px, 32px, 96px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 160px, 32px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 192px, 32px, 160px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 224px, 32px, 192px); } - /* Wide panel control icons */ #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, @@ -1049,8 +950,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { /* Menu panel and palette styles */ @media (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image-2x); } #home-button[cui-areatype="menu-panel"], @@ -1089,11 +990,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 768px, 64px, 704px); } - - #sync-button[cui-areatype="menu-panel"][status="active"] { - list-style-image: url(chrome://browser/skin/syncProgress-menuPanel@2x.png); - -moz-image-region: rect(0px, 64px, 64px, 0px); } + -moz-image-region: rect(0px, 2048px, 64px, 1984px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -1132,34 +1029,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); - -moz-image-region: rect(0, 64px, 64px, 0); } - - /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button { - -moz-image-region: rect(0, 64px, 64px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 128px, 64px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 192px, 64px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 256px, 64px, 192px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 320px, 64px, 256px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 384px, 64px, 320px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 448px, 64px, 384px); } - #new-tab-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 1088px, 64px, 1024px); } @@ -1168,10 +1037,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 1152px, 64px, 1088px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 1216px, 64px, 1152px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 1280px, 64px, 1216px); } @@ -1336,6 +1201,12 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #urlbar-icons { -moz-box-align: center; } +.urlbar-icon { + padding: 0 1px; + /* 16x16 icon with border-box sizing */ + width: 16px; + height: 16px; } + #urlbar-search-footer { border-top: 1px solid rgba(24, 26, 27, 0.14); background-color: rgba(24, 26, 27, 0.07); } @@ -1463,12 +1334,35 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { border-radius: 0; } +/* MAIN IDENTITY ICON */ +#identity-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-icon.svg#normal); } + +#identity-box:hover > #identity-icon, +#identity-box[open=true] > #identity-icon { + list-style-image: url(chrome://browser/skin/identity-icon.svg#hover); } + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } + +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon { + opacity: 0.3; } + +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); + width: 16px; + height: 16px; + opacity: 1; } + /* TRACKING PROTECTION ICON */ #tracking-protection-icon { width: 16px; height: 16px; - margin-inline-start: 0; - margin-inline-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 0; list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); opacity: 1; } @@ -1479,49 +1373,41 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } #tracking-protection-icon:not([state]) { - margin-inline-start: -18px; + margin-inline-end: -18px; pointer-events: none; opacity: 0; /* Only animate the shield in, when it disappears hide it immediately. */ transition: none; } -#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { +#urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon { visibility: collapse; } -/* MAIN IDENTITY ICON */ -#page-proxy-favicon { +/* CONNECTION ICON */ +#connection-icon { width: 16px; height: 16px; - list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - -.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - -.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-secure.svg); } - -.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } + margin-inline-start: 2px; + visibility: collapse; } -.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-secure.svg); + visibility: visible; } -.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); + visibility: visible; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } -#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { - -moz-image-region: inherit; - list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); - width: 16px; - height: 16px; - opacity: 1; } +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); + visibility: visible; } .popup-notification-icon { width: 64px; @@ -1945,13 +1831,6 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } -/* Loop/ Hello browser styles */ -notification[value="loop-sharing-notification"] .button-menubutton-button { - min-width: 0; } - -notification[value="loop-sharing-notification"] .messageImage { - list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); } - #treecolAutoCompleteImage { max-width: 36px; } @@ -1992,7 +1871,7 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t color: -moz-nativehyperlinktext; font-size: 0.9em; } -richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { +richlistitem[type~="action"][actiontype$="tab"] > .ac-url-box > .ac-action-icon { list-style-image: url("chrome://browser/skin/actionicon-tab.png"); padding: 0 3px; } @@ -2561,8 +2440,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- See browser-lightweightTheme.css for information about run-time changes to LWT styles. */ .tab-background-middle[visuallyselected=true]:-moz-lwtheme { background-color: transparent; - background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); - /*, + background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); + /*, lwtHeader;*/ /* Don't stretch the LWT header images */ background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } @@ -2570,7 +2449,7 @@ lwtHeader;*/ /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before { - background-image: linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); } + background-image: linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); } .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before, @@ -3232,7 +3111,7 @@ html|*#fullscreen-exit-button { :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { - filter: url("chrome://devtools/skin/images/filters.svg#invert"); } + filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon, #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3786,36 +3665,11 @@ toolbar[brighttext] #downloads-indicator-counter { chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } -chatbox[src^="about:loopconversation#"] .chat-minimize-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); } - -chatbox[src^="about:loopconversation#"] .chat-swap-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); } - -.chat-loop-hangup { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); - background-color: #d13f1a; - border: 1px solid #d13f1a; - border-top-right-radius: 4px; - width: 32px; - height: 26px; - margin-top: -6px; - margin-bottom: -5px; - -moz-margin-start: 6px; - -moz-margin-end: -5px; } - -.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { - background-color: #ef6745; - border-color: #ef6745; } - .chat-title { color: #666; text-shadow: none; cursor: inherit; } -chatbox[src^="about:loopconversation#"] .chat-title { - color: white; } - .chat-titlebar { height: 26px; min-height: 26px; @@ -3832,10 +3686,6 @@ chatbox[src^="about:loopconversation#"] .chat-title { .chat-titlebar[selected] { background-color: #f0f0f0; } -chatbox[src^="about:loopconversation#"] > .chat-titlebar { - background-color: #00a9dc; - border-color: #00a9dc; } - .chat-titlebar > .notification-anchor-icon { margin-left: 2px; margin-right: 2px; } diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css index 101833d..a3f4850 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css @@ -482,8 +482,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { max-width: 16px; } -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon, -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { max-width: 18px; } @@ -508,9 +508,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-property: background-color, border-color; transition-duration: 150ms; } -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-icon, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-badge-stack, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon, @@ -621,23 +621,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { margin-left: 2px; margin-right: 2px; } -/* tabview menu item */ -#menu_tabview { - list-style-image: url(chrome://browser/skin/tabview/tabview.png); - -moz-image-region: rect(0, 80px, 16px, 64px); } - -#menu_tabview[groups="0"] { - -moz-image-region: rect(0, 16px, 16px, 0); } - -#menu_tabview[groups="1"] { - -moz-image-region: rect(0, 32px, 16px, 16px); } - -#menu_tabview[groups="2"] { - -moz-image-region: rect(0, 48px, 16px, 32px); } - -#menu_tabview[groups="3"] { - -moz-image-region: rect(0, 64px, 16px, 48px); } - /* undo close tab menu item */ #alltabs_undoCloseTab { list-style-image: url(chrome://browser/skin/undoCloseTab.png); } @@ -655,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; } /* Menu panel buttons */ -:-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, #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, #webide-button, #loop-button, #pocket-button), +:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/light/toolbar-icons.svg"); } - #TabsToolbar :-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, #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, #webide-button, #loop-button, #pocket-button), #TabsToolbar + #TabsToolbar :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #TabsToolbar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/dark/tabbar-icons.svg"); } -#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { +#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); } #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon, @@ -705,14 +688,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0, 252px, 18px, 234px); } #sync-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 270px, 18px, 252px); } - -#sync-button[cui-areatype="toolbar"][status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png"); - -moz-image-region: rect(0, 18px, 18px, 0px); } - -toolbar[brighttext] #sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); } + -moz-image-region: rect(0, 792px, 18px, 774px); } #feed-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 288px, 18px, 270px); } @@ -756,13 +732,6 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } -#PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; - -moz-image-region: auto !important; } - -toolbar[brighttext] #PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } - #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -784,9 +753,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #nav-bar-overflow-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#tabview-button { - -moz-image-region: rect(0, 648px, 18px, 630px); } - #email-link-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 666px, 18px, 648px); } @@ -802,35 +768,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#loop-button { - list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg"); - -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button { - list-style-image: url("chrome://browser/skin/custom_images/dark/loop-tabbar-icons.svg"); } - -#nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } - -#loop-button[state="disabled"], -#loop-button[disabled="true"] { - -moz-image-region: rect(0, 36px, 18px, 18px); } - -#loop-button:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 54px, 18px, 36px); } - -#loop-button:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 72px, 18px, 54px); } - -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 90px, 18px, 72px); } - -#loop-button:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 108px, 18px, 90px); } - -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 126px, 18px, 108px); } - #webide-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 738px, 18px, 720px); } @@ -849,8 +786,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { @media not all and (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image); } #home-button[cui-areatype="menu-panel"], @@ -889,11 +826,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 384px, 32px, 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); } + -moz-image-region: rect(0px, 1024px, 32px, 992px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -929,10 +862,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 576px, 32px, 544px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 608px, 32px, 576px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 640px, 32px, 608px); } @@ -988,34 +917,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - 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 { - -moz-image-region: rect(0, 32px, 32px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 64px, 32px, 32px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 96px, 32px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 128px, 32px, 96px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 160px, 32px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 192px, 32px, 160px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 224px, 32px, 192px); } - /* Wide panel control icons */ #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, @@ -1049,8 +950,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { /* Menu panel and palette styles */ @media (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image-2x); } #home-button[cui-areatype="menu-panel"], @@ -1089,11 +990,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 768px, 64px, 704px); } - - #sync-button[cui-areatype="menu-panel"][status="active"] { - list-style-image: url(chrome://browser/skin/syncProgress-menuPanel@2x.png); - -moz-image-region: rect(0px, 64px, 64px, 0px); } + -moz-image-region: rect(0px, 2048px, 64px, 1984px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -1132,34 +1029,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); - -moz-image-region: rect(0, 64px, 64px, 0); } - - /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button { - -moz-image-region: rect(0, 64px, 64px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 128px, 64px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 192px, 64px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 256px, 64px, 192px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 320px, 64px, 256px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 384px, 64px, 320px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 448px, 64px, 384px); } - #new-tab-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 1088px, 64px, 1024px); } @@ -1168,10 +1037,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 1152px, 64px, 1088px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 1216px, 64px, 1152px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 1280px, 64px, 1216px); } @@ -1335,6 +1200,12 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #urlbar-icons { -moz-box-align: center; } +.urlbar-icon { + padding: 0 1px; + /* 16x16 icon with border-box sizing */ + width: 16px; + height: 16px; } + #urlbar-search-footer { border-top: 1px solid rgba(24, 26, 27, 0.14); background-color: rgba(24, 26, 27, 0.07); } @@ -1462,12 +1333,35 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { border-radius: 0; } +/* MAIN IDENTITY ICON */ +#identity-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-icon.svg#normal); } + +#identity-box:hover > #identity-icon, +#identity-box[open=true] > #identity-icon { + list-style-image: url(chrome://browser/skin/identity-icon.svg#hover); } + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } + +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon { + opacity: 0.3; } + +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); + width: 16px; + height: 16px; + opacity: 1; } + /* TRACKING PROTECTION ICON */ #tracking-protection-icon { width: 16px; height: 16px; - margin-inline-start: 0; - margin-inline-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 0; list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); opacity: 1; } @@ -1478,49 +1372,41 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } #tracking-protection-icon:not([state]) { - margin-inline-start: -18px; + margin-inline-end: -18px; pointer-events: none; opacity: 0; /* Only animate the shield in, when it disappears hide it immediately. */ transition: none; } -#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { +#urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon { visibility: collapse; } -/* MAIN IDENTITY ICON */ -#page-proxy-favicon { +/* CONNECTION ICON */ +#connection-icon { width: 16px; height: 16px; - list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - -.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - -.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-secure.svg); } - -.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } + margin-inline-start: 2px; + visibility: collapse; } -.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-secure.svg); + visibility: visible; } -.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); + visibility: visible; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } -#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { - -moz-image-region: inherit; - list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); - width: 16px; - height: 16px; - opacity: 1; } +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); + visibility: visible; } .popup-notification-icon { width: 64px; @@ -1944,13 +1830,6 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } -/* Loop/ Hello browser styles */ -notification[value="loop-sharing-notification"] .button-menubutton-button { - min-width: 0; } - -notification[value="loop-sharing-notification"] .messageImage { - list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); } - #treecolAutoCompleteImage { max-width: 36px; } @@ -1991,7 +1870,7 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t color: -moz-nativehyperlinktext; font-size: 0.9em; } -richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { +richlistitem[type~="action"][actiontype$="tab"] > .ac-url-box > .ac-action-icon { list-style-image: url("chrome://browser/skin/actionicon-tab.png"); padding: 0 3px; } @@ -2561,8 +2440,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- See browser-lightweightTheme.css for information about run-time changes to LWT styles. */ .tab-background-middle[visuallyselected=true]:-moz-lwtheme { background-color: transparent; - background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); - /*, + background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); + /*, lwtHeader;*/ /* Don't stretch the LWT header images */ background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } @@ -2570,7 +2449,7 @@ lwtHeader;*/ /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before { - background-image: linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); } + background-image: linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); } .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before, @@ -3232,7 +3111,7 @@ html|*#fullscreen-exit-button { :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { - filter: url("chrome://devtools/skin/images/filters.svg#invert"); } + filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon, #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3786,36 +3665,11 @@ toolbar[brighttext] #downloads-indicator-counter { chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } -chatbox[src^="about:loopconversation#"] .chat-minimize-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); } - -chatbox[src^="about:loopconversation#"] .chat-swap-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); } - -.chat-loop-hangup { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); - background-color: #d13f1a; - border: 1px solid #d13f1a; - border-top-right-radius: 4px; - width: 32px; - height: 26px; - margin-top: -6px; - margin-bottom: -5px; - -moz-margin-start: 6px; - -moz-margin-end: -5px; } - -.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { - background-color: #ef6745; - border-color: #ef6745; } - .chat-title { color: #666; text-shadow: none; cursor: inherit; } -chatbox[src^="about:loopconversation#"] .chat-title { - color: white; } - .chat-titlebar { height: 26px; min-height: 26px; @@ -3832,10 +3686,6 @@ chatbox[src^="about:loopconversation#"] .chat-title { .chat-titlebar[selected] { background-color: #f0f0f0; } -chatbox[src^="about:loopconversation#"] > .chat-titlebar { - background-color: #00a9dc; - border-color: #00a9dc; } - .chat-titlebar > .notification-anchor-icon { margin-left: 2px; margin-right: 2px; } diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css index e7c3a52..dabd4cb 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-light.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css @@ -482,8 +482,8 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { max-width: 16px; } -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > .toolbarbutton-icon, -:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #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, #webide-button, #loop-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > .toolbarbutton-icon, +:-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon, #bookmarks-menu-button[cui-areatype="toolbar"] > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { max-width: 18px; } @@ -508,9 +508,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { transition-property: background-color, border-color; transition-duration: 150ms; } -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-icon, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-badge-stack, -:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #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, #webide-button, #loop-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-icon, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-badge-stack, +:-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1:not(:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button)) > .toolbarbutton-menubutton-button > .toolbarbutton-icon { padding: 3px 7px; } :-moz-any(#TabsToolbar, #nav-bar) .toolbarbutton-1 > .toolbarbutton-icon, @@ -621,23 +621,6 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { margin-left: 2px; margin-right: 2px; } -/* tabview menu item */ -#menu_tabview { - list-style-image: url(chrome://browser/skin/tabview/tabview.png); - -moz-image-region: rect(0, 80px, 16px, 64px); } - -#menu_tabview[groups="0"] { - -moz-image-region: rect(0, 16px, 16px, 0); } - -#menu_tabview[groups="1"] { - -moz-image-region: rect(0, 32px, 16px, 16px); } - -#menu_tabview[groups="2"] { - -moz-image-region: rect(0, 48px, 16px, 32px); } - -#menu_tabview[groups="3"] { - -moz-image-region: rect(0, 64px, 16px, 48px); } - /* undo close tab menu item */ #alltabs_undoCloseTab { list-style-image: url(chrome://browser/skin/undoCloseTab.png); } @@ -655,14 +638,14 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=menu") !important; } /* Menu panel buttons */ -:-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, #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, #webide-button, #loop-button, #pocket-button), +:-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/light/toolbar-icons.svg"); } - #TabsToolbar :-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, #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, #webide-button, #loop-button, #pocket-button), #TabsToolbar + #TabsToolbar :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button), #TabsToolbar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon { list-style-image: url("chrome://browser/skin/custom_images/light/tabbar-icons.svg"); } -#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #tabview-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { +#nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #back-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #forward-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #home-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #print-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #downloads-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-tab-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #new-window-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #fullscreen-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sync-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #feed-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #social-share-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #open-file-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #find-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #developer-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #preferences-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #privatebrowsing-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #save-page-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #add-ons-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #history-panelmenu:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #nav-bar-overflow-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #PanelUI-menu-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #characterencoding-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #email-link-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #sidebar-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-out-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-reset-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #zoom-in-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #cut-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #copy-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #paste-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #e10s-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #panic-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #webide-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #nav-bar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), #TabsToolbar #pocket-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active.svg"); } #nav-bar #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker:not([disabled=true]):-moz-any([open], [checked], :hover:active) > .dropmarker-icon, @@ -705,14 +688,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0, 252px, 18px, 234px); } #sync-button[cui-areatype="toolbar"] { - -moz-image-region: rect(0, 270px, 18px, 252px); } - -#sync-button[cui-areatype="toolbar"][status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar.png"); - -moz-image-region: rect(0, 18px, 18px, 0px); } - -toolbar[brighttext] #sync-button[status="active"] { - list-style-image: url("chrome://browser/skin/syncProgress-toolbar-inverted.png"); } + -moz-image-region: rect(0, 792px, 18px, 774px); } #feed-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 288px, 18px, 270px); } @@ -756,13 +732,6 @@ toolbar[brighttext] #sync-button[status="active"] { #PanelUI-menu-button { -moz-image-region: rect(0, 486px, 18px, 468px); } -#PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger.png") !important; - -moz-image-region: auto !important; } - -toolbar[brighttext] #PanelUI-menu-button.thumburger { - list-style-image: url("chrome://browser/skin/customizableui/thumburger-inverted.png") !important; } - #edit-controls:not(:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true])) > #cut-button { -moz-image-region: rect(0, 504px, 18px, 486px); } @@ -784,9 +753,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #nav-bar-overflow-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#tabview-button { - -moz-image-region: rect(0, 648px, 18px, 630px); } - #email-link-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 666px, 18px, 648px); } @@ -802,35 +768,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #panic-button:-moz-locale-dir(rtl) > .toolbarbutton-icon { transform: scaleX(-1); } -#loop-button { - list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg"); - -moz-image-region: rect(0, 18px, 18px, 0); } - #TabsToolbar #loop-button { - list-style-image: url("chrome://browser/skin/custom_images/light/loop-tabbar-icons.svg"); } - -#nav-bar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active), -#TabsToolbar #loop-button:not([disabled=true]):-moz-any([open], [checked], :hover:active) { - list-style-image: url("chrome://browser/skin/custom_images/loop-toolbar-icons-active.svg") !important; } - -#loop-button[state="disabled"], -#loop-button[disabled="true"] { - -moz-image-region: rect(0, 36px, 18px, 18px); } - -#loop-button:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 54px, 18px, 36px); } - -#loop-button:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 72px, 18px, 54px); } - -#loop-button:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 90px, 18px, 72px); } - -#loop-button:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 108px, 18px, 90px); } - -#loop-button:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 126px, 18px, 108px); } - #webide-button[cui-areatype="toolbar"] { -moz-image-region: rect(0, 738px, 18px, 720px); } @@ -849,8 +786,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { @media not all and (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image); } #home-button[cui-areatype="menu-panel"], @@ -889,11 +826,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 384px, 32px, 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); } + -moz-image-region: rect(0px, 1024px, 32px, 992px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -929,10 +862,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 576px, 32px, 544px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 608px, 32px, 576px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 640px, 32px, 608px); } @@ -988,34 +917,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbaritem[sdkstylewidget="true"] > toolbarbutton { -moz-image-region: rect(0, 832px, 32px, 800px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - 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 { - -moz-image-region: rect(0, 32px, 32px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 64px, 32px, 32px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 96px, 32px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 128px, 32px, 96px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 160px, 32px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 192px, 32px, 160px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 224px, 32px, 192px); } - /* Wide panel control icons */ #edit-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, #zoom-controls:-moz-any(:not([cui-areatype="toolbar"]), [overflowedItem=true]) > toolbarbutton, @@ -1049,8 +950,8 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { /* Menu panel and palette styles */ @media (min-resolution: 1.1dppx) { 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, #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, #webide-button, #loop-button, #pocket-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, #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, #webide-button, #loop-button, #pocket-button) { + :-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-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, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #pocket-button) { list-style-image: var(--menupanel-list-style-image-2x); } #home-button[cui-areatype="menu-panel"], @@ -1089,11 +990,7 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #sync-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #sync-button { - -moz-image-region: rect(0px, 768px, 64px, 704px); } - - #sync-button[cui-areatype="menu-panel"][status="active"] { - list-style-image: url(chrome://browser/skin/syncProgress-menuPanel@2x.png); - -moz-image-region: rect(0px, 64px, 64px, 0px); } + -moz-image-region: rect(0px, 2048px, 64px, 1984px); } #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { @@ -1132,34 +1029,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #pocket-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { -moz-image-region: rect(64px, 1984px, 128px, 1920px); } - #loop-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #loop-button { - list-style-image: url(chrome://browser/skin/loop/menuPanel@2x.png); - -moz-image-region: rect(0, 64px, 64px, 0); } - - /* Make sure that the state icons are not shown in the customization palette. */ - toolbarpaletteitem[place="palette"] > #loop-button { - -moz-image-region: rect(0, 64px, 64px, 0) !important; } - - #loop-button[cui-areatype="menu-panel"][state="disabled"], - #loop-button[cui-areatype="menu-panel"][disabled="true"] { - -moz-image-region: rect(0, 128px, 64px, 64px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="error"] { - -moz-image-region: rect(0, 192px, 64px, 128px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"] { - -moz-image-region: rect(0, 256px, 64px, 192px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="action"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 320px, 64px, 256px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"] { - -moz-image-region: rect(0, 384px, 64px, 320px); } - - #loop-button[cui-areatype="menu-panel"]:not([disabled="true"])[state="active"]:-moz-any(:hover, :hover:active, [open]) { - -moz-image-region: rect(0, 448px, 64px, 384px); } - #new-tab-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #new-tab-button { -moz-image-region: rect(0px, 1088px, 64px, 1024px); } @@ -1168,10 +1037,6 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { toolbarpaletteitem[place="palette"] > #privatebrowsing-button { -moz-image-region: rect(0px, 1152px, 64px, 1088px); } - #tabview-button[cui-areatype="menu-panel"], - toolbarpaletteitem[place="palette"] > #tabview-button { - -moz-image-region: rect(0px, 1216px, 64px, 1152px); } - #find-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #find-button { -moz-image-region: rect(0px, 1280px, 64px, 1216px); } @@ -1335,6 +1200,12 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { #urlbar-icons { -moz-box-align: center; } +.urlbar-icon { + padding: 0 1px; + /* 16x16 icon with border-box sizing */ + width: 16px; + height: 16px; } + #urlbar-search-footer { border-top: 1px solid rgba(24, 26, 27, 0.14); background-color: rgba(24, 26, 27, 0.07); } @@ -1462,12 +1333,35 @@ toolbar[brighttext] #PanelUI-menu-button.thumburger { window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box { border-radius: 0; } +/* MAIN IDENTITY ICON */ +#identity-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://browser/skin/identity-icon.svg#normal); } + +#identity-box:hover > #identity-icon, +#identity-box[open=true] > #identity-icon { + list-style-image: url(chrome://browser/skin/identity-icon.svg#hover); } + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } + +#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icon { + opacity: 0.3; } + +#urlbar[actiontype="searchengine"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); + width: 16px; + height: 16px; + opacity: 1; } + /* TRACKING PROTECTION ICON */ #tracking-protection-icon { width: 16px; height: 16px; - margin-inline-start: 0; - margin-inline-end: 2px; + margin-inline-start: 2px; + margin-inline-end: 0; list-style-image: url(chrome://browser/skin/tracking-protection-16.svg); opacity: 1; } @@ -1478,49 +1372,41 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box transition: margin-left 200ms ease-out, margin-right 200ms ease-out; } #tracking-protection-icon:not([state]) { - margin-inline-start: -18px; + margin-inline-end: -18px; pointer-events: none; opacity: 0; /* Only animate the shield in, when it disappears hide it immediately. */ transition: none; } -#urlbar[pageproxystate="invalid"] > #identity-box > #identity-icons > #tracking-protection-icon { +#urlbar[pageproxystate="invalid"] > #identity-box > #tracking-protection-icon { visibility: collapse; } -/* MAIN IDENTITY ICON */ -#page-proxy-favicon { +/* CONNECTION ICON */ +#connection-icon { width: 16px; height: 16px; - list-style-image: url(chrome://browser/skin/identity-not-secure.svg); } - -.chromeUI > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); } - -.verifiedDomain > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.verifiedIdentity > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-secure.svg); } - -.insecureLoginForms > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedActiveContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); } + margin-inline-start: 2px; + visibility: collapse; } -.weakCipher > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContent > #identity-icons > #page-proxy-favicon[pageproxystate="valid"], -.mixedDisplayContentLoadedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-secure.svg); + visibility: visible; } -.mixedActiveBlocked > #identity-icons > #page-proxy-favicon[pageproxystate="valid"] { - list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); } +#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-loaded.svg); + visibility: visible; } -#page-proxy-favicon[pageproxystate="invalid"] { - opacity: 0.3; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } -#urlbar[actiontype="searchengine"] > #identity-box > #identity-icons > #page-proxy-favicon { - -moz-image-region: inherit; - list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); - width: 16px; - height: 16px; - opacity: 1; } +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); + visibility: visible; } .popup-notification-icon { width: 64px; @@ -1944,13 +1830,6 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } -/* Loop/ Hello browser styles */ -notification[value="loop-sharing-notification"] .button-menubutton-button { - min-width: 0; } - -notification[value="loop-sharing-notification"] .messageImage { - list-style-image: url(chrome://browser/skin/webRTC-shareScreen-16.png); } - #treecolAutoCompleteImage { max-width: 36px; } @@ -1991,7 +1870,7 @@ richlistitem[type~="action"][actiontype="searchengine"][selected="true"] > .ac-t color: -moz-nativehyperlinktext; font-size: 0.9em; } -richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-icon { +richlistitem[type~="action"][actiontype$="tab"] > .ac-url-box > .ac-action-icon { list-style-image: url("chrome://browser/skin/actionicon-tab.png"); padding: 0 3px; } @@ -2561,8 +2440,8 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action- See browser-lightweightTheme.css for information about run-time changes to LWT styles. */ .tab-background-middle[visuallyselected=true]:-moz-lwtheme { background-color: transparent; - background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); - /*, + background-image: url(chrome://browser/skin/tabbrowser/tab-active-middle.png), linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); + /*, lwtHeader;*/ /* Don't stretch the LWT header images */ background-size: var(--tab-stroke-background-size), auto 100%, auto auto; } @@ -2570,7 +2449,7 @@ lwtHeader;*/ /* These LWT styles are normally overridden by browser-lightweightTheme.css */ .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before { - background-image: linear-gradient(transparent 0px, transparent 2px, rgba(255, 255, 255, 0.35) 2px, rgba(255, 255, 255, 0.35) 3px, rgba(255, 255, 255, 0.65) 3px, rgba(255, 255, 255, 0.65) 4px, rgba(255, 255, 255, 0.3)); } + background-image: linear-gradient(transparent 2px, rgba(255, 255, 255, 0.4) 2px, rgba(255, 255, 255, 0.4)); } .tab-background-start[visuallyselected=true]:-moz-lwtheme::before, .tab-background-end[visuallyselected=true]:-moz-lwtheme::before, @@ -3232,7 +3111,7 @@ html|*#fullscreen-exit-button { :root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { - filter: url("chrome://devtools/skin/images/filters.svg#invert"); } + filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon, #developer-toolbar-closebutton > .toolbarbutton-icon { @@ -3786,36 +3665,11 @@ toolbar[brighttext] #downloads-indicator-counter { chatbar > chatbox > .chat-titlebar > .chat-swap-button { transform: none; } -chatbox[src^="about:loopconversation#"] .chat-minimize-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#minimize-white"); } - -chatbox[src^="about:loopconversation#"] .chat-swap-button { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#expand-white"); } - -.chat-loop-hangup { - list-style-image: url("chrome://browser/skin/social/chat-icons.svg#exit-white"); - background-color: #d13f1a; - border: 1px solid #d13f1a; - border-top-right-radius: 4px; - width: 32px; - height: 26px; - margin-top: -6px; - margin-bottom: -5px; - -moz-margin-start: 6px; - -moz-margin-end: -5px; } - -.chat-toolbarbutton.chat-loop-hangup:-moz-any(:hover, :hover:active) { - background-color: #ef6745; - border-color: #ef6745; } - .chat-title { color: #666; text-shadow: none; cursor: inherit; } -chatbox[src^="about:loopconversation#"] .chat-title { - color: white; } - .chat-titlebar { height: 26px; min-height: 26px; @@ -3832,10 +3686,6 @@ chatbox[src^="about:loopconversation#"] .chat-title { .chat-titlebar[selected] { background-color: #f0f0f0; } -chatbox[src^="about:loopconversation#"] > .chat-titlebar { - background-color: #00a9dc; - border-color: #00a9dc; } - .chat-titlebar > .notification-anchor-icon { margin-left: 2px; margin-right: 2px; } diff --git a/arc-firefox-theme/chrome/browser/tabview/edit-light.png b/arc-firefox-theme/chrome/browser/tabview/edit-light.png Binary files differdeleted file mode 100644 index af42a28..0000000 --- a/arc-firefox-theme/chrome/browser/tabview/edit-light.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/tabview/search.png b/arc-firefox-theme/chrome/browser/tabview/search.png Binary files differdeleted file mode 100644 index df7212d..0000000 --- a/arc-firefox-theme/chrome/browser/tabview/search.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/tabview/stack-expander.png b/arc-firefox-theme/chrome/browser/tabview/stack-expander.png Binary files differdeleted file mode 100644 index 80e5133..0000000 --- a/arc-firefox-theme/chrome/browser/tabview/stack-expander.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/tabview/tabview.css b/arc-firefox-theme/chrome/browser/tabview/tabview.css deleted file mode 100644 index 6ad5b43..0000000 --- a/arc-firefox-theme/chrome/browser/tabview/tabview.css +++ /dev/null @@ -1,666 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -body { - font: -moz-window; - color: WindowText; - font-size: 12px; -} - -#bg { - background-color: window; - background-image: linear-gradient(rgba(0,0,0,0.1), rgba(0,0,0,0.2)); -} - -/* Tabs -----------------------------------*/ - -.tab { - margin: 4px; - padding-top: 4px; - -moz-padding-end: 6px; - padding-bottom: 6px; - -moz-padding-start: 4px; - background-color: #D7D7D7; - border-radius: 0.4em; - cursor: pointer; -} - -html[dir=rtl] .tab { - box-shadow: 0 1px 0 #FFFFFF inset, - 0 -1px 1px rgba(255, 255, 255, 0.4) inset, - -1px 0 1px rgba(255, 255, 255, 0.4) inset, - 1px 0 1px rgba(255, 255, 255, 0.4) inset, - 0 1px 1.5px rgba(0, 0, 0, 0.4); -} - -.tab canvas, -.cached-thumb { - border: 1px solid rgba(0,0,0,0.2); -} - -.thumb { - box-shadow: 1px 2px 0 rgba(0, 0, 0, 0.2); - background-color: white; -} - -html[dir=rtl] .thumb { - box-shadow: -1px 2px 0 rgba(0, 0, 0, 0.2); -} - -.favicon { - background-color: #D7D7D7; - box-shadow: - 0 -1px 0 rgba(225, 225, 225, 0.8) inset, - -1px 0 0 rgba(225, 225, 225, 0.8) inset; - padding-top: 4px; - -moz-padding-end: 6px; - padding-bottom: 6px; - -moz-padding-start: 4px; - top: 4px; - left: 4px; - -moz-border-end: 1px solid rgba(0, 0, 0, 0.3); - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - height: 16px; - width: 16px; -} - -html[dir=ltr] .favicon { - border-bottom-right-radius: 0.4em; -} - -html[dir=rtl] .favicon { - border-bottom-left-radius: 0.4em; - box-shadow: - 0 -1px 0 rgba(225, 225, 225, 0.8) inset, - 1px 0 0 rgba(225, 225, 225, 0.8) inset; - left: auto; - right: 2px; -} - -.favicon img { - border: none; - width: 16px; - height: 16px; -} - -.close { - top: 6px; - right: 6px; - width: 16px; - height: 16px; - opacity: 0.2; - background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 16, 16, 0); - background-position: center center; - background-repeat: no-repeat; -} - -.close:hover { - background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 32, 16, 16); -} - -.close:hover:active { - background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 48, 16, 32); -} - -html[dir=rtl] .close { - right: auto; - left: 6px; -} - -.close:hover, -.appTabIcon:hover { - opacity: 1.0; -} - -.expander { - bottom: 8px; - right: 6px; - width: 16px; - height: 16px; - background: url(chrome://global/skin/icons/resizer.png) no-repeat; - opacity: 0.2; -} - -html[dir=rtl] .expander { - right: auto; - left: 6px; - transform: scaleX(-1); -} - -.expander:hover { - opacity: 1.0; -} - -.close:hover, -.expander:hover, -.appTabIcon:hover { - transition-property: opacity; - transition-duration: 0.5s; - transition-timing-function: ease-out; -} - -.favicon img:hover, -.close img:hover, -.expander img:hover { - opacity: 1; - border: none; -} - -.tab-title { - top: 100%; - text-align: center; - width: 94.5%; -} - -.stacked { - padding: 0; -} - -.stacked .thumb { - box-shadow: rgba(0,0,0,.2) 1px 1px 4px; -} - -html[dir=rtl] .stacked .thumb { - box-shadow: rgba(0,0,0,.2) -1px 1px 4px; -} - -.stack-trayed .tab-title { - text-shadow: rgba(0,0,0,1) 1px 1px 1.5px; - color: #EEE; - font-size: 11px; -} - -html[dir=rtl] .stack-trayed .tab-title { - text-shadow: rgba(0,0,0,1) -1px 1px 1.5px; -} - -.stack-trayed .thumb { - box-shadow: none !important; -} - -.tab.focus { - box-shadow: Highlight 0px 0px 5px 1px !important; - border: 1px solid Highlight; -} - -/* Tab: Zooming -----------------------------------*/ - -.front .tab-title, -.front .close, -.front .favicon, -.front .expander, -.front .thumb-shadow { - display: none; -} - -.front .focus { - box-shadow: none !important; -} - -/* Tab GroupItem -----------------------------------*/ - -.groupItem { - cursor: pointer; - border: 1px solid rgba(230,230,230,1); - background-color: window; - background-image: linear-gradient(rgba(255,255,255,0.3), rgba(255,255,255,0.1)); - border-radius: 0.4em; - box-shadow: - inset rgba(255, 255, 255, 0.6) 0 0 0 2px, - rgba(0,0,0,0.2) 1px 1px 3px; -} - -html[dir=rtl] .groupItem { - box-shadow: - inset rgba(255, 255, 255, 0.6) 0 0 0 2px, - rgba(0,0,0,0.2) -1px 1px 3px; -} - -.groupItem.activeGroupItem { - box-shadow: - rgba(0,0,0,0.8) 2px 2px 8px; -} - -html[dir=rtl] .groupItem.activeGroupItem { - box-shadow: - rgba(0,0,0,0.8) -2px 2px 8px; -} - -.groupItem .close { - z-index: 10; - top: 0px; - right: 0px; - width: 22px; - height: 22px; - background-position: bottom left; -} - -html[dir=rtl] .groupItem .close { - right: auto; - left: 0px; - background-position: bottom right; -} - -.phantom { - border: 1px solid rgba(190,190,190,1); -} - -.dragRegion { - background: rgba(248,248,248,0.4); -} - -.overlay { - background-color: rgba(0,0,0,.7) !important; - box-shadow: 3px 3px 5.5px rgba(0,0,0,.5); - border-radius: 0.4em; -} - -html[dir=rtl] .overlay { - box-shadow: -3px 3px 5.5px rgba(0,0,0,.5); -} - -.appTabTrayContainer { - top: 34px; - right: 1px; - -moz-border-start: 1px solid #E1E1E1; - padding: 0 5px; - overflow: -moz-hidden-unscrollable; - text-align: start; - line-height: 0; -} - -html[dir=rtl] .appTabTrayContainer { - right: auto; - left: 1px; -} - -.appTabTray { - display: inline-block; - -moz-column-width: 16px; - -moz-column-gap: 5px; -} - -.appTabTrayContainerTruncated { - padding-bottom: 7px; -} - -.appTabTrayContainerTruncated:after { - content: "…"; - position: absolute; - bottom: 2px; - left: 0; - display: block; - width: 100%; - height: 15px; - line-height: 15px; - text-align: center; - font-size: 15px; -} - -.appTabIcon { - width: 16px; - height: 16px; - cursor: pointer; - opacity: 0.8; - padding-bottom: 3px; - display: block; -} - -.undo { - background-color: rgba(0,0,0,.2); - padding-top: 3px; - padding-bottom: 3px; - -moz-padding-start: 5px; - -moz-padding-end: 20px; - width: 135px; - line-height: 25px; - box-shadow: 0 1px 0 rgba(255,255,255,.4), 0 1px 0 rgba(0,0,0,.3) inset; - text-shadow: 0 1px 0 rgba(255,255,255,.2); - color: WindowText; - border-radius: 0.4em; - text-align: center; - border: none; - cursor: pointer; -} - -.undo:hover { - background-color: rgba(0,0,0,.3); -} - -.undo .close { - top: 7px; - right: 7px; - opacity: 0.5; -} - -html[dir=rtl] .undo .close { - right: auto; - left: 7px; -} - -.undo .close:hover{ - opacity: 1.0; -} - -/* Trenches -----------------------------------*/ - -.guideTrench { - opacity: 0.9; - border: 1px dashed rgba(0,0,0,.12); - border-bottom: none; - -moz-border-end: none; - box-shadow: 1px 1px 0 rgba(255,255,255,.15); -} - -html[dir=rtl] .guideTrench { - box-shadow: 1px 1px 0 rgba(255,255,255,.15); -} - -.visibleTrench { - opacity: 0.05; -} - -.activeVisibleTrench { - opacity: 0; -} - -.activeVisibleTrench.activeTrench { - opacity: 0.45; -} - -.visibleTrench.border, -.activeVisibleTrench.border { - background-color: red; -} - -.visibleTrench.guide, -.activeVisibleTrench.guide { - background-color: blue; -} - -/* Other -----------------------------------*/ - -.active { - box-shadow: 5px 5px 3px rgba(0,0,0,.5); -} - -html[dir=rtl] .active { - box-shadow: -5px 5px 3px rgba(0,0,0,.5); -} - -.acceptsDrop { - box-shadow: 2px 2px 7px -1px rgba(0,0,0,.6); -} - -html[dir=rtl] .acceptsDrop { - box-shadow: -2px 2px 7px -1px rgba(0,0,0,.6); -} - -.titlebar { - cursor: move; - font-size: 12px; - height: 18px; -} - -input.name { - background: transparent; - border: 1px solid transparent; - color: GrayText; - margin-top: 3px; - -moz-margin-end: 0; - margin-bottom: 0; - -moz-margin-start: 3px; - padding: 1px; -} - -html[dir=rtl] input.name { - background-position: right top; -} - -.title-container:hover input.name, -.title-container input.name:focus { - border: 1px solid #ddd; -} - -.title-container:hover input.name-locked { - border: 1px solid transparent !important; - cursor: default; -} - -input.name:focus { - color: WindowText; -} - -input.name::-moz-placeholder { - opacity: 1.0; - font-style: italic !important; - color: transparent; - background-image: url(chrome://browser/skin/tabview/edit-light.png); - background-repeat: no-repeat; -} - -.title-container:hover input.name::-moz-placeholder { - color: GrayText; - background-image: none; -} - -input.name:focus::-moz-placeholder { - background-image: none; -} - -.title-shield { - margin-top: 3px; - -moz-margin-end: 0; - margin-bottom: 0; - -moz-margin-start: 3px; - padding: 1px; - left: 0; - top: 0; - height: 100%; - width: -moz-available; - cursor: text; -} - -html[dir=rtl] .title-shield { - left: auto; - right: 0; -} - -.transparentBorder { - border: 1px solid transparent !important; -} - -.stackExpander { - cursor: pointer; - bottom: 8px; - background-image: -moz-image-rect(url(chrome://browser/skin/tabview/stack-expander.png), 0, 48, 24, 24); - width: 24px; - height: 24px; -} - -.stackExpander:hover { - background-image: -moz-image-rect(url(chrome://browser/skin/tabview/stack-expander.png), 0, 24, 24, 0); -} - -/* Resizable -----------------------------------*/ -.resizer { - background-image: url(chrome://global/skin/icons/resizer.png); - width: 16px; - height: 16px; - bottom: 0px; - right: 0px; - opacity: .2; -} - -html[dir=rtl] .resizer { - right: auto; - left: 0; - transform: scaleX(-1); -} - -.iq-resizable-handle { - font-size: 0.1px; -} - -.iq-resizable-se { - cursor: se-resize; - width: 12px; - height: 12px; - padding-right: 3px; - padding-bottom: 3px; - right: -2px; - bottom: -2px; -} - -html[dir=rtl] .iq-resizable-se { - cursor: sw-resize; - right: auto; - left: 1px; -} - -/* Exit button -+----------------------------------*/ -#exit-button { - width: 16px; - height: 16px; - -moz-margin-end: 8px; - margin-top: 5px; - background-image: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 80, 16, 64); - background-attachment: scroll; - background-repeat: no-repeat; - border: none; -} - -#exit-button[groups="0"] { - background-image: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 16, 16, 0); -} - -#exit-button[groups="1"] { - background-image: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 32, 16, 16); -} - -#exit-button[groups="2"] { - background-image: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 48, 16, 32); -} - -#exit-button[groups="3"] { - background-image: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 64, 16, 48); -} - -/* Search -----------------------------------*/ -#searchshade{ - background-color: rgba(0,0,0,.42); - width: 100%; - height: 100%; -} - -#search{ - width: 100%; - height: calc(100% - 1.7em - 20px); /* leave room for banner */ -} - -#searchbox{ - width: 270px; - max-width: -moz-available; - -moz-margin-start: 20px; - height: 30px; - box-shadow: 0px 1px 0px rgba(255,255,255,.5), 0px -1px 0px rgba(0,0,0,1), 0px 0px 9px rgba(0,0,0,.8); - color: white; - border: none; - background-color: #272727; - border-radius: 0.4em; - -moz-padding-start: 5px; - -moz-padding-end: 5px; - font-size: 14px; -} - -#actions{ - top: -3px; - padding-top: 3px; - width: 29px; - text-align: center; - border: 1px solid rgba(230,230,230,1); - background-color: rgba(248,248,248,1); - border-radius: 0.4em; - box-shadow: - inset rgba(255, 255, 255, 0.6) 0 0 0 2px, - rgba(0,0,0,0.2) 1px 1px 3px; -} - -html[dir=rtl] #actions { - box-shadow: - inset rgba(255, 255, 255, 0.6) 0 0 0 2px, - rgba(0,0,0,0.2) -1px 1px 3px; -} - -#actions #searchbutton{ - background: transparent url(chrome://browser/skin/tabview/search.png) no-repeat; - border: none; - width: 20px; - height: 20px; - margin-top: 3px; - -moz-margin-end: 1px; -} - -.notMainMatch{ - opacity: .70; -} - -#otherresults { - left: 0px; - bottom: 0px; - width: 100%; - height: 30px; - background-color: rgba(0,0,0,.3); - box-shadow: 0px -1px 0px rgba(255,255,255,.1), inset 0px 2px 5px rgba(0,0,0,.3); -} - -html[dir=rtl] #otherresults { - left: auto; - right: 0; -} - -#otherresults .label { - color: #999; - line-height: 30px; - -moz-margin-start: 5px; - -moz-margin-end: 5px; -} - -.inlineMatch { - background-color: #EBEBEB; - border-radius: 0.4em; - box-shadow: 0 1px 4px rgba(0, 0, 0, 0.6); - border: 1px solid rgba(255, 255, 255, 0.5); - -moz-padding-start: 3px; - -moz-padding-end: 3px; - height: 20px; - -moz-margin-end: 5px; - cursor: pointer; -} - -.inlineMatch:hover { - opacity: 1.0; -} - -.inlineMatch > img { - -moz-margin-end: 5px; - position: relative; - top: 2px; - width: 16px; - height: 16px; -} - -.inlineMatch > span { - max-width: 200px; - height: 15px; -} - diff --git a/arc-firefox-theme/chrome/browser/tabview/tabview.png b/arc-firefox-theme/chrome/browser/tabview/tabview.png Binary files differdeleted file mode 100644 index 29395bd..0000000 --- a/arc-firefox-theme/chrome/browser/tabview/tabview.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/aboutCache.css b/arc-firefox-theme/chrome/global/aboutCache.css index 6a6ba09..7fb6318 100644 --- a/arc-firefox-theme/chrome/global/aboutCache.css +++ b/arc-firefox-theme/chrome/global/aboutCache.css @@ -42,6 +42,10 @@ td { width: 13%; } +#col-pinned { + width: 5em; +} + #entries > tbody > tr:nth-child(odd) { background-color: rgba(0, 0, 0, .03); } diff --git a/arc-firefox-theme/chrome/global/icons/close-XPVista7.png b/arc-firefox-theme/chrome/global/icons/close-XPVista7.png Binary files differdeleted file mode 100644 index ea6ada4..0000000 --- a/arc-firefox-theme/chrome/global/icons/close-XPVista7.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/icons/close-XPVista7@2x.png b/arc-firefox-theme/chrome/global/icons/close-XPVista7@2x.png Binary files differdeleted file mode 100644 index c25a64a..0000000 --- a/arc-firefox-theme/chrome/global/icons/close-XPVista7@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/icons/close-inverted-XPVista7.png b/arc-firefox-theme/chrome/global/icons/close-inverted-XPVista7.png Binary files differdeleted file mode 100644 index 68596a3..0000000 --- a/arc-firefox-theme/chrome/global/icons/close-inverted-XPVista7.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/icons/close-inverted-XPVista7@2x.png b/arc-firefox-theme/chrome/global/icons/close-inverted-XPVista7@2x.png Binary files differdeleted file mode 100644 index eec52e6..0000000 --- a/arc-firefox-theme/chrome/global/icons/close-inverted-XPVista7@2x.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/browser/aboutNetError_info.svg b/arc-firefox-theme/chrome/global/icons/info.svg index 2fc0607..2fc0607 100644 --- a/arc-firefox-theme/chrome/browser/aboutNetError_info.svg +++ b/arc-firefox-theme/chrome/global/icons/info.svg diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css index 575cc32..b343e18 100644 --- a/arc-firefox-theme/chrome/global/in-content/common.css +++ b/arc-firefox-theme/chrome/global/in-content/common.css @@ -37,9 +37,6 @@ --in-content-primary-button-background-active: #006b9d; --in-content-table-border-dark-color: #d1d1d1; --in-content-table-header-background: #0095dd; - --in-content-help-button-background: #ffcb00; - --in-content-help-button-background-hover: #f4c200; - --in-content-help-button-background-active: #eaba00; } html|html, @@ -209,7 +206,6 @@ html|button:disabled, xul|button[disabled="true"], xul|colorpicker[type="button"][disabled="true"], xul|menulist[disabled="true"] { - cursor: not-allowed; opacity: 0.5; } @@ -257,23 +253,26 @@ xul|button[type="menu"] > xul|*.button-box > xul|*.button-menu-dropmarker { } xul|*.help-button { - min-width: 30px; - border-radius: 2px; + min-width: 16px; + -moz-margin-end: 0; border-width: 0; - background-color: var(--in-content-help-button-background); background-image: none; box-shadow: none; - list-style-image: url("chrome://global/skin/in-content/help-glyph.svg"); + list-style-image: url("chrome://global/skin/in-content/help-glyph.svg#help"); } xul|*.help-button:not([disabled="true"]):hover { - background-color: var(--in-content-help-button-background-hover); background-image: none; + /* Override default button background */ + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/help-glyph.svg#help-hover"); } xul|*.help-button:not([disabled="true"]):hover:active { - background-color: var(--in-content-help-button-background-active); background-image: none; + /* Override default button background */ + background-color: transparent; + list-style-image: url("chrome://global/skin/in-content/help-glyph.svg#help-pressed"); } xul|*.close-icon > xul|*.button-box, @@ -285,8 +284,8 @@ xul|*.help-button > xul|*.button-box { } xul|*.help-button > xul|*.button-box > xul|*.button-icon { - width: 18px; - height: 18px; + width: 16px; + height: 16px; } xul|*.help-button > xul|*.button-box > xul|*.button-text { @@ -628,6 +627,7 @@ xul|*.radio-label-box { -moz-margin-end: 4px; /* add the 4px end-margin of other elements */ margin-bottom: 15px; padding-bottom: 15px; + -moz-box-align: baseline; } *|*.header-name { diff --git a/arc-firefox-theme/chrome/global/in-content/help-glyph.svg b/arc-firefox-theme/chrome/global/in-content/help-glyph.svg index 012bef4..5dc3af4 100644 --- a/arc-firefox-theme/chrome/global/in-content/help-glyph.svg +++ b/arc-firefox-theme/chrome/global/in-content/help-glyph.svg @@ -1,7 +1,28 @@ -<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16">
- <path fill="-moz-dialogText" d="M11.625,4.854c0,2.593-2.881,2.417-2.881,4.21v0.399H6.439V8.968c0-2.769,2.545-2.577,2.545-3.89 c0-0.576-0.416-0.912-1.121-0.912c-0.656,0-1.296,0.32-1.873,0.977L4.375,3.894C5.287,2.821,6.471,2.182,8.12,2.182 C10.457,2.182,11.625,3.43,11.625,4.854z M9.064,12.361c0,0.801-0.64,1.457-1.44,1.457c-0.801,0-1.441-0.656-1.441-1.457 c0-0.784,0.64-1.44,1.441-1.44C8.424,10.921,9.064,11.577,9.064,12.361z"/>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
+ <style>
+ use:not(:target) { display: none; }
+
+ path { fill: #999; }
+ circle { fill: none; stroke: #999; stroke-width: 2; }
+
+ #help-hover path { fill: #fff; }
+ #help-hover circle { fill: #808080; stroke: #808080; }
+
+ #help-pressed path { fill: #fff; }
+ #help-pressed circle { fill: #666; stroke: #666; }
+ </style>
+
+ <defs>
+ <g id="help-shape">
+ <circle cx="12" cy="12" r="11" />
+ <path d="M12.2,4.9c-1.6,0-2.9,0.4-3.8,0.8L9.2,8c0.6-0.4,1.5-0.6,2.2-0.6c1.1,0,1.6,0.5,1.6,1.2 c0,0.7-0.6,1.3-1.3,2.1c-1,1.1-1.4,2.1-1.3,3.2l0,0.5h3V14c0-0.9,0.3-1.7,1.2-2.5c0.9-0.9,1.9-1.9,1.9-3.4 C16.6,6.4,15.2,4.9,12.2,4.9z M12,16.1c-1.1,0-1.9,0.8-1.9,1.9c0,1.1,0.8,1.9,1.9,1.9c1.2,0,1.9-0.8,1.9-1.9 C13.9,16.9,13.1,16.1,12,16.1z"/>
+ </g>
+ </defs>
+
+ <use id="help" xlink:href="#help-shape" />
+ <use id="help-hover" xlink:href="#help-shape" />
+ <use id="help-pressed" xlink:href="#help-shape" />
</svg>
diff --git a/arc-firefox-theme/chrome/global/in-content/info-pages.css b/arc-firefox-theme/chrome/global/in-content/info-pages.css index fcecbd8..54b1be8 100644 --- a/arc-firefox-theme/chrome/global/in-content/info-pages.css +++ b/arc-firefox-theme/chrome/global/in-content/info-pages.css @@ -28,7 +28,7 @@ body { /* Typography */ .title { - background-image: url("chrome://browser/skin/aboutNetError_info.svg"); + background-image: url("chrome://global/skin/icons/info.svg"); background-position: left 0; background-repeat: no-repeat; background-size: 1.6em; diff --git a/arc-firefox-theme/chrome/global/tree/twisty-clsd-hover-rtl.png b/arc-firefox-theme/chrome/global/tree/twisty-clsd-hover-rtl.png Binary files differdeleted file mode 100644 index 1b65197..0000000 --- a/arc-firefox-theme/chrome/global/tree/twisty-clsd-hover-rtl.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/tree/twisty-clsd-hover.png b/arc-firefox-theme/chrome/global/tree/twisty-clsd-hover.png Binary files differdeleted file mode 100644 index 763c1da..0000000 --- a/arc-firefox-theme/chrome/global/tree/twisty-clsd-hover.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/tree/twisty-clsd-rtl.png b/arc-firefox-theme/chrome/global/tree/twisty-clsd-rtl.png Binary files differdeleted file mode 100644 index 02f4e32..0000000 --- a/arc-firefox-theme/chrome/global/tree/twisty-clsd-rtl.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/tree/twisty-open-hover-rtl.png b/arc-firefox-theme/chrome/global/tree/twisty-open-hover-rtl.png Binary files differdeleted file mode 100644 index a0157cc..0000000 --- a/arc-firefox-theme/chrome/global/tree/twisty-open-hover-rtl.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/tree/twisty-open-hover.png b/arc-firefox-theme/chrome/global/tree/twisty-open-hover.png Binary files differdeleted file mode 100644 index 31c9478..0000000 --- a/arc-firefox-theme/chrome/global/tree/twisty-open-hover.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/global/tree/twisty-open-rtl.png b/arc-firefox-theme/chrome/global/tree/twisty-open-rtl.png Binary files differdeleted file mode 100644 index 4e606d2..0000000 --- a/arc-firefox-theme/chrome/global/tree/twisty-open-rtl.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/about.css b/arc-firefox-theme/chrome/mozapps/extensions/about.css index 7188c11..97a65fc 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/about.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/about.css @@ -31,7 +31,7 @@ } #extensionIcon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); max-width: 64px; max-height: 64px; -moz-margin-end: 6px; diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-error.png b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-error.png Binary files differdeleted file mode 100644 index 8740e49..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-error.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-error.svg b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-error.svg new file mode 100644 index 0000000..cb883e1 --- /dev/null +++ b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-error.svg @@ -0,0 +1,6 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 18 18">
+ <path fill="#e62117" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-negative.png b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-negative.png Binary files differdeleted file mode 100644 index 2c5f628..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-negative.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-negative.svg b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-negative.svg new file mode 100644 index 0000000..733f857 --- /dev/null +++ b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-negative.svg @@ -0,0 +1,6 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 18 18">
+ <path fill="#828282" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-positive.png b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-positive.png Binary files differdeleted file mode 100644 index a186c6b..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-positive.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-positive.svg b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-positive.svg new file mode 100644 index 0000000..031190b --- /dev/null +++ b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-info-positive.svg @@ -0,0 +1,6 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 18 18">
+ <path fill="#62c44e" d="M18,4.796c0,0.31-0.109,0.573-0.325,0.79l-8.408,8.406l-1.579,1.58c-0.217,0.217-0.48,0.325-0.789,0.325c-0.31,0-0.573-0.108-0.79-0.325l-1.579-1.58L0.325,9.79C0.108,9.573,0,9.31,0,9s0.108-0.573,0.325-0.79l1.58-1.579c0.216-0.217,0.479-0.325,0.789-0.325s0.573,0.108,0.79,0.325l3.414,3.426l7.617-7.63c0.217-0.216,0.48-0.325,0.79-0.325c0.309,0,0.572,0.109,0.789,0.325l1.58,1.58C17.891,4.224,18,4.487,18,4.796z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-warning.png b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-warning.png Binary files differdeleted file mode 100644 index 75ea826..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-warning.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/alerticon-warning.svg b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-warning.svg new file mode 100644 index 0000000..2b40322 --- /dev/null +++ b/arc-firefox-theme/chrome/mozapps/extensions/alerticon-warning.svg @@ -0,0 +1,6 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 18 18">
+ <path fill="#f0cd2f" d="M10.124,1.324l7.705,14.127c0.234,0.421,0.228,0.843-0.019,1.264c-0.114,0.193-0.271,0.347-0.467,0.461c-0.198,0.114-0.41,0.171-0.638,0.171H1.294c-0.228,0-0.44-0.057-0.636-0.171c-0.198-0.114-0.353-0.268-0.467-0.461c-0.247-0.421-0.254-0.843-0.02-1.264L7.876,1.324C7.99,1.117,8.147,0.953,8.348,0.833C8.548,0.712,8.766,0.652,9,0.652c0.234,0,0.451,0.06,0.652,0.181C9.853,0.953,10.009,1.117,10.124,1.324z M10.264,10.695l0.181-4.605c0-0.08-0.034-0.143-0.1-0.191c-0.087-0.073-0.168-0.11-0.241-0.11H7.896c-0.073,0-0.154,0.037-0.241,0.11c-0.067,0.048-0.1,0.118-0.1,0.211l0.17,4.586c0,0.067,0.034,0.122,0.1,0.165c0.067,0.044,0.147,0.065,0.241,0.065h1.856c0.094,0,0.172-0.021,0.236-0.065C10.222,10.818,10.258,10.762,10.264,10.695z M10.284,14.448v-1.907c0-0.094-0.031-0.172-0.095-0.236c-0.064-0.064-0.139-0.095-0.225-0.095H8.036c-0.087,0-0.162,0.031-0.225,0.095c-0.064,0.064-0.095,0.142-0.095,0.236v1.907c0,0.094,0.031,0.173,0.095,0.236c0.064,0.064,0.138,0.095,0.225,0.095h1.927c0.086,0,0.162-0.031,0.225-0.095C10.252,14.621,10.284,14.542,10.284,14.448z"/>
+</svg>
diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.png b/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.png Binary files differdeleted file mode 100644 index 2ae95a5..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.svg b/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.svg new file mode 100644 index 0000000..28c2f7b --- /dev/null +++ b/arc-firefox-theme/chrome/mozapps/extensions/category-extensions.svg @@ -0,0 +1,12 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 64 64"> + <defs> + <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%"> + <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/> + <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/> + </linearGradient> + </defs> + <path fill="url('#gradient-linear-puzzle-piece')" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/> +</svg> diff --git a/arc-firefox-theme/chrome/mozapps/extensions/category-searchengines.png b/arc-firefox-theme/chrome/mozapps/extensions/category-searchengines.png Binary files differdeleted file mode 100644 index b893cb4..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/category-searchengines.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/eula.css b/arc-firefox-theme/chrome/mozapps/extensions/eula.css index 5fb2c52..1011153 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/eula.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/eula.css @@ -3,7 +3,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); max-width: 48px; max-height: 48px; -moz-margin-end: 6px; diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensionGeneric.png b/arc-firefox-theme/chrome/mozapps/extensions/extensionGeneric.png Binary files differdeleted file mode 100644 index 2ae95a5..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/extensionGeneric.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensionGeneric.svg b/arc-firefox-theme/chrome/mozapps/extensions/extensionGeneric.svg new file mode 100644 index 0000000..28c2f7b --- /dev/null +++ b/arc-firefox-theme/chrome/mozapps/extensions/extensionGeneric.svg @@ -0,0 +1,12 @@ +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this + - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> +<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 64 64"> + <defs> + <linearGradient id="gradient-linear-puzzle-piece" x1="0%" y1="0%" x2="0%" y2="100%"> + <stop offset="0%" stop-color="#66cc52" stop-opacity="1"/> + <stop offset="100%" stop-color="#60bf4c" stop-opacity="1"/> + </linearGradient> + </defs> + <path fill="url('#gradient-linear-puzzle-piece')" d="M42,62c2.2,0,4-1.8,4-4l0-14.2c0,0,0.4-3.7,2.8-3.7c2.4,0,2.2,3.9,6.7,3.9c2.3,0,6.2-1.2,6.2-8.2 c0-7-3.9-7.9-6.2-7.9c-4.5,0-4.3,3.7-6.7,3.7c-2.4,0-2.8-3.8-2.8-3.8V22c0-2.2-1.8-4-4-4H31.5c0,0-3.4-0.6-3.4-3 c0-2.4,3.8-2.6,3.8-7.1c0-2.3-1.3-5.9-8.3-5.9s-8,3.6-8,5.9c0,4.5,3.4,4.7,3.4,7.1c0,2.4-3.4,3-3.4,3H6c-2.2,0-4,1.8-4,4l0,7.8 c0,0-0.4,6,4.4,6c3.1,0,3.2-4.1,7.3-4.1c2,0,4,1.9,4,6c0,4.2-2,6.3-4,6.3c-4,0-4.2-4.1-7.3-4.1c-4.8,0-4.4,5.8-4.4,5.8L2,58 c0,2.2,1.8,4,4,4H19c0,0,6.3,0.4,6.3-4.4c0-3.1-4-3.6-4-7.7c0-2,2.2-4.5,6.4-4.5c4.2,0,6.6,2.5,6.6,4.5c0,4-3.9,4.6-3.9,7.7 c0,4.9,6.3,4.4,6.3,4.4H42z"/> +</svg> diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css index ed8efcf..a8a29b3 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css @@ -28,14 +28,12 @@ .global-warning { -moz-box-align: center; padding: 0 8px; - color: #916D15; + color: #c8a91e; font-weight: bold; } #addons-page[warning] .global-warning-container { - background-color: rgba(255, 255, 0, 0.1); - background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"); - background-repeat: repeat-x; + background-image: linear-gradient(transparent, rgba(255, 255, 0, 0.1)); } #detail-view .global-warning { @@ -73,9 +71,27 @@ .pending-icon, .info-icon { width: 16px; + height: 16px; margin: 3px 0; } +.warning-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); +} + +.error-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.svg"); +} + +.pending-icon, +.info-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.svg"); +} + +.addon-view[pending="disable"] .pending-icon, +.addon-view[pending="uninstall"] .pending-icon { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.svg"); +} /*** view alert boxes ***/ @@ -174,11 +190,8 @@ #category-locale > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png"); } -#category-searchengine > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png"); -} #category-extension > .category-icon { - list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png"); + list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.svg"); } #category-service > .category-icon { list-style-image: url("chrome://mozapps/skin/extensions/category-service.png"); @@ -389,9 +402,9 @@ } .icon { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); - max-width: 48px; - max-height: 48px; + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); + max-width: 32px; + max-height: 32px; } .content-inner-container { @@ -487,20 +500,20 @@ } .addon-view .warning { - color: #916d15; + color: #d8b826; } .addon-view .error { - color: #d74345; + color: #e62117; } .addon-view .pending { - color: #1b7123; + color: #62c44e; } .addon-view[pending="disable"] .pending, .addon-view[pending="uninstall"] .pending { - color: #62666e; + color: #898989; } .addon .relnotes-container { @@ -536,35 +549,30 @@ -moz-padding-start: 4px; } +.addon-view[notification], +.addon-view[pending] { + --view-highlight-color: transparent; + background-image: radial-gradient(at 50% 0%, + var(--view-highlight-color) 0%, + transparent 75%); +} .addon-view[notification="warning"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"), - linear-gradient(rgba(255, 255, 0, 0.04), - rgba(255, 255, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: #F9F5E5; } .addon-view[notification="error"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"), - linear-gradient(rgba(255, 0, 0, 0.04), - rgba(255, 0, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: #FFE8E9; } .addon-view[pending="enable"], .addon-view[pending="upgrade"], .addon-view[pending="install"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"), - linear-gradient(rgba(0, 255, 0, 0.04), - rgba(0, 255, 0, 0)); - background-repeat: repeat-x; + --view-highlight-color: #EFFAF2; } .addon-view[pending="disable"], .addon-view[pending="uninstall"] { - background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"), - linear-gradient(rgba(128, 128, 128, 0.04), - rgba(128, 128, 128, 0)); - background-repeat: repeat-x; + --view-highlight-color: #F2F2F2; } .addon[selected] { @@ -1053,22 +1061,6 @@ button.button-link:not([disabled="true"]):active:hover { list-style-image: url("chrome://mozapps/skin/extensions/utilities.svg#utilities-native"); } -.warning-icon { - list-style-image: url("moz-icon://stock/gtk-dialog-warning?size=menu"); - height: 16px; -} - -.error-icon { - list-style-image: url("moz-icon://stock/gtk-dialog-error?size=menu"); - height: 16px; -} - -.pending-icon, -.info-icon { - list-style-image: url("moz-icon://stock/gtk-dialog-info?size=menu"); - height: 16px; -} - .sorter[checkState="1"] .button-icon { display: -moz-box; list-style-image: url("moz-icon://stock/gtk-sort-descending?size=16"); diff --git a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css index 5801a24..7d6c056 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css @@ -39,7 +39,7 @@ -moz-margin-end: 10px; max-width: 64px; max-height: 64px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); } .addon-info[type="theme"] #icon { @@ -76,9 +76,9 @@ } #warning-icon { - list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png"); + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); width: 16px; - height: 15px; + height: 16px; margin-top: 5px; -moz-margin-end: 5px; } diff --git a/arc-firefox-theme/chrome/mozapps/extensions/stripes-error.png b/arc-firefox-theme/chrome/mozapps/extensions/stripes-error.png Binary files differdeleted file mode 100644 index 1dc2d85..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/stripes-error.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/stripes-info-negative.png b/arc-firefox-theme/chrome/mozapps/extensions/stripes-info-negative.png Binary files differdeleted file mode 100644 index 901ab1e..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/stripes-info-negative.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/stripes-info-positive.png b/arc-firefox-theme/chrome/mozapps/extensions/stripes-info-positive.png Binary files differdeleted file mode 100644 index 370ceec..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/stripes-info-positive.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/extensions/stripes-warning.png b/arc-firefox-theme/chrome/mozapps/extensions/stripes-warning.png Binary files differdeleted file mode 100644 index 69463fb..0000000 --- a/arc-firefox-theme/chrome/mozapps/extensions/stripes-warning.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png Binary files differindex 28ed179..ee65b2d 100644 --- a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png +++ b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon.png diff --git a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png Binary files differindex 6674927..51fc152 100644 --- a/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png +++ b/arc-firefox-theme/chrome/mozapps/places/defaultFavicon@2x.png diff --git a/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css b/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css index da6bae2..3eabe3d 100644 --- a/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css +++ b/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallConfirm.css @@ -76,7 +76,7 @@ installitem { .xpinstallItemIcon { max-width: 32px; max-height: 32px; - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png"); + list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.svg"); } installitem[type="theme"] .xpinstallItemIcon { diff --git a/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallItemGeneric.png b/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallItemGeneric.png Binary files differdeleted file mode 100644 index 2ae95a5..0000000 --- a/arc-firefox-theme/chrome/mozapps/xpinstall/xpinstallItemGeneric.png +++ /dev/null diff --git a/arc-firefox-theme/chrome/overrides.sh b/arc-firefox-theme/chrome/overrides.sh index 5bb4160..0b1f806 100755 --- a/arc-firefox-theme/chrome/overrides.sh +++ b/arc-firefox-theme/chrome/overrides.sh @@ -10,10 +10,9 @@ cp global/arrow/arrow-rit.gif global/arrow/arrow-rit-hov.gif cp mozapps/extensions/dictionaryGeneric.png mozapps/extensions/category-dictionaries.png cp mozapps/extensions/experimentGeneric.png mozapps/extensions/category-experiments.png -cp mozapps/extensions/extensionGeneric.png mozapps/extensions/category-extensions.png +cp mozapps/extensions/extensionGeneric.svg mozapps/extensions/category-extensions.svg cp mozapps/extensions/localeGeneric.png mozapps/extensions/category-languages.png cp mozapps/extensions/themeGeneric.png mozapps/extensions/category-themes.png -cp mozapps/extensions/extensionGeneric.png mozapps/xpinstall/xpinstallItemGeneric.png cp mozapps/passwordmgr/key-16.png mozapps/passwordmgr/key.png diff --git a/arc-firefox-theme/install.rdf b/arc-firefox-theme/install.rdf index fa41cc5..33b8c90 100644 --- a/arc-firefox-theme/install.rdf +++ b/arc-firefox-theme/install.rdf @@ -5,7 +5,7 @@ <Description about="urn:mozilla:install-manifest"> <em:id>{52c2877e-44e1-11e5-8874-a62d1d5d46B0}</em:id> - <em:version>44.20160126</em:version> + <em:version>45.20160126</em:version> <em:type>4</em:type> <em:name>Arc Theme</em:name> <em:description>Arc Theme for Firefox</em:description> @@ -20,8 +20,8 @@ <em:targetApplication> <Description> <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id> - <em:minVersion>44.0</em:minVersion> - <em:maxVersion>46.0</em:maxVersion> + <em:minVersion>45.0</em:minVersion> + <em:maxVersion>47.0</em:maxVersion> </Description> </em:targetApplication> diff --git a/configure.ac b/configure.ac index 44c7e17..1b09b02 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([arc-firefox-theme], [44.20160126], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme]) +AC_INIT([arc-firefox-theme], [45.20160126], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme]) AM_INIT_AUTOMAKE([-Wno-portability no-dist-gzip dist-xz foreign subdir-objects tar-ustar]) AC_PREFIX_DEFAULT(/usr/local) AM_SILENT_RULES([yes]) |
