diff options
Diffstat (limited to 'arc-firefox-theme')
42 files changed, 1036 insertions, 453 deletions
diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css index 9f13d76..8c4a34f 100644 --- a/arc-firefox-theme/chrome/browser/aboutNetError.css +++ b/arc-firefox-theme/chrome/browser/aboutNetError.css @@ -33,6 +33,12 @@ ul { max-width: 512px; } +#advancedPanelContainer { + position: absolute; + padding-bottom: 24px; + width: 100%; +} + #errorTitle { background: url("chrome://global/skin/icons/info.svg") left 0 no-repeat; background-size: 3em; diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css index c874a40..3ef2f72 100644 --- a/arc-firefox-theme/chrome/browser/browser.css +++ b/arc-firefox-theme/chrome/browser/browser.css @@ -5,6 +5,7 @@ /* 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/. */ +/* navbarInsetHighlight is tightly coupled to the toolbarHighlight constant. */ :root { --toolbarbutton-hover-background: #fbfbfc; --toolbarbutton-hover-boxshadow: none; @@ -427,9 +428,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0px 48px 16px 32px); } #subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup, -#BMB_subscribeToPageMenuitem:not([disabled]), -#BMB_subscribeToPageMenupopup { +#subscribeToPageMenupopup { list-style-image: url("chrome://browser/skin/page-livemarks.png"); } #bookmarksToolbarFolderMenu, @@ -640,7 +639,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #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 #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 #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) { 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, @@ -817,6 +816,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 1024px, 32px, 992px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 1024px, 64px, 992px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } @@ -974,6 +976,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 2048px, 64px, 1984px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(64px, 2048px, 128px, 1984px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 832px, 64px, 768px); } @@ -1166,7 +1171,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-appearance: toolbarbutton-dropdown; transition: opacity 0.15s ease; } -#navigator-toolbox:not(:hover) .urlbar-history-dropmarker { +#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker { + transition: none; } + +#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker { opacity: 0; } #urlbar-container { @@ -1383,6 +1391,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } + .popup-notification-icon { width: 64px; height: 64px; @@ -1474,11 +1486,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box height: 16px; margin: 0 2px; } -.identity-notification-icon, -#identity-notification-icon { - list-style-image: url(chrome://mozapps/skin/profile/profileicon.png); - /* XXX: need HiDPI version */ } - .geo-notification-icon, #geo-notification-icon { list-style-image: url(chrome://browser/skin/Geolocation-16.png); } @@ -2800,6 +2807,20 @@ html|*#fullscreen-exit-button { box-shadow: none; border-bottom-width: 0; } +.devtools-responsiveui-textinput { + -moz-appearance: none; + background: #333; + color: #fff; + border: 1px solid #111; + border-radius: 2px; + padding: 5px; + width: 200px; + margin: 0; } + +.devtools-responsiveui-textinput[attention] { + border-color: #38ace6; + background: rgba(56, 172, 230, 0.4); } + .devtools-responsiveui-menulist, .devtools-responsiveui-toolbarbutton { -moz-appearance: none; @@ -3047,15 +3068,15 @@ html|*#fullscreen-exit-button { We are copy/pasting variables from light-theme and dark-theme, since they aren't loaded in this context (within browser.css). */ :root[devtoolstheme="light"] #developer-toolbar { - --gcli-background-color: #ebeced; + --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ - --gcli-input-background: #f0f1f2; + --gcli-input-background: #fcfcfc; /* --theme-toolbar-background */ - --gcli-input-focused-background: #f7f7f7; + --gcli-input-focused-background: #ffffff; /* --theme-sidebar-background */ - --gcli-input-color: #18191a; + --gcli-input-color: #393f4c; /* --theme-body-color */ - --gcli-border-color: #aaaaaa; + --gcli-border-color: #dde1e4; /* --theme-splitter-color */ --selection-background: #4c9ed9; /* --theme-selection-background */ @@ -3088,7 +3109,7 @@ html|*#fullscreen-exit-button { #developer-toolbar > toolbarbutton { -moz-appearance: none; border: none; - background: transparent; + background-color: transparent; margin: 0; padding: 0 10px; width: 32px; } @@ -3096,15 +3117,18 @@ html|*#fullscreen-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, +:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } -.developer-toolbar-button > .toolbarbutton-icon, -#developer-toolbar-closebutton > .toolbarbutton-icon { +.developer-toolbar-button > .toolbarbutton-icon { width: 16px; height: 16px; } +/* The toolkit close button is low contrast in the dark theme so invert it. */ +:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { + filter: invert(1); } + #developer-toolbar-toolbox-button { list-style-image: url("chrome://devtools/skin/images/toggle-tools.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); } @@ -3134,32 +3158,6 @@ html|*#fullscreen-exit-button { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 128px, 32px, 96px); } } -#developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close.png"); - -moz-appearance: none; - border: none; - margin: 0 4px; - min-width: 16px; - width: 16px; - opacity: 0.6; } - -@media (min-resolution: 1.1dppx) { - #developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } } -#developer-toolbar-closebutton > .toolbarbutton-icon { - /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must - use evil CSS to give the impression of smaller content */ - margin: -4px; } - -#developer-toolbar-closebutton > .toolbarbutton-text { - display: none; } - -#developer-toolbar-closebutton:hover { - opacity: 0.8; } - -#developer-toolbar-closebutton:hover:active { - opacity: 1; } - /* GCLI */ html|*#gcli-tooltip-frame, html|*#gcli-output-frame { @@ -3308,6 +3306,9 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } +notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); } + #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css index 824c652..499da56 100644 --- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css +++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css @@ -10,6 +10,7 @@ /* Show the right elements for the right connection states. */ #identity-popup[connection=not-secure] [when-connection~=not-secure], +#identity-popup[connection=secure-cert-user-overridden] [when-connection~=secure-cert-user-overridden], #identity-popup[connection=secure-ev] [when-connection~=secure-ev], #identity-popup[connection=secure] [when-connection~=secure], #identity-popup[connection=chrome] [when-connection~=chrome], @@ -81,15 +82,9 @@ #identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews { background: var(--panel-arrowcontent-background); - border-bottom-right-radius: 3.5px; padding: 0; } -#identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews:-moz-locale-dir(rtl) { - border-bottom-right-radius: 0; - border-bottom-left-radius: 3.5px; -} - .identity-popup-section:not(:first-child) { border-top: 1px solid var(--panel-separator-color); } @@ -98,14 +93,19 @@ #identity-popup-security-content, #identity-popup-permissions-content, #tracking-protection-content { - padding: 0.5em 0 1em; - -moz-padding-start: calc(2em + 24px); - -moz-padding-end: 1em; background-repeat: no-repeat; background-position: 1em 1em; background-size: 24px auto; } +#identity-popup-security-content, +#identity-popup-permissions-content, +#tracking-protection-content { + padding: 0.5em 0 1em; + -moz-padding-start: calc(2em + 24px); + -moz-padding-end: 1em; +} + #identity-popup-securityView:-moz-locale-dir(rtl), #identity-popup-security-content:-moz-locale-dir(rtl), #identity-popup-permissions-content:-moz-locale-dir(rtl), @@ -206,7 +206,6 @@ } #identity-popup-securityView { - padding-bottom: 2em; overflow: hidden; } @@ -233,6 +232,11 @@ background-image: url(chrome://browser/skin/controlcenter/conn-degraded.svg); } +#identity-popup[connection=secure-cert-user-overridden] #identity-popup-securityView, +#identity-popup[connection=secure-cert-user-overridden] #identity-popup-security-content { + background-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); +} + #identity-popup[loginforms=insecure] #identity-popup-securityView, #identity-popup[loginforms=insecure] #identity-popup-security-content, #identity-popup[mixedcontent~=active-loaded][isbroken] #identity-popup-securityView, @@ -245,7 +249,14 @@ color: Graytext; } +#identity-popup-securityView-header, +#identity-popup-securityView-body { + -moz-margin-start: calc(2em + 24px); + -moz-margin-end: 1em; +} + #identity-popup-securityView-header { + margin-top: 0.5em; border-bottom: 1px solid var(--panel-separator-color); padding-bottom: 1em; } @@ -254,6 +265,30 @@ -moz-padding-end: 1em; } +#identity-popup-securityView-footer { + margin-top: 1em; + background-color: hsla(210,4%,10%,.07); +} + +#identity-popup-securityView-footer > button { + -moz-appearance: none; + margin: 0; + border: none; + border-top: 1px solid #ccc; + padding: 8px 20px; + color: ButtonText; + background-color: transparent; +} + +#identity-popup-securityView-footer > button:hover, +#identity-popup-securityView-footer > button:focus { + background-color: hsla(210,4%,10%,.07); +} + +#identity-popup-securityView-footer > button:hover:active { + background-color: hsla(210,4%,10%,.12); +} + #identity-popup-content-verifier ~ description { margin-top: 1em; color: Graytext; diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css index 6104135..eb91c9b 100644 --- a/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css +++ b/arc-firefox-theme/chrome/browser/customizableui/panelUIOverlay.css @@ -201,8 +201,8 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan .panelUI-grid .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, .panelUI-grid .toolbarbutton-1 > .toolbarbutton-multiline-text { - line-height: 1.1; - max-height: 2.2em; + line-height: 1.2; + max-height: 2.4em; } .panelUI-grid .toolbarbutton-1:not([auto-hyphens="off"]) > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, @@ -213,7 +213,7 @@ panelmultiview[nosubviews=true] > .panel-viewcontainer > .panel-viewstack > .pan .panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-menubutton-button > .toolbarbutton-multiline-text, .panelUI-grid:not([customize-transitioning]) .toolbarbutton-1 > .toolbarbutton-multiline-text { position: absolute; - clip: rect(auto, auto, 2.3em, auto); + clip: rect(-0.1em, auto, 2.6em, auto); } .panelUI-grid .toolbarbutton-1 > .toolbarbutton-text, @@ -678,7 +678,9 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { .PanelUI-remotetabs-prefs-button { -moz-appearance: none; background-color: #0096dd; - color: white; + /* !important for the color as an OSX specific rule when a lightweight theme + is used for buttons in the toolbox overrides. See bug 1238531 for details */ + color: white !important; border-radius: 2px; margin-top: 10px; margin-bottom: 10px; diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css index d1ad023..6596a11 100644 --- a/arc-firefox-theme/chrome/browser/devedition.css +++ b/arc-firefox-theme/chrome/browser/devedition.css @@ -73,7 +73,7 @@ --chrome-secondary-background-color: #f5f6f7; --chrome-navigator-toolbox-separator-color: #cccccc; --chrome-nav-bar-separator-color: #B6B6B8; - --chrome-nav-buttons-background: #fcfcfc; + --chrome-nav-buttons-background: #ffffff; /* --theme-body-background */ --chrome-nav-buttons-hover-background: #DADBDB; --chrome-nav-bar-controls-border-color: #ccc; --chrome-selection-color: #f5f7fa; @@ -83,9 +83,7 @@ --tab-hover-background-color: #D7D8DA; --tab-selection-color: #f5f7fa; --tab-selection-background-color: #4c9ed9; - --tab-selection-box-shadow: 0 2px 0 #9FDFFF inset, - 0 -2px 0 rgba(0,0,0,.05) inset, - 0 -1px 0 rgba(0,0,0,.2) inset; + --tab-selection-box-shadow: none; --pinned-tab-glow: radial-gradient(22px at center calc(100% - 2px), rgba(76,158,217,0.9) 13%, transparent 16%); diff --git a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css index 473e401..9935e0f 100644 --- a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css +++ b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css @@ -1,6 +1,14 @@ /* 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/. */ + * 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/. */ + +/* 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/. */ + + + +/*** View and outer controls ***/ #downloadsRichListBox { /** The default listbox appearance comes with an unwanted margin. **/ @@ -8,20 +16,25 @@ margin: 0; } +/*** List items ***/ + +#downloadsRichListBox > richlistitem.download { + height: var(--downloads-item-height); +} + #downloadsRichListBox > richlistitem.download { - height: 5em; padding: 5px 8px; } .downloadTypeIcon { -moz-margin-end: 8px; - /* Prevent flickering when changing states. */ - min-height: 32px; - min-width: 32px; + width: 32px; + height: 32px; } + .blockedIcon { - list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog"); + list-style-image: url("chrome://global/skin/icons/Error.png"); } .downloadTarget { @@ -46,88 +59,97 @@ list-style-image: url("chrome://browser/skin/downloads/buttons.png"); } +/*** List items ***/ + +:root { + --downloads-item-height: 5em; +} + +.blockedIcon { + list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog"); +} + /*** Button icons ***/ .downloadButton.downloadConfirmBlock, .downloadButton.downloadCancel { -moz-image-region: rect(0px, 16px, 16px, 0px); } -richlistitem.download:hover > .downloadButton.downloadConfirmBlock, -richlistitem.download:hover > .downloadButton.downloadCancel { +richlistitem.download:hover .downloadButton.downloadConfirmBlock, +richlistitem.download:hover .downloadButton.downloadCancel { -moz-image-region: rect(0px, 32px, 16px, 16px); } -richlistitem.download:hover > .downloadButton.downloadConfirmBlock:hover, -richlistitem.download:hover > .downloadButton.downloadCancel:hover { +richlistitem.download:hover .downloadButton.downloadConfirmBlock:hover, +richlistitem.download:hover .downloadButton.downloadCancel:hover { -moz-image-region: rect(0px, 48px, 16px, 32px); } -richlistitem.download:hover > .downloadButton.downloadConfirmBlock:active, -richlistitem.download:hover > .downloadButton.downloadCancel:active { +richlistitem.download:hover .downloadButton.downloadConfirmBlock:active, +richlistitem.download:hover .downloadButton.downloadCancel:active { -moz-image-region: rect(0px, 64px, 16px, 48px); } -richlistitem.download[selected] > .downloadButton.downloadConfirmBlock, -richlistitem.download[selected] > .downloadButton.downloadCancel { +richlistitem.download[selected] .downloadButton.downloadConfirmBlock, +richlistitem.download[selected] .downloadButton.downloadCancel { -moz-image-region: rect(0px, 80px, 16px, 64px); } -richlistitem.download:hover[selected] > .downloadButton.downloadConfirmBlock, -richlistitem.download:hover[selected] > .downloadButton.downloadCancel { +richlistitem.download[selected]:hover .downloadButton.downloadConfirmBlock, +richlistitem.download[selected]:hover .downloadButton.downloadCancel { -moz-image-region: rect(0px, 96px, 16px, 80px); } -richlistitem.download:hover[selected] > .downloadButton.downloadConfirmBlock:hover, -richlistitem.download:hover[selected] > .downloadButton.downloadCancel:hover { +richlistitem.download[selected]:hover .downloadButton.downloadConfirmBlock:hover, +richlistitem.download[selected]:hover .downloadButton.downloadCancel:hover { -moz-image-region: rect(0px, 112px, 16px, 96px); } -richlistitem.download:hover[selected] > .downloadButton.downloadConfirmBlock:active, -richlistitem.download:hover[selected] > .downloadButton.downloadCancel:active { +richlistitem.download[selected]:hover .downloadButton.downloadConfirmBlock:active, +richlistitem.download[selected]:hover .downloadButton.downloadCancel:active { -moz-image-region: rect(0px, 128px, 16px, 112px); } .downloadButton.downloadShow { -moz-image-region: rect(16px, 16px, 32px, 0px); } -richlistitem.download:hover > .downloadButton.downloadShow { +richlistitem.download:hover .downloadButton.downloadShow { -moz-image-region: rect(16px, 32px, 32px, 16px); } -richlistitem.download:hover > .downloadButton.downloadShow:hover { +richlistitem.download:hover .downloadButton.downloadShow:hover { -moz-image-region: rect(16px, 48px, 32px, 32px); } -richlistitem.download:hover > .downloadButton.downloadShow:active { +richlistitem.download:hover .downloadButton.downloadShow:active { -moz-image-region: rect(16px, 64px, 32px, 48px); } -richlistitem.download[selected] > .downloadButton.downloadShow { +richlistitem.download[selected] .downloadButton.downloadShow { -moz-image-region: rect(16px, 80px, 32px, 64px); } -richlistitem.download:hover[selected] > .downloadButton.downloadShow { +richlistitem.download[selected]:hover .downloadButton.downloadShow { -moz-image-region: rect(16px, 96px, 32px, 80px); } -richlistitem.download:hover[selected] > .downloadButton.downloadShow:hover { +richlistitem.download[selected]:hover .downloadButton.downloadShow:hover { -moz-image-region: rect(16px, 112px, 32px, 96px); } -richlistitem.download:hover[selected] > .downloadButton.downloadShow:active { +richlistitem.download[selected]:hover .downloadButton.downloadShow:active { -moz-image-region: rect(16px, 128px, 32px, 112px); } .downloadButton.downloadRetry { -moz-image-region: rect(32px, 16px, 48px, 0px); } -richlistitem.download:hover > .downloadButton.downloadRetry { +richlistitem.download:hover .downloadButton.downloadRetry { -moz-image-region: rect(32px, 32px, 48px, 16px); } -richlistitem.download:hover > .downloadButton.downloadRetry:hover { +richlistitem.download:hover .downloadButton.downloadRetry:hover { -moz-image-region: rect(32px, 48px, 48px, 32px); } -richlistitem.download:hover > .downloadButton.downloadRetry:active { +richlistitem.download:hover .downloadButton.downloadRetry:active { -moz-image-region: rect(32px, 64px, 48px, 48px); } -richlistitem.download[selected] > .downloadButton.downloadRetry { +richlistitem.download[selected] .downloadButton.downloadRetry { -moz-image-region: rect(32px, 80px, 48px, 64px); } -richlistitem.download:hover[selected] > .downloadButton.downloadRetry { +richlistitem.download[selected]:hover .downloadButton.downloadRetry { -moz-image-region: rect(32px, 96px, 48px, 80px); } -richlistitem.download:hover[selected] > .downloadButton.downloadRetry:hover { +richlistitem.download[selected]:hover .downloadButton.downloadRetry:hover { -moz-image-region: rect(32px, 112px, 48px, 96px); } -richlistitem.download:hover[selected] > .downloadButton.downloadRetry:active { +richlistitem.download[selected]:hover .downloadButton.downloadRetry:active { -moz-image-region: rect(32px, 128px, 48px, 112px); } - diff --git a/arc-firefox-theme/chrome/browser/downloads/downloads.css b/arc-firefox-theme/chrome/browser/downloads/downloads.css index 78c2f42..487d8f4 100644 --- a/arc-firefox-theme/chrome/browser/downloads/downloads.css +++ b/arc-firefox-theme/chrome/browser/downloads/downloads.css @@ -1,6 +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/. */ + * 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/. */ + +/* 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/. */ + + /*** Panel and outer controls ***/ @@ -27,57 +33,43 @@ max-width: 40ch; } -#downloadsHistory { - background: transparent; - color: -moz-nativehyperlinktext; +#downloadsSummary { + padding: 8px 38px 8px 12px; cursor: pointer; + -moz-user-focus: normal; } -#downloadsFooter { - border-top: 1px solid ThreeDShadow; - background-image: linear-gradient(hsla(0,0%,0%,.15), hsla(0,0%,0%,.08) 6px); -} - -#downloadsHistory > .button-box { - margin: 1em; -} - -#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsHistory:focus > .button-box { - outline: 1px -moz-dialogtext dotted; +#downloadsSummary > .downloadTypeIcon { + list-style-image: url("chrome://browser/skin/downloads/download-summary.png"); } -/*** Downloads Summary and List items ***/ -#downloadsSummary, -richlistitem[type="download"] { - height: 6em; - -moz-padding-end: 0; - color: inherit; +#downloadsSummaryDescription { + color: -moz-nativehyperlinktext; } -#downloadsSummary { - padding: 8px 38px 8px 12px; +#downloadsHistory { + background: transparent; cursor: pointer; - -moz-user-focus: normal; } -#downloadsPanel[keyfocus] > #downloadsFooter > #downloadsSummary:focus { - outline: 1px -moz-dialogtext dotted; - outline-offset: -5px; +#downloadsHistory > .button-box { + margin: 1em; } -#downloadsSummary > .downloadTypeIcon { - list-style-image: url("chrome://browser/skin/downloads/download-summary.png"); -} +/*** List items and similar elements in the summary ***/ -#downloadsSummaryDescription { - color: -moz-nativehyperlinktext; +#downloadsSummary, +richlistitem[type="download"] { + height: var(--downloads-item-height); + -moz-padding-end: 0; + color: inherit; } richlistitem[type="download"] { margin: 0; - border-top: 1px solid hsla(0,0%,100%,.2); - border-bottom: 1px solid hsla(0,0%,0%,.15); + border-top: 1px solid var(--downloads-item-border-top-color); + border-bottom: 1px solid var(--downloads-item-border-bottom-color); background: transparent; padding: 8px; } @@ -90,25 +82,20 @@ richlistitem[type="download"]:last-child { border-bottom: 1px solid transparent; } -#downloadsPanel[keyfocus] > #downloadsListBox:focus > richlistitem[type="download"][selected] { - outline: 1px -moz-dialogtext dotted; - outline-offset: -1px; -} - .downloadTypeIcon { -moz-margin-end: 8px; /* Prevent flickering when changing states. */ - min-height: 32px; - min-width: 32px; + height: 32px; + width: 32px; } .blockedIcon { - list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog"); + list-style-image: url("chrome://global/skin/icons/Error.png"); } /* We hold .downloadTarget, .downloadProgress and .downloadDetails inside of a vbox with class .downloadContainer. We set the font-size of the entire - container to 90% because: + container to --downloads-item-font-size-factor because: 1) This is the size that we want .downloadDetails to be 2) The container's width is set by localizers by &downloadDetails.width;, @@ -120,26 +107,25 @@ richlistitem[type="download"]:last-child { font-size of .downloadContainer's parent, we use calc to go from the smaller font-size back to the original font-size. */ - #downloadsSummaryDetails, .downloadContainer { - font-size: 90%; + font-size: calc(100% * var(--downloads-item-font-size-factor)); } #downloadsSummaryDescription, .downloadTarget { - margin-bottom: 7px; + margin-bottom: var(--downloads-item-target-margin-bottom); cursor: inherit; } .downloadTarget { - font-size: calc(100%/0.9); + font-size: calc(100% / var(--downloads-item-font-size-factor)); } #downloadsSummaryDetails, .downloadDetails { - margin-top: 1px; - opacity: 0.6; + margin-top: var(--downloads-item-details-margin-top); + opacity: var(--downloads-item-details-opacity); cursor: inherit; } @@ -158,13 +144,54 @@ richlistitem[type="download"]:last-child { padding: 0; } +/*** Panel and outer controls ***/ + +#downloadsFooter { + border-top: 1px solid ThreeDShadow; + background-image: linear-gradient(hsla(0,0%,0%,.15), hsla(0,0%,0%,.08) 6px); +} + +#downloadsHistory { + color: -moz-nativehyperlinktext; +} + +#downloadsPanel[keyfocus] #downloadsSummary:focus, +#downloadsPanel[keyfocus] #downloadsHistory:focus > .button-box { + outline: 1px -moz-dialogtext dotted; +} + +#downloadsPanel[keyfocus] #downloadsSummary:focus { + outline-offset: -5px; +} + +/*** List items and similar elements in the summary ***/ + +:root { + --downloads-item-height: 6em; + --downloads-item-border-top-color: hsla(0,0%,100%,.2); + --downloads-item-border-bottom-color: hsla(0,0%,0%,.15); + --downloads-item-font-size-factor: 0.9; + --downloads-item-target-margin-bottom: 7px; + --downloads-item-details-margin-top: 1px; + --downloads-item-details-opacity: 0.6; +} + +.blockedIcon { + list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog"); +} + .downloadButton:focus > .button-box { outline: 1px -moz-dialogtext dotted; } /*** Highlighted list items ***/ -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"][exists]:hover { +#downloadsPanel[keyfocus] #downloadsListBox:focus > richlistitem[type="download"][selected] { + outline: 1px -moz-dialogtext dotted; + outline-offset: -1px; +} + +#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"][exists]:hover { border-radius: 3px; border-top: 1px solid hsla(0,0%,100%,.3); border-bottom: 1px solid hsla(0,0%,0%,.2); @@ -180,41 +207,41 @@ richlistitem[type="download"]:last-child { .downloadButton.downloadCancel { -moz-image-region: rect(0px, 16px, 16px, 0px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel { +richlistitem[type="download"]:hover .downloadButton.downloadConfirmBlock, +richlistitem[type="download"]:hover .downloadButton.downloadCancel { -moz-image-region: rect(0px, 32px, 16px, 16px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:hover, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:hover { +richlistitem[type="download"]:hover .downloadButton.downloadConfirmBlock:hover, +richlistitem[type="download"]:hover .downloadButton.downloadCancel:hover { -moz-image-region: rect(0px, 48px, 16px, 32px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadConfirmBlock:active, -richlistitem[type="download"]:hover > stack > .downloadButton.downloadCancel:active { +richlistitem[type="download"]:hover .downloadButton.downloadConfirmBlock:active, +richlistitem[type="download"]:hover .downloadButton.downloadCancel:active { -moz-image-region: rect(0px, 64px, 16px, 48px); } .downloadButton.downloadShow { -moz-image-region: rect(16px, 16px, 32px, 0px); } -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow { +#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"]:hover .downloadButton.downloadShow { -moz-image-region: rect(16px, 96px, 32px, 80px); } -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:hover { +#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"]:hover .downloadButton.downloadShow:hover { -moz-image-region: rect(16px, 112px, 32px, 96px); } -#downloadsPanel:not([keyfocus]) > #downloadsListBox > richlistitem[type="download"][state="1"]:hover > stack > .downloadButton.downloadShow:active { +#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"]:hover .downloadButton.downloadShow:active { -moz-image-region: rect(16px, 128px, 32px, 112px); } .downloadButton.downloadRetry { -moz-image-region: rect(32px, 16px, 48px, 0px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry { +richlistitem[type="download"]:hover .downloadButton.downloadRetry { -moz-image-region: rect(32px, 32px, 48px, 16px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:hover { +richlistitem[type="download"]:hover .downloadButton.downloadRetry:hover { -moz-image-region: rect(32px, 48px, 48px, 32px); } -richlistitem[type="download"]:hover > stack > .downloadButton.downloadRetry:active { +richlistitem[type="download"]:hover .downloadButton.downloadRetry:active { -moz-image-region: rect(32px, 64px, 48px, 48px); } diff --git a/arc-firefox-theme/chrome/browser/fxa/android.png b/arc-firefox-theme/chrome/browser/fxa/android.png Binary files differindex b014c42..e0a37a8 100644 --- a/arc-firefox-theme/chrome/browser/fxa/android.png +++ b/arc-firefox-theme/chrome/browser/fxa/android.png diff --git a/arc-firefox-theme/chrome/browser/fxa/android@2x.png b/arc-firefox-theme/chrome/browser/fxa/android@2x.png Binary files differindex bbd602f..bb6bab5 100644 --- a/arc-firefox-theme/chrome/browser/fxa/android@2x.png +++ b/arc-firefox-theme/chrome/browser/fxa/android@2x.png diff --git a/arc-firefox-theme/chrome/browser/fxa/ios.png b/arc-firefox-theme/chrome/browser/fxa/ios.png Binary files differnew file mode 100644 index 0000000..40c90b1 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/ios.png diff --git a/arc-firefox-theme/chrome/browser/fxa/ios@2x.png b/arc-firefox-theme/chrome/browser/fxa/ios@2x.png Binary files differnew file mode 100644 index 0000000..af2d5ac --- /dev/null +++ b/arc-firefox-theme/chrome/browser/fxa/ios@2x.png diff --git a/arc-firefox-theme/chrome/browser/menuPanel.png b/arc-firefox-theme/chrome/browser/menuPanel.png Binary files differindex f8c7f88..036e2a1 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 28176a1..093bfea 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/in-content/preferences.css b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css index 756fe31..dbedc83 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css @@ -562,7 +562,8 @@ description > html|a { } .fxaMobilePromo { - margin-bottom: 31px; + margin-bottom: 20px; + margin-top: 25px; } #fxaLoginRejectedWarning { @@ -575,9 +576,22 @@ description > html|a { margin-bottom: 27.5px; } +.androidLink { + background-image: url("chrome://browser/skin/fxa/android.png"); +} + +.iOSLink { + background-image: url("chrome://browser/skin/fxa/ios.png"); +} + .androidLink, .iOSLink { - margin: 0; + margin: 0 0 0 2px; + padding-left: 28px; + padding-top: 6px; + height: 28px; + background-repeat: no-repeat; + background-size: 24px 28px; } #tosPP-small { @@ -586,6 +600,12 @@ description > html|a { } @media (min-resolution: 1.1dppx) { + .androidLink { + background-image: url("chrome://browser/skin/fxa/android@2x.png"); + } + .iOSLink { + background-image: url("chrome://browser/skin/fxa/ios@2x.png"); + } .fxaSyncIllustration { list-style-image: url(chrome://browser/skin/fxa/sync-illustration@2x.png) } @@ -618,6 +638,10 @@ description > html|a { margin-top: 2px !important; } +#fxaProfileImage { + -moz-user-focus: normal; +} + menulist.actionsMenu > .menulist-dropmarker { margin-top: 11px; margin-bottom: 11px; diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss index 621d47b..8e6bd9a 100644 --- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss +++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss @@ -18,6 +18,7 @@ $darker_asset_path_2: if($darker=='true', 'dark', $asset_path); * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +/* navbarInsetHighlight is tightly coupled to the toolbarHighlight constant. */ :root { @@ -539,9 +540,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { } #subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup, -#BMB_subscribeToPageMenuitem:not([disabled]), -#BMB_subscribeToPageMenupopup { +#subscribeToPageMenupopup { list-style-image: url("chrome://browser/skin/page-livemarks.png"); } @@ -855,7 +854,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, #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 { +#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 { #nav-bar &:not([disabled=true]):-moz-any([open],[checked],:hover:active), #TabsToolbar &:not([disabled=true]):-moz-any([open],[checked],:hover:active) { @@ -1098,6 +1097,10 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active. -moz-image-region: rect(0px, 1024px, 32px, 992px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 1024px, 64px, 992px); + } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); @@ -1298,6 +1301,10 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active. -moz-image-region: rect(0px, 2048px, 64px, 1984px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(64px, 2048px, 128px, 1984px); + } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 832px, 64px, 768px); @@ -1530,7 +1537,11 @@ list-style-image: url("chrome://browser/skin/custom_images/toolbar-icons-active. transition: opacity 0.15s ease; } -#navigator-toolbox:not(:hover) .urlbar-history-dropmarker { +#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker { + transition: none; +} + +#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker { opacity: 0; } @@ -1871,6 +1882,11 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; +} + .popup-notification-icon { width: 64px; @@ -1993,12 +2009,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box margin: 0 2px; } -.identity-notification-icon, -#identity-notification-icon { - list-style-image: url(chrome://mozapps/skin/profile/profileicon.png); - /* XXX: need HiDPI version */ -} - .geo-notification-icon, #geo-notification-icon { list-style-image: url(chrome://browser/skin/Geolocation-16.png); @@ -3745,6 +3755,22 @@ html|*#fullscreen-exit-button { border-bottom-width: 0; } +.devtools-responsiveui-textinput { + -moz-appearance: none; + background: #333; + color: #fff; + border: 1px solid #111; + border-radius: 2px; + padding: 5px; + width: 200px; + margin: 0; +} + +.devtools-responsiveui-textinput[attention] { + border-color: #38ace6; + background: rgba(56,172,230,0.4); +} + .devtools-responsiveui-menulist, .devtools-responsiveui-toolbarbutton { -moz-appearance: none; @@ -4061,11 +4087,11 @@ html|*#fullscreen-exit-button { We are copy/pasting variables from light-theme and dark-theme, since they aren't loaded in this context (within browser.css). */ :root[devtoolstheme="light"] #developer-toolbar { - --gcli-background-color: #ebeced; /* --theme-tab-toolbar-background */ - --gcli-input-background: #f0f1f2; /* --theme-toolbar-background */ - --gcli-input-focused-background: #f7f7f7; /* --theme-sidebar-background */ - --gcli-input-color: #18191a; /* --theme-body-color */ - --gcli-border-color: #aaaaaa; /* --theme-splitter-color */ + --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ + --gcli-input-background: #fcfcfc; /* --theme-toolbar-background */ + --gcli-input-focused-background: #ffffff; /* --theme-sidebar-background */ + --gcli-input-color: #393f4c; /* --theme-body-color */ + --gcli-border-color: #dde1e4; /* --theme-splitter-color */ --selection-background: #4c9ed9; /* --theme-selection-background */ --selection-color: #f5f7fa; /* --theme-selection-color */ } @@ -4091,7 +4117,7 @@ html|*#fullscreen-exit-button { #developer-toolbar > toolbarbutton { -moz-appearance: none; border: none; - background: transparent; + background-color: transparent; margin: 0; padding: 0 10px; width: 32px; @@ -4101,17 +4127,21 @@ html|*#fullscreen-exit-button { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, +:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } -.developer-toolbar-button > .toolbarbutton-icon, -#developer-toolbar-closebutton > .toolbarbutton-icon { +.developer-toolbar-button > .toolbarbutton-icon { width: 16px; height: 16px; } +/* The toolkit close button is low contrast in the dark theme so invert it. */ +:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { + filter: invert(1); +} + #developer-toolbar-toolbox-button { list-style-image: url("chrome://devtools/skin/images/toggle-tools.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); @@ -4152,40 +4182,6 @@ html|*#fullscreen-exit-button { } } -#developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close.png"); - -moz-appearance: none; - border: none; - margin: 0 4px; - min-width: 16px; - width: 16px; - opacity: 0.6; -} - -@media (min-resolution: 1.1dppx) { - #developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close@2x.png"); - } -} - -#developer-toolbar-closebutton > .toolbarbutton-icon { - /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must - use evil CSS to give the impression of smaller content */ - margin: -4px; -} - -#developer-toolbar-closebutton > .toolbarbutton-text { - display: none; -} - -#developer-toolbar-closebutton:hover { - opacity: 0.8; -} - -#developer-toolbar-closebutton:hover:active { - opacity: 1; -} - /* GCLI */ html|*#gcli-tooltip-frame, @@ -4300,6 +4296,7 @@ html|*#gcli-output-frame { .gcli-in-closebrace { color: hsl(0,0%,80%); } + #notification-popup[popupid="click-to-play-plugins"] > .panel-arrowcontainer > .panel-arrowcontent { padding: 0px; } @@ -4366,6 +4363,11 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } + +notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); +} + #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css index 276c192..49f2f1d 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css @@ -5,6 +5,7 @@ /* 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/. */ +/* navbarInsetHighlight is tightly coupled to the toolbarHighlight constant. */ :root { --toolbarbutton-hover-background: #444a58; --toolbarbutton-hover-boxshadow: none; @@ -427,9 +428,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0px 48px 16px 32px); } #subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup, -#BMB_subscribeToPageMenuitem:not([disabled]), -#BMB_subscribeToPageMenupopup { +#subscribeToPageMenupopup { list-style-image: url("chrome://browser/skin/page-livemarks.png"); } #bookmarksToolbarFolderMenu, @@ -640,7 +639,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #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 #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 #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) { 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, @@ -817,6 +816,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 1024px, 32px, 992px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 1024px, 64px, 992px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } @@ -974,6 +976,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 2048px, 64px, 1984px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(64px, 2048px, 128px, 1984px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 832px, 64px, 768px); } @@ -1167,7 +1172,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-appearance: toolbarbutton-dropdown; transition: opacity 0.15s ease; } -#navigator-toolbox:not(:hover) .urlbar-history-dropmarker { +#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker { + transition: none; } + +#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker { opacity: 0; } #urlbar-container { @@ -1384,6 +1392,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } + .popup-notification-icon { width: 64px; height: 64px; @@ -1475,11 +1487,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box height: 16px; margin: 0 2px; } -.identity-notification-icon, -#identity-notification-icon { - list-style-image: url(chrome://mozapps/skin/profile/profileicon.png); - /* XXX: need HiDPI version */ } - .geo-notification-icon, #geo-notification-icon { list-style-image: url(chrome://browser/skin/Geolocation-16.png); } @@ -2800,6 +2807,20 @@ html|*#fullscreen-exit-button { box-shadow: none; border-bottom-width: 0; } +.devtools-responsiveui-textinput { + -moz-appearance: none; + background: #333; + color: #fff; + border: 1px solid #111; + border-radius: 2px; + padding: 5px; + width: 200px; + margin: 0; } + +.devtools-responsiveui-textinput[attention] { + border-color: #38ace6; + background: rgba(56, 172, 230, 0.4); } + .devtools-responsiveui-menulist, .devtools-responsiveui-toolbarbutton { -moz-appearance: none; @@ -3047,15 +3068,15 @@ html|*#fullscreen-exit-button { We are copy/pasting variables from light-theme and dark-theme, since they aren't loaded in this context (within browser.css). */ :root[devtoolstheme="light"] #developer-toolbar { - --gcli-background-color: #ebeced; + --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ - --gcli-input-background: #f0f1f2; + --gcli-input-background: #fcfcfc; /* --theme-toolbar-background */ - --gcli-input-focused-background: #f7f7f7; + --gcli-input-focused-background: #ffffff; /* --theme-sidebar-background */ - --gcli-input-color: #18191a; + --gcli-input-color: #393f4c; /* --theme-body-color */ - --gcli-border-color: #aaaaaa; + --gcli-border-color: #dde1e4; /* --theme-splitter-color */ --selection-background: #4c9ed9; /* --theme-selection-background */ @@ -3088,7 +3109,7 @@ html|*#fullscreen-exit-button { #developer-toolbar > toolbarbutton { -moz-appearance: none; border: none; - background: transparent; + background-color: transparent; margin: 0; padding: 0 10px; width: 32px; } @@ -3096,15 +3117,18 @@ html|*#fullscreen-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, +:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } -.developer-toolbar-button > .toolbarbutton-icon, -#developer-toolbar-closebutton > .toolbarbutton-icon { +.developer-toolbar-button > .toolbarbutton-icon { width: 16px; height: 16px; } +/* The toolkit close button is low contrast in the dark theme so invert it. */ +:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { + filter: invert(1); } + #developer-toolbar-toolbox-button { list-style-image: url("chrome://devtools/skin/images/toggle-tools.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); } @@ -3134,32 +3158,6 @@ html|*#fullscreen-exit-button { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 128px, 32px, 96px); } } -#developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close.png"); - -moz-appearance: none; - border: none; - margin: 0 4px; - min-width: 16px; - width: 16px; - opacity: 0.6; } - -@media (min-resolution: 1.1dppx) { - #developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } } -#developer-toolbar-closebutton > .toolbarbutton-icon { - /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must - use evil CSS to give the impression of smaller content */ - margin: -4px; } - -#developer-toolbar-closebutton > .toolbarbutton-text { - display: none; } - -#developer-toolbar-closebutton:hover { - opacity: 0.8; } - -#developer-toolbar-closebutton:hover:active { - opacity: 1; } - /* GCLI */ html|*#gcli-tooltip-frame, html|*#gcli-output-frame { @@ -3308,6 +3306,9 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } +notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); } + #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css index d57d8fa..4a1a652 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css @@ -5,6 +5,7 @@ /* 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/. */ +/* navbarInsetHighlight is tightly coupled to the toolbarHighlight constant. */ :root { --toolbarbutton-hover-background: #fbfbfc; --toolbarbutton-hover-boxshadow: none; @@ -427,9 +428,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0px 48px 16px 32px); } #subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup, -#BMB_subscribeToPageMenuitem:not([disabled]), -#BMB_subscribeToPageMenupopup { +#subscribeToPageMenupopup { list-style-image: url("chrome://browser/skin/page-livemarks.png"); } #bookmarksToolbarFolderMenu, @@ -640,7 +639,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #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 #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 #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) { 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, @@ -817,6 +816,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 1024px, 32px, 992px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 1024px, 64px, 992px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } @@ -974,6 +976,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 2048px, 64px, 1984px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(64px, 2048px, 128px, 1984px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 832px, 64px, 768px); } @@ -1166,7 +1171,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-appearance: toolbarbutton-dropdown; transition: opacity 0.15s ease; } -#navigator-toolbox:not(:hover) .urlbar-history-dropmarker { +#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker { + transition: none; } + +#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker { opacity: 0; } #urlbar-container { @@ -1383,6 +1391,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } + .popup-notification-icon { width: 64px; height: 64px; @@ -1474,11 +1486,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box height: 16px; margin: 0 2px; } -.identity-notification-icon, -#identity-notification-icon { - list-style-image: url(chrome://mozapps/skin/profile/profileicon.png); - /* XXX: need HiDPI version */ } - .geo-notification-icon, #geo-notification-icon { list-style-image: url(chrome://browser/skin/Geolocation-16.png); } @@ -2800,6 +2807,20 @@ html|*#fullscreen-exit-button { box-shadow: none; border-bottom-width: 0; } +.devtools-responsiveui-textinput { + -moz-appearance: none; + background: #333; + color: #fff; + border: 1px solid #111; + border-radius: 2px; + padding: 5px; + width: 200px; + margin: 0; } + +.devtools-responsiveui-textinput[attention] { + border-color: #38ace6; + background: rgba(56, 172, 230, 0.4); } + .devtools-responsiveui-menulist, .devtools-responsiveui-toolbarbutton { -moz-appearance: none; @@ -3047,15 +3068,15 @@ html|*#fullscreen-exit-button { We are copy/pasting variables from light-theme and dark-theme, since they aren't loaded in this context (within browser.css). */ :root[devtoolstheme="light"] #developer-toolbar { - --gcli-background-color: #ebeced; + --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ - --gcli-input-background: #f0f1f2; + --gcli-input-background: #fcfcfc; /* --theme-toolbar-background */ - --gcli-input-focused-background: #f7f7f7; + --gcli-input-focused-background: #ffffff; /* --theme-sidebar-background */ - --gcli-input-color: #18191a; + --gcli-input-color: #393f4c; /* --theme-body-color */ - --gcli-border-color: #aaaaaa; + --gcli-border-color: #dde1e4; /* --theme-splitter-color */ --selection-background: #4c9ed9; /* --theme-selection-background */ @@ -3088,7 +3109,7 @@ html|*#fullscreen-exit-button { #developer-toolbar > toolbarbutton { -moz-appearance: none; border: none; - background: transparent; + background-color: transparent; margin: 0; padding: 0 10px; width: 32px; } @@ -3096,15 +3117,18 @@ html|*#fullscreen-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, +:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } -.developer-toolbar-button > .toolbarbutton-icon, -#developer-toolbar-closebutton > .toolbarbutton-icon { +.developer-toolbar-button > .toolbarbutton-icon { width: 16px; height: 16px; } +/* The toolkit close button is low contrast in the dark theme so invert it. */ +:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { + filter: invert(1); } + #developer-toolbar-toolbox-button { list-style-image: url("chrome://devtools/skin/images/toggle-tools.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); } @@ -3134,32 +3158,6 @@ html|*#fullscreen-exit-button { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 128px, 32px, 96px); } } -#developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close.png"); - -moz-appearance: none; - border: none; - margin: 0 4px; - min-width: 16px; - width: 16px; - opacity: 0.6; } - -@media (min-resolution: 1.1dppx) { - #developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } } -#developer-toolbar-closebutton > .toolbarbutton-icon { - /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must - use evil CSS to give the impression of smaller content */ - margin: -4px; } - -#developer-toolbar-closebutton > .toolbarbutton-text { - display: none; } - -#developer-toolbar-closebutton:hover { - opacity: 0.8; } - -#developer-toolbar-closebutton:hover:active { - opacity: 1; } - /* GCLI */ html|*#gcli-tooltip-frame, html|*#gcli-output-frame { @@ -3308,6 +3306,9 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } +notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); } + #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css index c874a40..3ef2f72 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-light.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css @@ -5,6 +5,7 @@ /* 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/. */ +/* navbarInsetHighlight is tightly coupled to the toolbarHighlight constant. */ :root { --toolbarbutton-hover-background: #fbfbfc; --toolbarbutton-hover-boxshadow: none; @@ -427,9 +428,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-image-region: rect(0px 48px 16px 32px); } #subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup, -#BMB_subscribeToPageMenuitem:not([disabled]), -#BMB_subscribeToPageMenupopup { +#subscribeToPageMenupopup { list-style-image: url("chrome://browser/skin/page-livemarks.png"); } #bookmarksToolbarFolderMenu, @@ -640,7 +639,7 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { #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 #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 #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) { 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, @@ -817,6 +816,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 1024px, 32px, 992px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(32px, 1024px, 64px, 992px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 416px, 32px, 384px); } @@ -974,6 +976,9 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { toolbarpaletteitem[place="palette"] > #sync-button { -moz-image-region: rect(0px, 2048px, 64px, 1984px); } + #sync-button[cui-areatype="menu-panel"][panel-multiview-anchor=true] { + -moz-image-region: rect(64px, 2048px, 128px, 1984px); } + #feed-button[cui-areatype="menu-panel"], toolbarpaletteitem[place="palette"] > #feed-button { -moz-image-region: rect(0px, 832px, 64px, 768px); } @@ -1166,7 +1171,10 @@ menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { -moz-appearance: toolbarbutton-dropdown; transition: opacity 0.15s ease; } -#navigator-toolbox:not(:hover) .urlbar-history-dropmarker { +#urlbar-wrapper[switchingtabs] > #urlbar > .urlbar-textbox-container > .urlbar-history-dropmarker { + transition: none; } + +#navigator-toolbox:not(:hover) #urlbar:not([focused]) > .urlbar-textbox-container > .urlbar-history-dropmarker { opacity: 0; } #urlbar-container { @@ -1383,6 +1391,10 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box list-style-image: url(chrome://browser/skin/identity-mixed-active-blocked.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { + list-style-image: url(chrome://browser/skin/identity-mixed-passive-loaded.svg); + visibility: visible; } + .popup-notification-icon { width: 64px; height: 64px; @@ -1474,11 +1486,6 @@ window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar > #identity-box height: 16px; margin: 0 2px; } -.identity-notification-icon, -#identity-notification-icon { - list-style-image: url(chrome://mozapps/skin/profile/profileicon.png); - /* XXX: need HiDPI version */ } - .geo-notification-icon, #geo-notification-icon { list-style-image: url(chrome://browser/skin/Geolocation-16.png); } @@ -2800,6 +2807,20 @@ html|*#fullscreen-exit-button { box-shadow: none; border-bottom-width: 0; } +.devtools-responsiveui-textinput { + -moz-appearance: none; + background: #333; + color: #fff; + border: 1px solid #111; + border-radius: 2px; + padding: 5px; + width: 200px; + margin: 0; } + +.devtools-responsiveui-textinput[attention] { + border-color: #38ace6; + background: rgba(56, 172, 230, 0.4); } + .devtools-responsiveui-menulist, .devtools-responsiveui-toolbarbutton { -moz-appearance: none; @@ -3047,15 +3068,15 @@ html|*#fullscreen-exit-button { We are copy/pasting variables from light-theme and dark-theme, since they aren't loaded in this context (within browser.css). */ :root[devtoolstheme="light"] #developer-toolbar { - --gcli-background-color: #ebeced; + --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ - --gcli-input-background: #f0f1f2; + --gcli-input-background: #fcfcfc; /* --theme-toolbar-background */ - --gcli-input-focused-background: #f7f7f7; + --gcli-input-focused-background: #ffffff; /* --theme-sidebar-background */ - --gcli-input-color: #18191a; + --gcli-input-color: #393f4c; /* --theme-body-color */ - --gcli-border-color: #aaaaaa; + --gcli-border-color: #dde1e4; /* --theme-splitter-color */ --selection-background: #4c9ed9; /* --theme-selection-background */ @@ -3088,7 +3109,7 @@ html|*#fullscreen-exit-button { #developer-toolbar > toolbarbutton { -moz-appearance: none; border: none; - background: transparent; + background-color: transparent; margin: 0; padding: 0 10px; width: 32px; } @@ -3096,15 +3117,18 @@ html|*#fullscreen-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > toolbarbutton:not([checked=true]) > image, +:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, :root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } -.developer-toolbar-button > .toolbarbutton-icon, -#developer-toolbar-closebutton > .toolbarbutton-icon { +.developer-toolbar-button > .toolbarbutton-icon { width: 16px; height: 16px; } +/* The toolkit close button is low contrast in the dark theme so invert it. */ +:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { + filter: invert(1); } + #developer-toolbar-toolbox-button { list-style-image: url("chrome://devtools/skin/images/toggle-tools.png"); -moz-image-region: rect(0px, 16px, 16px, 0px); } @@ -3134,32 +3158,6 @@ html|*#fullscreen-exit-button { #developer-toolbar-toolbox-button[checked=true] { -moz-image-region: rect(0px, 128px, 32px, 96px); } } -#developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close.png"); - -moz-appearance: none; - border: none; - margin: 0 4px; - min-width: 16px; - width: 16px; - opacity: 0.6; } - -@media (min-resolution: 1.1dppx) { - #developer-toolbar-closebutton { - list-style-image: url("chrome://devtools/skin/images/close@2x.png"); } } -#developer-toolbar-closebutton > .toolbarbutton-icon { - /* XXX Buttons have padding in widget/ that we don't want here but can't override with good CSS, so we must - use evil CSS to give the impression of smaller content */ - margin: -4px; } - -#developer-toolbar-closebutton > .toolbarbutton-text { - display: none; } - -#developer-toolbar-closebutton:hover { - opacity: 0.8; } - -#developer-toolbar-closebutton:hover:active { - opacity: 1; } - /* GCLI */ html|*#gcli-tooltip-frame, html|*#gcli-output-frame { @@ -3308,6 +3306,9 @@ notification.pluginVulnerable { notification.pluginVulnerable .messageImage { list-style-image: url("chrome://browser/skin/notification-pluginBlocked.png"); } +notification.pluginVulnerable > .notification-inner > .messageCloseButton:not(:hover) { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); } + #notification-popup[popupid="login-fill"] > .panel-arrowcontainer > .panel-arrowcontent { /* Since we display a sliding subview that extends to the border, we cannot * keep the default padding of arrow panels. We use the same padding in the diff --git a/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css b/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css new file mode 100644 index 0000000..2311d6f --- /dev/null +++ b/arc-firefox-theme/chrome/browser/syncedtabs/sidebar.css @@ -0,0 +1,246 @@ +/* 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/. */ + + +/* These styles are intended to mimic XUL trees and the XUL search box. */ + +:root, body { + overflow-x: hidden; +} + +body { + margin: 0; + font: message-box; + color: #333333; + -moz-user-select: none; + overflow: hidden; +} + +.emptyListInfo { + cursor: default; + padding: 3em 1em; + text-align: center; +} + +.list, +.item-tabs-list { + display: flex; + flex-flow: column; + flex-grow: 1; +} + +.item.client { + opacity: 1; + max-height: unset; + display: unset; +} + +.item.client.closed .item-tabs-list { + display: none; +} + +.item { + display: inline-block; + opacity: 1; + flex: 1; + min-width: 0; + white-space: nowrap; + overflow: hidden; + outline: none; + color: -moz-FieldText; +} + +.item.selected > .item-title-container { + background-color: -moz-cellhighlight; + color: -moz-cellhighlighttext; + font-weight: bold; +} + +.item.selected:focus > .item-title-container { + background-color: Highlight; + color: HighlightText; +} + +.client .item.tab > .item-title-container { + padding-inline-start: 35px; +} +.item.tab > .item-title-container { + padding-inline-start: 20px; +} + +.item-icon-container { + min-width: 16px; + max-width: 16px; + min-height: 16px; + max-height: 16px; + margin-right: 5px; + margin-left: 5px; + background-size: 16px 16px; + background-size: contain; + background-repeat: no-repeat; + background-position: center; +} + +.item-title-container { + display: flex; + flex-flow: row; + overflow: hidden; + flex-grow: 1; + padding: 1px 0px 1px 0px; +} + +.item-title { + flex-grow: 1; + overflow: hidden; + text-overflow: ellipsis; + margin: 0px; + line-height: 1.3; +} + +.item[hidden] { + opacity: 0; + max-height: 0; + transition: opacity 150ms ease-in-out, max-height 150ms ease-in-out 150ms; +} + +.item.empty .item-title-container { + color: #aeaeae; +} + +.client .item.empty > .item-title-container { + padding-inline-start: 35px; +} + +.text-input-box { + display: flex; + flex-flow: row nowrap; +} + +.textbox-input-box { + display: flex; + flex-direction: row; +} + +.tabsFilter { + flex: 1; + /* min-width of anything to override the implicit "-moz-min-content" value. + 0px is safe as the sidebar itself has a constrained size meaning we will + never actually hit this minimum + */ + min-width: 0px; +} + +.sync-state > p { + padding-inline-end: 10px; + padding-inline-start: 10px; + color: #888; +} + +.text-link { + color: rgb(0, 149, 221); + cursor: pointer; +} + +.text-link:hover { + text-decoration: underline; +} + +.text-link, +.text-link:focus { + margin: 0px; + padding: 0px; + border: 0px; +} + +.deck .sync-state { + display: none; + opacity: 0; + transition: opacity 1.5s; + border-top: 1px solid #bdbdbd; +} + +.deck .sync-state.tabs-container { + border-top: 0px; +} + +.deck .sync-state.selected { + display: unset; + opacity: 100; +} + +.textbox-search-clear:not([disabled]) { + cursor: default; +} + +.textbox-search-icons .textbox-search-clear, +.filtered .textbox-search-icons .textbox-search-icon { + display: none; +} + +.filtered .textbox-search-icons .textbox-search-clear { + display: block; +} + +/* These styles are intended to mimic XUL trees and the XUL search box. */ + +html { + border: 1px solid ThreeDShadow; + background-color: -moz-Field; + color: -moz-FieldText; + box-sizing: border-box; +} + +.item { + -moz-padding-end: 0; +} + +.item-title { + margin: 1px 0 0; + -moz-margin-end: 6px; +} + + +.search-box { + -moz-appearance: textfield; + cursor: text; + margin: 2px 4px; + border: 2px solid; + -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow; + -moz-border-right-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; + -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; + padding: 2px 2px 3px; + -moz-padding-start: 4px; + background-color: -moz-Field; + color: -moz-FieldText; +} + +.textbox-search-clear { + background-image: url(moz-icon://stock/gtk-clear?size=menu); + background-repeat: no-repeat; + width: 16px; + height: 16px; +} + +.textbox-search-icon { + background-image: url(moz-icon://stock/gtk-find?size=menu); + background-repeat: no-repeat; + width: 16px; + height: 16px; + display: block; +} + +.textbox-search-icon[searchbutton]:not([disabled]) , +.textbox-search-clear:not([disabled]) { + cursor: pointer; +} + +.item.client .item-twisty-container { + -moz-appearance: treetwistyopen; + margin-top: 3px; +} + +.item.client.closed .item-twisty-container { + -moz-appearance: treetwisty; +} diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg index da9c882..75d70c9 100644 --- a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg +++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-end.svg @@ -12,7 +12,7 @@ /* navbarInsetHighlight is tightly coupled to the toolbarHighlight constant. */ #tab-background-fill { background-color: -moz-dialog; - background-image: linear-gradient(transparent 2px, hsla(0,0%,100%,.05) 2px, hsla(0,0%,100%,.05)); + background-image: linear-gradient(transparent 2px, hsla(0,0%,100%,.15) 2px, hsla(0,0%,100%,.15)); background-repeat: no-repeat; height: 100%; width: 100%; diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg index 8f91c4b..66d75dd 100644 --- a/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg +++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-selected-start.svg @@ -12,7 +12,7 @@ /* navbarInsetHighlight is tightly coupled to the toolbarHighlight constant. */ #tab-background-fill { background-color: -moz-dialog; - background-image: linear-gradient(transparent 2px, hsla(0,0%,100%,.05) 2px, hsla(0,0%,100%,.05)); + background-image: linear-gradient(transparent 2px, hsla(0,0%,100%,.15) 2px, hsla(0,0%,100%,.15)); background-repeat: no-repeat; height: 100%; width: 100%; diff --git a/arc-firefox-theme/chrome/global/aboutReaderContent.css b/arc-firefox-theme/chrome/global/aboutReaderContent.css index 8412751..94972c5 100644 --- a/arc-firefox-theme/chrome/global/aboutReaderContent.css +++ b/arc-firefox-theme/chrome/global/aboutReaderContent.css @@ -55,7 +55,9 @@ ol, li, figure, .wp-caption { - margin: 0 0 30px 0; + margin: -10px -10px 20px -10px; + padding: 10px; + border-radius: 5px; } p > img:only-child, diff --git a/arc-firefox-theme/chrome/global/aboutReaderControls.css b/arc-firefox-theme/chrome/global/aboutReaderControls.css index 2af3bef..b640e3c 100644 --- a/arc-firefox-theme/chrome/global/aboutReaderControls.css +++ b/arc-firefox-theme/chrome/global/aboutReaderControls.css @@ -120,7 +120,7 @@ padding: 0; } -/*======= Font style popup =======*/ +/*======= Popup =======*/ .dropdown-popup { min-width: 300px; @@ -136,6 +136,10 @@ box-shadow: 0 1px 12px #666; } +.keep-open .dropdown-popup { + z-index: initial; +} + .dropdown-popup > hr { display: none; } @@ -154,6 +158,8 @@ display: block; } +/*======= Font style popup =======*/ + #font-type-buttons, #font-size-buttons, #color-scheme-buttons { @@ -274,38 +280,8 @@ background-position: center; } -.footer { - height: 64px; - background-color: #ebebeb; - position: absolute; - left: 0; - width: 100%; - text-align: center; - padding: 12px 0; - box-sizing: border-box; - box-shadow: 0 3px 3px -3px rgba(0, 0, 0, 0.35) inset; -} - -.remove-button { - background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); - margin: 0 auto; - border: 1px solid #c1c1c1; - background-position: 10px 7px; - padding-left: 42px; - padding-right: 10px; - border-radius: 2px; - box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1); - font-size: 18px; -} - - /*======= Toolbar icons =======*/ -/* Android-only controls */ -.share-button { - display: none; -} - .close-button { background-image: url("chrome://global/skin/reader/RM-Close-24x24.svg#close"); height: 68px; @@ -330,21 +306,6 @@ background-image: url("chrome://global/skin/reader/RM-Type-Controls-24x24.svg"); } -.toggle-button.on { - background-image: url("chrome://global/skin/reader/RM-Delete-24x24.svg"); -} - -.toggle-button { - background-image: url("chrome://global/skin/reader/RM-Add-24x24.svg"); -} - -.list-button { - background-image: url("chrome://global/skin/reader/RM-Reading-List-24x24.svg"); -} -.list-button.on { - background-color: #d9d9d9; -} - .minus-button { background-image: url("chrome://global/skin/reader/RM-Minus-24x24.svg"); } @@ -357,7 +318,4 @@ .toolbar { display: none !important; } - .footer { - display: none !important; - } } diff --git a/arc-firefox-theme/chrome/global/alerts/alert-common.css b/arc-firefox-theme/chrome/global/alerts/alert-common.css index 20d9e7b..a58388e 100644 --- a/arc-firefox-theme/chrome/global/alerts/alert-common.css +++ b/arc-firefox-theme/chrome/global/alerts/alert-common.css @@ -53,6 +53,22 @@ } } +#alertIcon { + margin-top: 6px; + margin-inline-start: 8px; + margin-inline-end: 0; + margin-bottom: 0; + width: 16px; + min-height: 16px; + max-height: 16px; +} + +@media (resolution: 2dppx) { + #alertIcon { + image-rendering: -moz-crisp-edges; + } +} + #alertImage { width: 80px; height: 80px; diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css index c78132c..414a9c1 100644 --- a/arc-firefox-theme/chrome/global/in-content/common.css +++ b/arc-firefox-theme/chrome/global/in-content/common.css @@ -596,7 +596,8 @@ xul|*.radio-label-box { background-color: var(--in-content-category-background-hover); } -*|*.category[selected] { +*|*.category[selected], +*|*.category.selected { background-color: var(--in-content-category-background-active); color: var(--in-content-category-text-selected); -moz-padding-start: 11px; /* compensate the 4px border */ diff --git a/arc-firefox-theme/chrome/global/narrate.css b/arc-firefox-theme/chrome/global/narrate.css new file mode 100644 index 0000000..3aa8a8a --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate.css @@ -0,0 +1,11 @@ +body.light .narrating { + background-color: #ffc; +} + +body.sepia .narrating { + background-color: #e0d7c5; +} + +body.dark .narrating { + background-color: #242424; +} diff --git a/arc-firefox-theme/chrome/global/narrate/arrow.svg b/arc-firefox-theme/chrome/global/narrate/arrow.svg new file mode 100644 index 0000000..2fb2141 --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/arrow.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 12 12"> + <path d="M6 9L1 4l1-1 4 4 4-4 1 1z" fill="#4C4C4C"/> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrate/back.svg b/arc-firefox-theme/chrome/global/narrate/back.svg new file mode 100644 index 0000000..d29586e --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/back.svg @@ -0,0 +1,15 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"> + <defs> + <style> + use:not(:target) { + display: none; + } + #disabled { + opacity: 0.5; + } + </style> + <path id="shape" d="M 5 0 C 4.446 0 4 0.446 4 1 L 4 23 C 4 23.554 4.446 24 5 24 L 7 24 C 7.554 24 8 23.554 8 23 L 8 12.404297 C 8.04108 12.509297 8.109944 12.610125 8.203125 12.703125 L 19.296875 23.775391 C 19.495259 23.972391 19.661613 24.039562 19.796875 23.976562 C 19.932137 23.915564 20 23.748516 20 23.478516 L 20 0.52148438 C 20 0.25248437 19.93214 0.084484365 19.796875 0.021484375 C 19.661613 -0.040515625 19.495259 0.02856248 19.296875 0.2265625 L 8.203125 11.298828 C 8.1099445 11.381828 8.04108 11.481703 8 11.595703 L 8 1 C 8 0.446 7.554 0 7 0 L 5 0 z " fill="gray"/> + </defs> + <use id="enabled" xlink:href="#shape"/> + <use id="disabled" xlink:href="#shape"/> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrate/fast.svg b/arc-firefox-theme/chrome/global/narrate/fast.svg new file mode 100644 index 0000000..cd25a6a --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/fast.svg @@ -0,0 +1,3 @@ +<svg id="Icons" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 20.4"> + <path fill="gray" d="M14.42 16.68a.77.77 0 0 0 .54.7l2.51.68a1.58 1.58 0 0 1 1.06 1.22l.05.39-3.89-.53a4.34 4.34 0 0 1-1.74-.72L7.2 14.03a5.79 5.79 0 0 1-5.34-4.88h-.82a1 1 0 0 1-1-1l2.9-3.24a6.16 6.16 0 0 1 4.7-2.39 5.88 5.88 0 0 1 .77.05 5 5 0 0 1 .87.15c3.75 1 6.5 5.84 6.5 5.84a2.27 2.27 0 0 0 1.14.85h.17a1.27 1.27 0 0 0 1.22-.4l.78-1-2.47-1.2c-3.38-1.46-2.46-5.71-2.46-5.71 0-.26.23-.32.42-.14l5.32 5-4.31-4.81a1.39 1.39 0 0 1 .81-1.22l4.17 6.65.33.31 2.19 1.54a2.44 2.44 0 0 1 .92 1.75v2.77l-.16.13a1.66 1.66 0 0 1-1.63.19l-.75-.36a2.57 2.57 0 0 0-2.55.32l-2.18 1.82a4.28 4.28 0 0 1-.89.55 10.18 10.18 0 0 0-4.62-8.46c-.27-.16-.66.31-.47.48a10.52 10.52 0 0 1 3.68 8.5v.48zm8.38-5.42a.49.49 0 1 0-.49-.49.49.49 0 0 0 .49.49zm-18 9.14v-.52a1.39 1.39 0 0 1 .93-1.25s2.7-.66 3.43-1.84l2.06 1.63a25.62 25.62 0 0 1-6.43 2z"/> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrate/forward.svg b/arc-firefox-theme/chrome/global/narrate/forward.svg new file mode 100644 index 0000000..53e64e9 --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/forward.svg @@ -0,0 +1,15 @@ +<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 24 24"> + <defs> + <style> + use:not(:target) { + display: none; + } + #disabled { + opacity: 0.5; + } + </style> + <path id="shape" d="m 19,0 c 0.554,0 1,0.446 1,1 l 0,22 c 0,0.554 -0.446,1 -1,1 l -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-10.595703 c -0.04108,0.105 -0.109944,0.205828 -0.203125,0.298828 L 4.703125,23.775391 c -0.198384,0.197 -0.364738,0.264171 -0.5,0.201171 C 4.067863,23.915564 4,23.748516 4,23.478516 L 4,0.52148438 c 0,-0.26900001 0.06786,-0.43700001 0.203125,-0.5 0.135262,-0.062 0.301616,0.0070781 0.5,0.20507812 l 11.09375,11.0722655 c 0.09318,0.083 0.162045,0.182875 0.203125,0.296875 L 16,1 c 0,-0.554 0.446,-1 1,-1 l 2,0 z" fill="gray"/> + </defs> + <use id="enabled" xlink:href="#shape"/> + <use id="disabled" xlink:href="#shape"/> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrate/narrate.svg b/arc-firefox-theme/chrome/global/narrate/narrate.svg new file mode 100644 index 0000000..597b0a6 --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/narrate.svg @@ -0,0 +1,3 @@ +<svg id="Icons" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 18.77"> + <path fill="gray" d="M3.13 13.72a1.57 1.57 0 0 1-3.13 0V5.41a1.57 1.57 0 0 1 3.13 0v8.31zm6.29 3.62a1.57 1.57 0 0 1-3.13 0V1.44a1.57 1.57 0 0 1 3.13 0v15.9zm6.29-2.9a1.57 1.57 0 0 1-3.13 0V4.83a1.57 1.57 0 0 1 3.13 0v9.61zM22 12.62a1.57 1.57 0 0 1-3.13 0V6.15a1.57 1.57 0 0 1 3.13 0v6.47z"/> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrate/slow.svg b/arc-firefox-theme/chrome/global/narrate/slow.svg new file mode 100644 index 0000000..1892b66 --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/slow.svg @@ -0,0 +1,6 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <g fill="gray"> + <path d="M1.684,13.486c-0.209,0-0.404-0.132-0.474-0.341c-0.528-1.58-0.23-5.767,4.097-7.921 c1.315-0.656,2.589-0.988,3.787-0.988c3.237,0,5.096,2.341,5.99,3.465c0.158,0.199,0.181,0.533,0,0.713 c-0.793,0.794-1.852,1.542-3.231,2.286c-2.46,1.327-5.045,1.775-7.121,2.134c-1.123,0.194-2.093,0.361-2.89,0.627 C1.789,13.479,1.735,13.486,1.684,13.486L1.684,13.486z"/> + <path d="M23.185,5.465c-0.86-1.121-2.074-1.819-3.168-1.819c-0.641,0-1.556,0.23-2.273,1.328 c-0.374,0.571-0.577,1.161-0.773,1.73c-0.512,1.482-1.041,3.016-4.662,4.969c-2.316,1.249-4.707,1.664-6.815,2.03 c-2.524,0.438-4.704,0.814-5.455,2.622c-0.069,0.165-0.045,0.354,0.062,0.495c0.107,0.143,0.281,0.217,0.46,0.193 c0.667-0.081,1.533,0.041,2.434,0.217c-0.122,0.146-0.261,0.286-0.391,0.418c-0.38,0.385-0.774,0.783-0.657,1.292 c0.108,0.474,0.604,0.699,0.966,0.828c0.399,0.142,0.843,0.217,1.283,0.217c1.241,0,2.216-0.579,2.649-1.539 c1.704,0.287,3.487,0.313,5.043,0.313l1.639-0.006c0.066,0.056,0.178,0.166,0.264,0.25c0.504,0.506,1.348,1.351,2.721,1.351 c0.129,0,0.264-0.008,0.416-0.026c0.687-0.102,1.351-0.267,1.574-0.787c0.227-0.528-0.123-1.023-0.526-1.597 c-0.481-0.685-1.08-1.532-0.998-2.652c0.196-0.397,0.368-0.824,0.546-1.267c0.479-1.19,0.975-2.421,2.12-3.513 c0.431,0.343,1.022,0.549,1.63,0.549l0,0c0.439,0,0.876-0.102,1.295-0.3c0.624-0.293,1.104-0.967,1.316-1.847 C24.175,7.707,23.914,6.418,23.185,5.465L23.185,5.465z M20.397,7.757c-0.276,0-0.5-0.224-0.5-0.5s0.224-0.5,0.5-0.5 c0.275,0,0.5,0.224,0.5,0.5S20.674,7.757,20.397,7.757z"/> + </g> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrate/start.svg b/arc-firefox-theme/chrome/global/narrate/start.svg new file mode 100644 index 0000000..95fa713 --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/start.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <path d="M21.64 12.44L2.827 22.895c-.217.123-.403.137-.56.042-.155-.094-.233-.264-.233-.51V1.572c0-.244.08-.414.233-.51.157-.093.343-.08.56.044L21.642 11.56c.217.124.326.27.326.44 0 .17-.11.316-.327.44z" fill="gray"/> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrate/stop.svg b/arc-firefox-theme/chrome/global/narrate/stop.svg new file mode 100644 index 0000000..c017c57 --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrate/stop.svg @@ -0,0 +1,3 @@ +<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"> + <rect ry="1" rx="1" y="2" x="2" height="20" width="20" fill="gray"/> +</svg> diff --git a/arc-firefox-theme/chrome/global/narrateControls.css b/arc-firefox-theme/chrome/global/narrateControls.css new file mode 100644 index 0000000..dc24a4c --- /dev/null +++ b/arc-firefox-theme/chrome/global/narrateControls.css @@ -0,0 +1,184 @@ +:scope { + --border-color: #e5e5e5; +} + +#narrate-toggle { + background-image: url("chrome://global/skin/narrate/narrate.svg"); +} + +.dropdown-popup button { + background-color: transparent; +} + +.dropdown-popup button:hover:not(:disabled) { + background-color: #eaeaea; +} + +.narrate-row { + display: flex; + align-items: center; + min-height: 40px; + box-sizing: border-box; +} + +.narrate-row:not(:first-child) { + border-top: 1px solid var(--border-color); +} + +/* Control buttons */ + +#narrate-control > button { + background-size: 24px 24px; + background-repeat: no-repeat; + background-position: center center; + height: 64px; + width: 100px; + border: none; + color: #666; + box-sizing: border-box; +} + +#narrate-control > button:not(:first-child) { + border-left: 1px solid var(--border-color); +} + +#narrate-skip-previous { + border-top-left-radius: 3px; + background-image: url("chrome://global/skin/narrate/back.svg#enabled"); +} + +#narrate-skip-next { + border-top-right-radius: 3px; + background-image: url("chrome://global/skin/narrate/forward.svg#enabled"); +} + +#narrate-skip-previous:disabled { + background-image: url("chrome://global/skin/narrate/back.svg#disabled"); +} + +#narrate-skip-next:disabled { + background-image: url("chrome://global/skin/narrate/forward.svg#disabled"); +} + +#narrate-start-stop { + background-image: url("chrome://global/skin/narrate/start.svg"); +} + +#narrate-start-stop.speaking { + background-image: url("chrome://global/skin/narrate/stop.svg"); +} + +/* Rate control */ + +#narrate-rate::before, #narrate-rate::after { + content: ''; + width: 48px; + height: 40px; + background-position: center; + background-repeat: no-repeat; + background-size: 24px auto; +} + +#narrate-rate::before { + background-image: url("chrome://global/skin/narrate/slow.svg"); +} + +#narrate-rate::after { + background-image: url("chrome://global/skin/narrate/fast.svg"); +} + +#narrate-rate-input { + margin: 0 1px; + flex-grow: 1; +} + +#narrate-rate-input::-moz-range-track { + background-color: #979797; + height: 2px; +} + +#narrate-rate-input::-moz-range-progress { + background-color: #2EA3FF; + height: 2px; +} + +#narrate-rate-input::-moz-range-thumb { + background-color: #808080; + height: 16px; + width: 16px; + border-radius: 8px; + border-width: 0; +} + +#narrate-rate-input:active::-moz-range-thumb { + background-color: #2EA3FF; +} + +/* Voice selection */ + +.voiceselect { + width: 100%; +} + +.voiceselect > button.select-toggle, +.voiceselect > .options > button.option { + -moz-appearance: none; + border: none; + width: 100%; + min-height: 40px; +} + +.voiceselect.open > button.select-toggle { + border-bottom: 1px solid var(--border-color); +} + +.voiceselect > button.select-toggle::after { + content: ''; + background-image: url("chrome://global/skin/narrate/arrow.svg"); + background-position: center; + background-repeat: no-repeat; + background-size: 12px 12px; + display: inline-block; + width: 1.5em; + height: 1em; + vertical-align: middle; +} + +.voiceselect > .options > button.option:not(:first-child) { + border-top: 1px solid var(--border-color); +} + +.voiceselect > .options > button.option { + box-sizing: border-box; +} + +.voiceselect > .options:not(.hovering) > button.option:focus { + background-color: #eaeaea; +} + +.voiceselect > .options:not(.hovering) > button.option:hover:not(:focus) { + background-color: transparent; +} + +.voiceselect > .options > button.option::-moz-focus-inner { + outline: none; + border: 0; +} + +.voiceselect > .options { + display: none; + overflow-y: auto; +} + +.voiceselect.open > .options { + display: block; +} + +.current-voice { + color: #7f7f7f; +} + +.voiceselect:not(.open) > button, +.option:last-child { + border-radius: 0 0 3px 3px; +} diff --git a/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg deleted file mode 100644 index 2071381..0000000 --- a/arc-firefox-theme/chrome/global/reader/RM-Add-24x24.svg +++ /dev/null @@ -1,7 +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 24 24">
- <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M17.714,12.714h-5v5h-1.429v-5h-5v-1.429h5v-5h1.429v5h5V12.714z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg deleted file mode 100644 index 0ed3983..0000000 --- a/arc-firefox-theme/chrome/global/reader/RM-Delete-24x24.svg +++ /dev/null @@ -1,7 +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 24 24">
- <path fill-rule="evenodd" fill="#808080" d="M12,2C6.477,2,2,6.477,2,12c0,5.523,4.477,10,10,10s10-4.477,10-10 C22,6.477,17.523,2,12,2z M11.286,6.286 M6.286,12.714v-1.429h11.429v1.429H6.286z"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg b/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg deleted file mode 100644 index b43a8b8..0000000 --- a/arc-firefox-theme/chrome/global/reader/RM-Reading-List-24x24.svg +++ /dev/null @@ -1,12 +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 24 24">
- <rect x="8" y="10" fill="#808080" width="14" height="4"/>
- <rect x="8" y="16" fill="#808080" width="14" height="4"/>
- <rect x="8" y="4" fill="#808080" width="14" height="4"/>
- <circle fill="#808080" cx="4" cy="6" r="2"/>
- <circle fill="#808080" cx="4" cy="12" r="2"/>
- <circle fill="#808080" cx="4" cy="18" r="2"/>
-</svg>
diff --git a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css index dbb33a3..2b4a8df 100644 --- a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css +++ b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css @@ -23,19 +23,35 @@ body { margin-bottom: 0.5em; } +#refreshButton { + vertical-align: middle; +} + +/** Categories **/ + .category { cursor: pointer; + /* Center category names */ + display: flex; + align-items: center; } .category .category-name { pointer-events: none; } +#categories hr { + border-top-color: rgba(255,255,255,0.15); +} + +/** Warning container **/ + /* XXX: a lot of this is duplicated from info-pages.css since that stylesheet is incompatible with this type of layout */ .warningBackground:not([hidden]) { display: flex; } + .warningBackground { flex-direction: column; box-sizing: border-box; @@ -54,7 +70,7 @@ body { .title { position: relative; border-bottom: 1px solid var(--in-content-box-border-color); - margin-bottom: 2em; + margin-bottom: 1em; padding-bottom: 0.5em; } @@ -76,12 +92,14 @@ body { min-width: 100px; } +/** Content area **/ + .main-content { flex: 1; } .tab { - padding: 0.5em; + padding: 0.5em 0; } .tab table { @@ -89,9 +107,10 @@ body { width: 100%; } -hr { +th, td, table { + border-collapse: collapse; border: none; - border-bottom: 1px solid var(--in-content-box-border-color); + text-align: start; } th { @@ -99,12 +118,6 @@ th { font-size: larger; } -th, td, table { - border-collapse: collapse; - border: none; - text-align: start; -} - td { padding-bottom: 0.25em; border-bottom: 1px solid var(--in-content-box-border-color); diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css index a8a29b3..333d393 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css @@ -7,6 +7,7 @@ .main-content { padding-top: 0; -moz-padding-end: 0; + padding-bottom: 0; } #nav-header { @@ -133,6 +134,10 @@ padding-right: 20px; } +button.warning { + list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.svg"); +} + /*** category selector ***/ diff --git a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css index 7d6c056..95d59b3 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css @@ -88,23 +88,25 @@ margin-bottom: 20px; } -#continuePanel, -#restartPanel { +#buttonDeck { margin-top: 25px; - -moz-box-pack: end; - -moz-box-align: center; + -moz-box-align: stretch; + -moz-box-pack: stretch; } #continuePanel { -moz-box-pack: end; + -moz-box-align: end; } -#restartMessage { - text-align: right; +#restartPanel { + -moz-box-pack: end; + -moz-box-align: stretch; } -#restartSpacer { - -moz-box-flex: 1; +#restartPanelButtons { + margin-top: 25px; + -moz-box-pack: end; } #later { diff --git a/arc-firefox-theme/install.rdf b/arc-firefox-theme/install.rdf index 7e053b9..a0b7fdc 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>46.20160530</em:version> + <em:version>47.20160530</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>46.0</em:minVersion> - <em:maxVersion>48.0</em:maxVersion> + <em:minVersion>47.0</em:minVersion> + <em:maxVersion>49.0</em:maxVersion> </Description> </em:targetApplication> |
