From 246facd70f50119da43b3ccdff5bb7f25de8e66b Mon Sep 17 00:00:00 2001 From: Alex Mayer Date: Wed, 5 Apr 2017 12:47:28 -0400 Subject: Rework README File Use proper nesting of headers Fix image titles apearing with # in front Move AMO link into body copy so link doesnt look out of place --- README.md | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 4d14070..639df73 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,24 @@ # Arc Firefox Theme +Offical [Arc](https://github.com/horst3180/arc-theme) Firefox theme. -Offical [Arc](https://github.com/horst3180/Arc-theme) Firefox theme. - -#####Arc Firefox - +**Arc Firefox** ![alt tag](http://i.imgur.com/UjJabE3.png) -#####Arc Darker Firefox - +**Arc Darker Firefox** ![alt tag](http://i.imgur.com/5fMURDp.png) -#####Arc Dark Firefox - +**Arc Dark Firefox** ![alt tag](http://i.imgur.com/5HuYVUl.png) - -### Requirements +## Requirements This theme is compatible with Firefox 40+ and Firefox 38 ESR **Note**: This theme is meant to be used in conjunction with the [Arc GTK theme](https://github.com/horst3180/Arc-theme), don't use it with other GTK themes or it will look broken. -### Installation -The theme is available on addons.mozilla.org. - -[Arc Firefox collection on AMO](https://addons.mozilla.org/en/firefox/collections/horst3180/a/) - -#### Manual building and installation +## Installation +The theme is available as a collection on [addons.mozilla.org](https://addons.mozilla.org/en/firefox/collections/horst3180/a/). +### Manual building and installation These instructions are for testers and package maintainers. They also allow to install the theme globally for all users. You will need `autoconf` and `automake` for the following. @@ -55,7 +47,7 @@ Uninstall the theme with sudo make uninstall -#### Firefox ESR (Debian Stable users see here) +### Firefox ESR (Debian Stable users see here) This repo includes separate Firefox ESR compatible branches. The installation process is mostly identical to the manual installation above git clone https://github.com/horst3180/arc-firefox-theme && cd arc-firefox-theme -- cgit v1.2.3 From f2c105e4202f3e42e19c2b1923cf330779291c17 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 20 Apr 2017 01:23:12 +0200 Subject: update to 53.0 --- .../chrome/browser/Security-broken.png | Bin 928 -> 0 bytes arc-firefox-theme/chrome/browser/aboutNetError.css | 4 - arc-firefox-theme/chrome/browser/aboutSyncTabs.css | 4 + .../chrome/browser/actionicon-tab.png | Bin 236 -> 0 bytes .../chrome/browser/addons/addon-badge.svg | 19 + arc-firefox-theme/chrome/browser/browser.css | 125 ++--- arc-firefox-theme/chrome/browser/compacttheme.css | 476 +++++++++++++++++ .../browser/compacttheme/loading-inverted.png | Bin 0 -> 6399 bytes .../browser/compacttheme/loading-inverted@2x.png | Bin 0 -> 16408 bytes .../chrome/browser/controlcenter/panel.css | 6 +- .../chrome/browser/customizableui/panelUI.css | 29 +- arc-firefox-theme/chrome/browser/devedition.css | 462 ---------------- .../browser/downloads/allDownloadsViewOverlay.css | 2 +- .../chrome/browser/downloads/downloads.css | 6 +- .../browser/downloads/menubutton-dropmarker.svg | 8 - .../chrome/browser/feeds/subscribe-ui.css | 7 - arc-firefox-theme/chrome/browser/filters.svg | 9 - .../chrome/browser/newtab/whimsycorn.png | Bin 3875 -> 0 bytes .../chrome/browser/notification-icons.svg | 29 +- .../chrome/browser/places/autocomplete-star.png | Bin 636 -> 0 bytes .../chrome/browser/preferences/containers.css | 16 +- .../browser/preferences/in-content/containers.css | 2 +- .../browser/preferences/in-content/preferences.css | 39 +- .../chrome/browser/preferences/preferences.css | 3 +- .../chrome/browser/sass/_browser-sass.scss | 140 +++-- .../chrome/browser/sass/browser-dark.css | 125 ++--- .../chrome/browser/sass/browser-darker.css | 125 ++--- .../chrome/browser/sass/browser-light.css | 125 ++--- arc-firefox-theme/chrome/browser/searchReset.css | 2 +- arc-firefox-theme/chrome/browser/searchbar.css | 16 +- .../chrome/browser/social/gear_clicked.png | Bin 1262 -> 0 bytes .../chrome/browser/social/gear_default.png | Bin 1271 -> 0 bytes .../chrome/browser/social/share-button-active.png | Bin 1341 -> 0 bytes .../chrome/browser/social/share-button.png | Bin 1346 -> 0 bytes .../chrome/browser/syncProgress-menuPanel.png | Bin 25426 -> 0 bytes .../chrome/browser/syncProgress-menuPanel@2x.png | Bin 55953 -> 0 bytes .../browser/syncProgress-toolbar-inverted.png | Bin 14382 -> 0 bytes .../chrome/browser/syncProgress-toolbar.png | Bin 13293 -> 0 bytes .../chrome/browser/theme-switcher-icon.png | Bin 2084 -> 0 bytes .../chrome/browser/theme-switcher-icon@2x.png | Bin 5595 -> 0 bytes .../chrome/browser/webRTC-camera-white-16.png | Bin 3781 -> 0 bytes .../chrome/browser/webRTC-indicator.css | 10 +- .../chrome/browser/webRTC-microphone-white-16.png | Bin 3794 -> 0 bytes .../chrome/browser/webRTC-screen-white-16.png | Bin 3769 -> 0 bytes arc-firefox-theme/chrome/global/about.css | 1 + arc-firefox-theme/chrome/global/aboutReader.css | 13 - .../chrome/global/aboutReaderContent.css | 1 + .../chrome/global/aboutReaderControls.css | 11 +- arc-firefox-theme/chrome/global/autocomplete.css | 1 + .../chrome/global/datetimeinputpickers.css | 342 ++++++++++++ arc-firefox-theme/chrome/global/datetimepopup.css | 11 + arc-firefox-theme/chrome/global/filters.svg | 17 + arc-firefox-theme/chrome/global/findBar.css | 12 +- arc-firefox-theme/chrome/global/global.css | 14 + .../chrome/global/icons/calendar-arrows.svg | 13 + .../chrome/global/icons/find-arrows.svg | 25 +- .../chrome/global/icons/menubutton-dropmarker.svg | 8 + .../chrome/global/icons/spinner-arrows.svg | 13 + .../chrome/global/in-content/common.css | 2 +- .../chrome/global/in-content/info-pages.css | 1 + .../chrome/global/media/TopLevelVideoDocument.css | 2 +- .../chrome/global/media/closeCaptionButton.png | Bin 583 -> 0 bytes .../chrome/global/media/closeCaptionButton@2x.png | Bin 1335 -> 0 bytes .../chrome/global/media/closedCaptionButton.svg | 55 ++ arc-firefox-theme/chrome/global/media/error.png | Bin 433 -> 20345 bytes .../chrome/global/media/fullscreenButton.png | Bin 733 -> 0 bytes .../chrome/global/media/fullscreenButton.svg | 47 ++ .../chrome/global/media/fullscreenButton@2x.png | Bin 1759 -> 0 bytes .../chrome/global/media/muteButton.png | Bin 619 -> 0 bytes .../chrome/global/media/muteButton.svg | 56 ++ .../chrome/global/media/muteButton@2x.png | Bin 1185 -> 0 bytes arc-firefox-theme/chrome/global/media/noAudio.png | Bin 930 -> 0 bytes .../chrome/global/media/noAudio@2x.png | Bin 1756 -> 0 bytes .../chrome/global/media/pauseButton.png | Bin 269 -> 0 bytes .../chrome/global/media/pauseButton.svg | 36 ++ .../chrome/global/media/pauseButton@2x.png | Bin 434 -> 0 bytes .../chrome/global/media/playButton.png | Bin 448 -> 0 bytes .../chrome/global/media/playButton.svg | 37 ++ .../chrome/global/media/playButton@2x.png | Bin 831 -> 0 bytes .../chrome/global/media/scrubberThumb.png | Bin 562 -> 0 bytes .../chrome/global/media/scrubberThumb@2x.png | Bin 1354 -> 0 bytes .../chrome/global/media/scrubberThumbWide.png | Bin 563 -> 0 bytes .../chrome/global/media/scrubberThumbWide@2x.png | Bin 1396 -> 0 bytes .../chrome/global/media/unmuteButton.png | Bin 324 -> 0 bytes .../chrome/global/media/unmuteButton@2x.png | Bin 542 -> 0 bytes .../chrome/global/media/videocontrols.css | 578 +++++++++++---------- .../chrome/global/media/volume-empty.png | Bin 295 -> 0 bytes .../chrome/global/media/volume-empty@2x.png | Bin 268 -> 0 bytes .../chrome/global/media/volume-full.png | Bin 297 -> 0 bytes .../chrome/global/media/volume-full@2x.png | Bin 267 -> 0 bytes arc-firefox-theme/chrome/global/menu.css | 7 +- arc-firefox-theme/chrome/global/narrate.css | 2 +- arc-firefox-theme/chrome/global/notification.css | 125 ++++- .../global/reader/RM-Type-Controls-Arrow.svg | 16 +- arc-firefox-theme/chrome/global/timepicker.css | 153 ------ .../chrome/mozapps/aboutNetworking.css | 9 + arc-firefox-theme/chrome/mozapps/aboutProfiles.css | 1 + .../chrome/mozapps/downloads/downloads.css | 112 ---- 98 files changed, 2016 insertions(+), 1494 deletions(-) delete mode 100644 arc-firefox-theme/chrome/browser/Security-broken.png delete mode 100644 arc-firefox-theme/chrome/browser/actionicon-tab.png create mode 100644 arc-firefox-theme/chrome/browser/addons/addon-badge.svg create mode 100644 arc-firefox-theme/chrome/browser/compacttheme.css create mode 100644 arc-firefox-theme/chrome/browser/compacttheme/loading-inverted.png create mode 100644 arc-firefox-theme/chrome/browser/compacttheme/loading-inverted@2x.png delete mode 100644 arc-firefox-theme/chrome/browser/devedition.css delete mode 100644 arc-firefox-theme/chrome/browser/downloads/menubutton-dropmarker.svg delete mode 100644 arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css delete mode 100644 arc-firefox-theme/chrome/browser/filters.svg delete mode 100644 arc-firefox-theme/chrome/browser/newtab/whimsycorn.png delete mode 100644 arc-firefox-theme/chrome/browser/places/autocomplete-star.png delete mode 100644 arc-firefox-theme/chrome/browser/social/gear_clicked.png delete mode 100644 arc-firefox-theme/chrome/browser/social/gear_default.png delete mode 100644 arc-firefox-theme/chrome/browser/social/share-button-active.png delete mode 100644 arc-firefox-theme/chrome/browser/social/share-button.png delete mode 100644 arc-firefox-theme/chrome/browser/syncProgress-menuPanel.png delete mode 100644 arc-firefox-theme/chrome/browser/syncProgress-menuPanel@2x.png delete mode 100644 arc-firefox-theme/chrome/browser/syncProgress-toolbar-inverted.png delete mode 100644 arc-firefox-theme/chrome/browser/syncProgress-toolbar.png delete mode 100644 arc-firefox-theme/chrome/browser/theme-switcher-icon.png delete mode 100644 arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png delete mode 100644 arc-firefox-theme/chrome/browser/webRTC-camera-white-16.png delete mode 100644 arc-firefox-theme/chrome/browser/webRTC-microphone-white-16.png delete mode 100644 arc-firefox-theme/chrome/browser/webRTC-screen-white-16.png create mode 100644 arc-firefox-theme/chrome/global/datetimeinputpickers.css create mode 100644 arc-firefox-theme/chrome/global/datetimepopup.css create mode 100644 arc-firefox-theme/chrome/global/filters.svg create mode 100644 arc-firefox-theme/chrome/global/icons/calendar-arrows.svg create mode 100644 arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg create mode 100644 arc-firefox-theme/chrome/global/icons/spinner-arrows.svg delete mode 100644 arc-firefox-theme/chrome/global/media/closeCaptionButton.png delete mode 100644 arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png create mode 100644 arc-firefox-theme/chrome/global/media/closedCaptionButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/fullscreenButton.png create mode 100644 arc-firefox-theme/chrome/global/media/fullscreenButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/muteButton.png create mode 100644 arc-firefox-theme/chrome/global/media/muteButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/muteButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/noAudio.png delete mode 100644 arc-firefox-theme/chrome/global/media/noAudio@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/pauseButton.png create mode 100644 arc-firefox-theme/chrome/global/media/pauseButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/pauseButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/playButton.png create mode 100644 arc-firefox-theme/chrome/global/media/playButton.svg delete mode 100644 arc-firefox-theme/chrome/global/media/playButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumb.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumbWide.png delete mode 100644 arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/unmuteButton.png delete mode 100644 arc-firefox-theme/chrome/global/media/unmuteButton@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-empty.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-empty@2x.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-full.png delete mode 100644 arc-firefox-theme/chrome/global/media/volume-full@2x.png delete mode 100644 arc-firefox-theme/chrome/global/timepicker.css delete mode 100644 arc-firefox-theme/chrome/mozapps/downloads/downloads.css diff --git a/arc-firefox-theme/chrome/browser/Security-broken.png b/arc-firefox-theme/chrome/browser/Security-broken.png deleted file mode 100644 index 1ec110b..0000000 Binary files a/arc-firefox-theme/chrome/browser/Security-broken.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css index c0b76aa..3dd6f50 100644 --- a/arc-firefox-theme/chrome/browser/aboutNetError.css +++ b/arc-firefox-theme/chrome/browser/aboutNetError.css @@ -126,10 +126,6 @@ span#hostname { #automaticallyReportInFuture { cursor: pointer; - display: inline-block; - padding-inline-start: 2.3em; - text-indent: -2.3em; - line-height: 16px } #errorCode:not([href]) { diff --git a/arc-firefox-theme/chrome/browser/aboutSyncTabs.css b/arc-firefox-theme/chrome/browser/aboutSyncTabs.css index 4cedad6..18e2154 100644 --- a/arc-firefox-theme/chrome/browser/aboutSyncTabs.css +++ b/arc-firefox-theme/chrome/browser/aboutSyncTabs.css @@ -26,6 +26,10 @@ margin-inline-end: 2em; } +#headers:-moz-locale-dir(rtl) { + background-position-x: 100%; +} + #tabsListHeading { font-size: 140%; font-weight: bold; diff --git a/arc-firefox-theme/chrome/browser/actionicon-tab.png b/arc-firefox-theme/chrome/browser/actionicon-tab.png deleted file mode 100644 index 433c25e..0000000 Binary files a/arc-firefox-theme/chrome/browser/actionicon-tab.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/addons/addon-badge.svg b/arc-firefox-theme/chrome/browser/addons/addon-badge.svg new file mode 100644 index 0000000..5a62add --- /dev/null +++ b/arc-firefox-theme/chrome/browser/addons/addon-badge.svg @@ -0,0 +1,19 @@ + + + + + + diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css index 6ccccc4..e3de08a 100644 --- a/arc-firefox-theme/chrome/browser/browser.css +++ b/arc-firefox-theme/chrome/browser/browser.css @@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, # :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #home-button[cui-areatype="menu-panel"], @@ -1153,6 +1153,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); visibility: visible; } @@ -1162,12 +1165,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); - visibility: visible; } - #identity-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); } @@ -1197,6 +1194,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); visibility: visible; } @@ -1206,12 +1206,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); - visibility: visible; } - #identity-box { --identity-box-verified-color: #479900; --identity-box-chrome-color: #e57300; @@ -1280,9 +1274,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { #identity-box[sharing] > #identity-icon, #sharing-icon { - animation: 3s linear pulse infinite; } + animation: 3s linear identity-box-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */ +@keyframes identity-box-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -1330,24 +1325,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); } - -@media (min-resolution: 1.1dppx) { - .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } } -.popup-notification-icon { - width: 64px; - height: 64px; - margin-inline-end: 10px; } + list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); } .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme, #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } -.notification-anchor-icon:not(.plugin-blocked):not(:hover) { - opacity: .8; } - /* INDIVIDUAL NOTIFICATIONS */ .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon { @@ -1535,6 +1519,25 @@ html|*#webRTC-previewVideo { .addon-install-confirmation-name { font-weight: bold; } +.addon-webext-perm-header { + font-size: 1.3em; } + +.addon-webext-name { + font-weight: bold; + margin: 0; } + +.addon-addon-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/menuPanel.svg"); + -moz-image-region: rect(0px, 288px, 32px, 256px); } + +.addon-toolbar-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/Toolbar.png"); + -moz-image-region: rect(0, 486px, 18px, 468px); } + /* Notification icon box */ .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1732,12 +1735,12 @@ notification[value="translation"] menulist > .menulist-dropmarker { border-radius: 2px; border: 1px solid transparent; } -.autocomplete-richlistitem[selected=true] { - background-color: Highlight; } - .ac-title { font-size: 1.05em; } +.ac-separator, +.ac-url, +.ac-action, .ac-tags { font-size: 0.9em; } @@ -1748,18 +1751,11 @@ html|span.ac-tag { border: 1px solid transparent; padding: 0 1px; } -.ac-separator, -.ac-url, -.ac-action { - font-size: 0.9em; +.ac-separator:not([selected=true]), +.ac-url:not([selected=true]), +.ac-action:not([selected=true]) { color: -moz-nativehyperlinktext; } -.ac-title[selected=true], -.ac-separator[selected], -.ac-url[selected=true], -.ac-action[selected=true] { - color: inherit !important; } - .ac-tags-text[selected] > html|span.ac-tag { background-color: HighlightText; color: Highlight; } @@ -1775,26 +1771,14 @@ html|span.ac-emphasize-text-url { .ac-type-icon[type=bookmark][selected][current] { list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); } -.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=keyword], -.ac-site-icon[type=searchengine], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { +.ac-site-icon[type=searchengine] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); } .ac-type-icon[type=keyword][selected], -.ac-site-icon[type=searchengine][selected], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) { +.ac-site-icon[type=searchengine][selected] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); } -.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=switchtab], .ac-type-icon[type=remotetab] { list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); } @@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url { .tab-icon-image[sharing]:not([selected]), .tab-sharing-icon-overlay { - animation: 3s linear pulse infinite; } + animation: 3s linear tab-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */ +@keyframes tab-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url { .tab-icon-sound[muted], .tab-icon-sound[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .tab-icon-sound[muted] { @@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url { .tab-icon-sound:-moz-lwtheme-darktext[soundplaying], .tab-icon-sound:-moz-lwtheme-darktext[muted], .tab-icon-sound:-moz-lwtheme-darktext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying], .tab-icon-sound:-moz-lwtheme-brighttext[muted], .tab-icon-sound:-moz-lwtheme-brighttext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } .tab-icon-sound[soundplaying]:not(:hover), .tab-icon-sound[muted]:not(:hover), @@ -2454,7 +2439,7 @@ lwtHeader;*/ .alltabs-endimage[muted], .alltabs-endimage[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .alltabs-endimage[muted] { @@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button { /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS. 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 { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar { --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ --gcli-input-background: #fcfcfc; @@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button { --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus); /* --theme-command-line-image-focus */ } -:root[devtoolstheme="dark"] #developer-toolbar { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar { --gcli-background-color: #272b35; /* --theme-toolbar-background */ --gcli-input-background: #272b35; @@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, -:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, +#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon { @@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button { 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 { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { filter: invert(1); } #developer-toolbar-toolbox-button { @@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; - background-image: url("chrome://browser/skin/theme-switcher-icon.png"); + background-image: url("chrome://browser/content/default-theme-icon.svg"); background-size: contain; } #main-window[customize-entered] #customization-panel-container { @@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { padding-inline-start: 0; } .customization-lwtheme-menu-theme[defaulttheme] { - list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); } + list-style-image: url(chrome://browser/content/default-theme-icon.svg); } .customization-lwtheme-menu-theme[active="true"], .customization-lwtheme-menu-theme:hover { @@ -4086,7 +4071,7 @@ notification.heartbeat { width: 16px; } /** - * Override the --panel-arrowcontent-padding so the background extends + * Override the --arrowpanel-padding so the background extends * to the sides and bottom of the panel. */ #UITourTooltipButtons { @@ -4105,7 +4090,7 @@ notification.heartbeat { width: 16px; height: 16px; margin: 7px; - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #context-back { diff --git a/arc-firefox-theme/chrome/browser/compacttheme.css b/arc-firefox-theme/chrome/browser/compacttheme.css new file mode 100644 index 0000000..12789d0 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/compacttheme.css @@ -0,0 +1,476 @@ + + +/* compacttheme.css is loaded in browser.xul after browser.css when it is + preffed on. The bulk of the styling is here in the shared file, but + there are overrides for each platform in their compacttheme.css files. */ + +:root { + --tab-toolbar-navbar-overlap: 0px; + --navbar-tab-toolbar-highlight-overlap: 0px; + --space-above-tabbar: 0px; + --toolbarbutton-text-shadow: none; + --backbutton-urlbar-overlap: 0px; +} + +:root:-moz-lwtheme-brighttext { + /* Chrome */ + --chrome-background-color: #272b35; + --chrome-color: #F5F7FA; + --chrome-secondary-background-color: #393F4C; + --chrome-navigator-toolbox-separator-color: rgba(0,0,0,.2); + --chrome-nav-bar-separator-color: rgba(0,0,0,.2); + --chrome-nav-buttons-background: #252C33; + --chrome-nav-buttons-hover-background: #1B2127; + --chrome-nav-bar-controls-border-color: #1D2328; + --chrome-selection-color: #fff; + --chrome-selection-background-color: #5675B9; + + /* Tabs */ + --tabs-toolbar-color: #F5F7FA; + --tab-background-color: #272b35; + --tab-hover-background-color: #07090a; + --tab-selection-color: #f5f7fa; + --tab-selection-background-color: #5675B9; + --tab-selection-box-shadow: none; + --pinned-tab-glow: radial-gradient(22px at center calc(100% - 2px), rgba(76,158,217,0.9) 13%, rgba(0,0,0,0.4) 16%, transparent 70%); + + /* Url and search bars */ + --url-and-searchbar-background-color: #171B1F; + --urlbar-separator-color: #5F6670; + --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); + --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px); + --urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px); + --urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px); + --urlbar-dropmarker-2x-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); + --urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px); + --urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px); + --urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px); +} + +/* Override the lwtheme-specific styling for toolbar buttons */ +:root:-moz-lwtheme-brighttext, +toolbar:-moz-lwtheme-brighttext { + --toolbarbutton-hover-background: rgba(25,33, 38,.6) linear-gradient(rgba(25,33,38,.6), rgba(25,33,38,.6)) padding-box; + --toolbarbutton-hover-boxshadow: none; + --toolbarbutton-hover-bordercolor: rgba(25,33,38,.6); + --toolbarbutton-active-background: rgba(25,33,38,1) linear-gradient(rgba(25,33,38,1), rgba(25,33,38,1)) border-box; + --toolbarbutton-active-boxshadow: none; + --toolbarbutton-active-bordercolor: rgba(25,33,38,.8); + --toolbarbutton-checkedhover-backgroundcolor: #3C5283; + +} + +:root:-moz-lwtheme-darktext { + --url-and-searchbar-background-color: #fff; + + --chrome-background-color: #E3E4E6; + --chrome-color: #18191a; + --chrome-secondary-background-color: #f5f6f7; + --chrome-navigator-toolbox-separator-color: #cccccc; + --chrome-nav-bar-separator-color: #B6B6B8; + --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; + --chrome-selection-background-color: #4c9ed9; + + --tab-background-color: #E3E4E6; + --tab-hover-background-color: #D7D8DA; + --tab-selection-color: #f5f7fa; + --tab-selection-background-color: #4c9ed9; + --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%); +} + +/* Override the lwtheme-specific styling for toolbar buttons */ +:root:-moz-lwtheme-darktext, +toolbar:-moz-lwtheme-darktext { + --toolbarbutton-hover-background: #eaeaea; + --toolbarbutton-hover-boxshadow: none; + --toolbarbutton-hover-bordercolor: rgba(0,0,0,0.1); + --toolbarbutton-active-background: #d7d7d8 border-box; + --toolbarbutton-active-boxshadow: none; + --toolbarbutton-active-bordercolor: rgba(0,0,0,0.15); + --toolbarbutton-checkedhover-backgroundcolor: #d7d7d8; +} + +/* Give some space to drag the window around while customizing + (normal space to left and right of tabs doesn't work in this case) */ +#main-window[tabsintitlebar][customizing] { + --space-above-tabbar: 9px; +} + +/* Override @tabCurveHalfWidth@ and @tabCurveWidth@. XXX: Switch to a CSS variable once the perf is sorted out - bug 1088771 */ +.tab-background-middle { + border-left-width: 0; + border-right-width: 0; + margin: 0; +} + +.tab-background, +.tabs-newtab-button { + margin-inline-end: 0; + margin-inline-start: 0; +} + +.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox { + padding-inline-end: 0; + padding-inline-start: 0; +} + +.tab-background-start[selected=true]::after, +.tab-background-start[selected=true]::before, +.tab-background-start, +.tab-background-end, +.tab-background-end[selected=true]::after, +.tab-background-end[selected=true]::before { + width: 0; +} + +.tab-background-start[selected=true]::after, +.tab-background-end[selected=true]::after { + margin-inline-start: 0; +} +/* End override @tabCurveHalfWidth@ and @tabCurveWidth@ */ + +#urlbar ::-moz-selection, +#navigator-toolbox .searchbar-textbox ::-moz-selection, +.browserContainer > findbar ::-moz-selection { + background-color: var(--chrome-selection-background-color); + color: var(--chrome-selection-color); +} + +/* Change the base colors for the browser chrome */ + +#tabbrowser-tabs, +#TabsToolbar, +#browser-panel { + background: var(--chrome-background-color); + color: var(--chrome-color); +} + +#navigator-toolbox:-moz-lwtheme::after { + border-bottom-color: var(--chrome-navigator-toolbox-separator-color); +} + +#navigator-toolbox > toolbar:not(#TabsToolbar):not(#toolbar-menubar), +.browserContainer > findbar, +#browser-bottombox { + background-color: var(--chrome-secondary-background-color) !important; + background-image: none !important; + color: var(--chrome-color); +} + +/* Default findbar text color doesn't look good - Bug 1125677 */ +.browserContainer > findbar .findbar-find-status, +.browserContainer > findbar .found-matches { + color: inherit; +} + +#navigator-toolbox .toolbarbutton-1, +.browserContainer > findbar .findbar-button, +#PlacesToolbar toolbarbutton.bookmark-item { + color: var(--chrome-color); + text-shadow: var(--toolbarbutton-text-shadow); +} + +/* Using toolbar[brighttext] instead of important to override linux */ +toolbar[brighttext] #downloads-indicator-counter { + text-shadow: var(--toolbarbutton-text-shadow); + color: var(--chrome-color); +} + +#TabsToolbar { + text-shadow: none !important; +} + +/* URL bar and search bar*/ +#urlbar, +#navigator-toolbox .searchbar-textbox { + background-color: var(--url-and-searchbar-background-color) !important; + background-image: none !important; + color: inherit !important; + border: 1px solid var(--chrome-nav-bar-controls-border-color) !important; + box-shadow: none !important; +} + + +#identity-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-white); +} + +#identity-box:hover > #identity-icon:not(.no-hover):-moz-lwtheme-brighttext, +#identity-box[open=true] > #identity-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/identity-icon.svg#hover-white); +} + +#identity-box.grantedPermissions > #identity-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-white); +} + +#identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover):-moz-lwtheme-brighttext, +#identity-box.grantedPermissions[open=true] > #identity-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-hover-white); +} + +#urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://branding/content/identity-icons-brand.svg); +} + + +#tracking-protection-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#enabled-white); +} + +#tracking-protection-icon[state="loaded-tracking-content"]:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#disabled-white); +} + + +#urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon:-moz-lwtheme-brighttext, +#urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon:-moz-lwtheme-brighttext, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/connection-secure.svg); + visibility: visible; +} + +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme-brighttext, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme-brighttext, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme-brighttext, +#urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-white); + visibility: visible; +} + +#urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon:-moz-lwtheme-brighttext, +#urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon:-moz-lwtheme-brighttext { + list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-white); + visibility: visible; +} + +#urlbar { + border-inline-start: none !important; + opacity: 1 !important; +} + +window:not([chromehidden~="toolbar"]) #urlbar-wrapper { + overflow: -moz-hidden-unscrollable; + clip-path: none; + margin-inline-start: 0; +} + +window:not([chromehidden~="toolbar"]) #urlbar-wrapper:-moz-locale-dir(rtl), +window:not([chromehidden~="toolbar"]) #urlbar-wrapper > #urlbar:-moz-locale-dir(rtl) { + /* Resolves text blurring issue when hovering, see bug 1340206 */ + transform: none; + /* For some reason, this property must be specified here, even though the same + value is set in the previous rule set. o_O */ + margin-inline-start: 0; +} + +#urlbar-zoom-button:-moz-lwtheme-brighttext:hover { + background-color: rgba(255,255,255,.2); +} + +#urlbar-zoom-button:-moz-lwtheme-brighttext:hover:active { + background-color: rgba(255,255,255,.3); +} + +/* Nav bar specific stuff */ +#nav-bar { + margin-top: 0 !important; + border-top: none !important; + border-bottom: none !important; + border-radius: 0 !important; + box-shadow: 0 -1px var(--chrome-nav-bar-separator-color) !important; +} + +/* No extra vertical padding for nav bar */ +#nav-bar { + padding-top: 0; + padding-bottom: 0; +} + +/* Use smaller back button icon */ +#back-button { + -moz-image-region: rect(0, 54px, 18px, 36px); +} + +@media (min-resolution: 1.1dppx) { + #back-button { + -moz-image-region: rect(0, 108px, 36px, 72px); + } +} + +.tab-background { + visibility: hidden; +} + +/* Tab separators */ +.tabbrowser-tab::after, +.tabbrowser-tab::before { + background: currentColor; + opacity: 0.2 !important; +} + +.tabbrowser-arrowscrollbox > .scrollbutton-down, +.tabbrowser-arrowscrollbox > .scrollbutton-up { + background-color: var(--tab-background-color); + border-color: transparent; +} + +.tabbrowser-tab { + /* We normally rely on other tab elements for pointer events, but this + theme hides those so we need it set here instead */ + pointer-events: auto; +} + +.tabbrowser-tab:-moz-any([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), +.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { + background-image: var(--pinned-tab-glow); + background-position: center; + background-size: 100%; +} + +.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([selected="true"]) { + background-position: left bottom var(--tab-toolbar-navbar-overlap); + background-size: 34px 100%; +} + +.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover, +.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover, +.tabbrowser-tab:hover { + background-color: var(--tab-hover-background-color); +} + +.tabbrowser-tab[visuallyselected] { + color: var(--tab-selection-color) !important; /* Override color: inherit */ + background-color: var(--tab-selection-background-color); +} + +.tab-throbber[selected][progress] { + list-style-image: url("chrome://browser/skin/compacttheme/loading-inverted.png"); +} + +@media (min-resolution: 1.1dppx) { + .tab-throbber[selected][progress] { + list-style-image: url("chrome://browser/skin/compacttheme/loading-inverted@2x.png"); + } +} + +.tab-icon-sound[soundplaying], +.tab-icon-sound[muted] { + filter: url(chrome://global/skin/filters.svg#fill) !important; /* removes drop-shadow filter */ +} + +/* Don't need space for the tab curves (66px - 30px) */ +.tabs-newtab-button { + width: 36px; +} + +.tabs-newtab-button:hover { + /* Important needed because !important is used in browser.css */ + background-color: var(--tab-hover-background-color) !important; + background-image: none; +} + +:root { + --forwardbutton-width: 29px; +} + +:root:-moz-lwtheme-darktext { + --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); + --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px); + --urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px); + --urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px); + --urlbar-dropmarker-2x-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); + --urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px); + --urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px); + --urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px); +} + +.findbar-closebutton:-moz-lwtheme-brighttext:not(:hover), +#sidebar-header > .close-icon:-moz-lwtheme-brighttext:not(:hover), +.tab-close-button[selected]:not(:hover) { + background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); +} + +/* The menubar and tabs toolbar should match the devedition theme */ +#TabsToolbar, +#toolbar-menubar { + -moz-appearance: none !important; +} +#main-menubar { + color: var(--chrome-color); +} +#main-menubar > menu:not([open]) { + color: inherit; +} + +/* Allow buttons with -moz-appearance set to look normal on hover and open states */ +#navigator-toolbox .toolbarbutton-1:-moz-any(:hover, [open="true"]), +#PlacesToolbar toolbarbutton.bookmark-item:-moz-any(:hover, [open="true"]) { + color: initial; +} + +/* Square back and forward buttons */ +#back-button > .toolbarbutton-icon, +#forward-button > .toolbarbutton-icon { + margin: 0; + border: 1px solid var(--chrome-nav-bar-controls-border-color); + padding: 2px 5px; + background: var(--chrome-nav-buttons-background); + box-shadow: none !important; +} + +#forward-button > .toolbarbutton-icon { + border-inline-start: none; +} + +/* Override a box shadow for disabled back button */ +#main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon { + box-shadow: none !important; +} + +#back-button:hover:not([disabled="true"]) > .toolbarbutton-icon, +#forward-button:hover:not([disabled="true"]) > .toolbarbutton-icon { + background: var(--chrome-nav-buttons-hover-background) !important; +} + +#back-button > .toolbarbutton-icon { + border-radius: 2px 0 0 2px !important; +} + +.urlbar-history-dropmarker { + -moz-appearance: none; + padding: 0 3px; + list-style-image: var(--urlbar-dropmarker-url); + -moz-image-region: var(--urlbar-dropmarker-region); +} + +/* Add the proper background for tab overflow */ +#alltabs-button, +#new-tab-button { + background: var(--chrome-background-color); +} + +#new-tab-button:hover > .toolbarbutton-icon { + border-color: transparent !important; +} + +/* Prevent double border below tabs toolbar */ +#TabsToolbar:not([collapsed="true"]) + #nav-bar { + border-top-width: 0 !important; +} + +/* Fix the bad-looking text-shadow in the sidebar header: */ +.sidebar-header, +#sidebar-header { + text-shadow: none; +} + +.ac-type-icon { + /* Left-align the type icon in awesomebar popup results with the icon in the + urlbar. */ + margin-inline-start: 11px; +} diff --git a/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted.png b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted.png new file mode 100644 index 0000000..b9ee1a7 Binary files /dev/null and b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted.png differ diff --git a/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted@2x.png b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted@2x.png new file mode 100644 index 0000000..852c4ee Binary files /dev/null and b/arc-firefox-theme/chrome/browser/compacttheme/loading-inverted@2x.png differ diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css index 0488442..4d8f112 100644 --- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css +++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css @@ -102,7 +102,7 @@ #identity-popup-permissions-content, #tracking-protection-content { padding: 0.5em 0 1em; - /* .identity-popup-headline.host depends on this width */ + /* .identity-popup-host depends on this width */ padding-inline-start: calc(2em + 24px); padding-inline-end: 1em; } @@ -181,7 +181,7 @@ font-size: 150%; } -.identity-popup-headline.host { +.identity-popup-host { word-wrap: break-word; /* 1em + 2em + 24px is #identity-popup-security-content padding * 30em is .panel-mainview:not([panelid="PanelUI-popup"]) width */ @@ -422,7 +422,7 @@ description#identity-popup-content-verifier, width: 16px; height: 16px; list-style-image: url(chrome://browser/skin/panel-icons.svg#cancel); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: graytext; } diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUI.css b/arc-firefox-theme/chrome/browser/customizableui/panelUI.css index 17faf34..6555340 100644 --- a/arc-firefox-theme/chrome/browser/customizableui/panelUI.css +++ b/arc-firefox-theme/chrome/browser/customizableui/panelUI.css @@ -147,6 +147,11 @@ filter: none; } +#PanelUI-menu-button[badge-status="addon-alert"] > .toolbarbutton-badge-stack > .toolbarbutton-badge { + height: 13px; + background: transparent url(chrome://browser/skin/addons/addon-badge.svg) no-repeat center; +} + .panel-subviews { padding: 4px; background-clip: padding-box; @@ -553,7 +558,8 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { top: 25%; } -#PanelUI-update-status[update-status]::after { +#PanelUI-update-status[update-status]::after, +#PanelUI-footer-addons > toolbarbutton::after { content: ""; width: 14px; height: 14px; @@ -574,6 +580,24 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { background-color: #D90000; } +#PanelUI-footer-addons > toolbarbutton { + background-color: #C7F5FF; + display: flex; + flex: 1 1 0%; + width: calc(22.35em + 30px); + padding-inline-start: 15px; + border-inline-start-style: none; +} + +#PanelUI-footer-addons > toolbarbutton > .toolbarbutton-icon { + width: 14px; + height: 14px; +} + +#PanelUI-footer-addons > toolbarbutton::after { + background-image: url(chrome://browser/skin/addons/addon-badge.svg); +} + #PanelUI-fxa-status { display: flex; flex: 1 1 0%; @@ -608,6 +632,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-help, #PanelUI-fxa-label, #PanelUI-fxa-icon, +#PanelUI-footer-addons > toolbarbutton, #PanelUI-customize, #PanelUI-quit { margin: 0; @@ -669,6 +694,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { } #PanelUI-fxa-label, +#PanelUI-footer-addons > toolbarbutton, #PanelUI-customize { flex: 1; padding-inline-start: 15px; @@ -833,6 +859,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { #PanelUI-fxa-label, #PanelUI-fxa-icon, +#PanelUI-footer-addons > toolbarbutton, #PanelUI-customize, #PanelUI-help, #PanelUI-quit { diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css deleted file mode 100644 index 43603c1..0000000 --- a/arc-firefox-theme/chrome/browser/devedition.css +++ /dev/null @@ -1,462 +0,0 @@ - - -/* devedition.css is loaded in browser.xul after browser.css when it is - preffed on. The bulk of the styling is here in the shared file, but - there are overrides for each platform in their devedition.css files. */ - -:root { - --tab-toolbar-navbar-overlap: 0px; - --navbar-tab-toolbar-highlight-overlap: 0px; - --space-above-tabbar: 0px; - --toolbarbutton-text-shadow: none; - --backbutton-urlbar-overlap: 0px; -} - -:root[devtoolstheme="dark"] { - /* Chrome */ - --chrome-background-color: #272b35; - --chrome-color: #F5F7FA; - --chrome-secondary-background-color: #393F4C; - --chrome-navigator-toolbox-separator-color: rgba(0,0,0,.2); - --chrome-nav-bar-separator-color: rgba(0,0,0,.2); - --chrome-nav-buttons-background: #252C33; - --chrome-nav-buttons-hover-background: #1B2127; - --chrome-nav-bar-controls-border-color: #1D2328; - --chrome-selection-color: #fff; - --chrome-selection-background-color: #5675B9; - - /* Tabs */ - --tabs-toolbar-color: #F5F7FA; - --tab-background-color: #272b35; - --tab-hover-background-color: #07090a; - --tab-selection-color: #f5f7fa; - --tab-selection-background-color: #5675B9; - --tab-selection-box-shadow: none; - --pinned-tab-glow: radial-gradient(22px at center calc(100% - 2px), rgba(76,158,217,0.9) 13%, rgba(0,0,0,0.4) 16%, transparent 70%); - - /* Url and search bars */ - --url-and-searchbar-background-color: #171B1F; - --urlbar-separator-color: #5F6670; - --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); - --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px); - --urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px); - --urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px); - --urlbar-dropmarker-2x-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); - --urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px); - --urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px); - --urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px); -} - -/* Override the lwtheme-specific styling for toolbar buttons */ -:root[devtoolstheme="dark"], -:root[devtoolstheme="dark"] toolbar:-moz-lwtheme { - --toolbarbutton-hover-background: rgba(25,33, 38,.6) linear-gradient(rgba(25,33,38,.6), rgba(25,33,38,.6)) padding-box; - --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-hover-bordercolor: rgba(25,33,38,.6); - --toolbarbutton-active-background: rgba(25,33,38,1) linear-gradient(rgba(25,33,38,1), rgba(25,33,38,1)) border-box; - --toolbarbutton-active-boxshadow: none; - --toolbarbutton-active-bordercolor: rgba(25,33,38,.8); - --toolbarbutton-checkedhover-backgroundcolor: #3C5283; - -} - -:root[devtoolstheme="light"] { - --url-and-searchbar-background-color: #fff; - - --chrome-background-color: #E3E4E6; - --chrome-color: #18191a; - --chrome-secondary-background-color: #f5f6f7; - --chrome-navigator-toolbox-separator-color: #cccccc; - --chrome-nav-bar-separator-color: #B6B6B8; - --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; - --chrome-selection-background-color: #4c9ed9; - - --tab-background-color: #E3E4E6; - --tab-hover-background-color: #D7D8DA; - --tab-selection-color: #f5f7fa; - --tab-selection-background-color: #4c9ed9; - --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%); -} - -/* Override the lwtheme-specific styling for toolbar buttons */ -:root[devtoolstheme="light"], -:root[devtoolstheme="light"] toolbar:-moz-lwtheme { - --toolbarbutton-hover-background: #eaeaea; - --toolbarbutton-hover-boxshadow: none; - --toolbarbutton-hover-bordercolor: rgba(0,0,0,0.1); - --toolbarbutton-active-background: #d7d7d8 border-box; - --toolbarbutton-active-boxshadow: none; - --toolbarbutton-active-bordercolor: rgba(0,0,0,0.15); - --toolbarbutton-checkedhover-backgroundcolor: #d7d7d8; -} - -/* Give some space to drag the window around while customizing - (normal space to left and right of tabs doesn't work in this case) */ -#main-window[tabsintitlebar][customizing] { - --space-above-tabbar: 9px; -} - -/* Override @tabCurveHalfWidth@ and @tabCurveWidth@. XXX: Switch to a CSS variable once the perf is sorted out - bug 1088771 */ -.tab-background-middle { - border-left-width: 0; - border-right-width: 0; - margin: 0; -} - -.tab-background, -.tabs-newtab-button { - margin-inline-end: 0; - margin-inline-start: 0; -} - -.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox { - padding-inline-end: 0; - padding-inline-start: 0; -} - -.tab-background-start[selected=true]::after, -.tab-background-start[selected=true]::before, -.tab-background-start, -.tab-background-end, -.tab-background-end[selected=true]::after, -.tab-background-end[selected=true]::before { - width: 0; -} - -.tab-background-start[selected=true]::after, -.tab-background-end[selected=true]::after { - margin-inline-start: 0; -} -/* End override @tabCurveHalfWidth@ and @tabCurveWidth@ */ - -#urlbar ::-moz-selection, -#navigator-toolbox .searchbar-textbox ::-moz-selection, -.browserContainer > findbar ::-moz-selection { - background-color: var(--chrome-selection-background-color); - color: var(--chrome-selection-color); -} - -/* Change the base colors for the browser chrome */ - -#tabbrowser-tabs, -#TabsToolbar, -#browser-panel { - background: var(--chrome-background-color); - color: var(--chrome-color); -} - -#navigator-toolbox:-moz-lwtheme::after { - border-bottom-color: var(--chrome-navigator-toolbox-separator-color); -} - -#navigator-toolbox > toolbar:not(#TabsToolbar):not(#toolbar-menubar), -.browserContainer > findbar, -#browser-bottombox { - background-color: var(--chrome-secondary-background-color) !important; - background-image: none !important; - color: var(--chrome-color); -} - -/* Default findbar text color doesn't look good - Bug 1125677 */ -.browserContainer > findbar .findbar-find-status, -.browserContainer > findbar .found-matches { - color: inherit; -} - -#navigator-toolbox .toolbarbutton-1, -.browserContainer > findbar .findbar-button, -#PlacesToolbar toolbarbutton.bookmark-item { - color: var(--chrome-color); - text-shadow: var(--toolbarbutton-text-shadow); -} - -/* Using toolbar[brighttext] instead of important to override linux */ -toolbar[brighttext] #downloads-indicator-counter { - text-shadow: var(--toolbarbutton-text-shadow); - color: var(--chrome-color); -} - -#TabsToolbar { - text-shadow: none !important; -} - -/* URL bar and search bar*/ -#urlbar, -#navigator-toolbox .searchbar-textbox { - background-color: var(--url-and-searchbar-background-color) !important; - background-image: none !important; - color: inherit !important; - border: 1px solid var(--chrome-nav-bar-controls-border-color) !important; - box-shadow: none !important; -} - - -:root[devtoolstheme="dark"] #identity-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-white); -} - -:root[devtoolstheme="dark"] #identity-box:hover > #identity-icon:not(.no-hover):-moz-lwtheme, -:root[devtoolstheme="dark"] #identity-box[open=true] > #identity-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/identity-icon.svg#hover-white); -} - -:root[devtoolstheme="dark"] #identity-box.grantedPermissions > #identity-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-white); -} - -:root[devtoolstheme="dark"] #identity-box.grantedPermissions:hover > #identity-icon:not(.no-hover):-moz-lwtheme, -:root[devtoolstheme="dark"] #identity-box.grantedPermissions[open=true] > #identity-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/identity-icon.svg#notice-hover-white); -} - -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.chromeUI > #identity-icon:-moz-lwtheme { - list-style-image: url(chrome://branding/content/identity-icons-brand.svg); -} - - -:root[devtoolstheme="dark"] #tracking-protection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#enabled-white); -} - -:root[devtoolstheme="dark"] #tracking-protection-icon[state="loaded-tracking-content"]:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/tracking-protection-16.svg#disabled-white); -} - - -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.verifiedDomain > #connection-icon:-moz-lwtheme, -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.verifiedIdentity > #connection-icon:-moz-lwtheme, -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedActiveBlocked > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-secure.svg); - visibility: visible; -} - -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-white); - visibility: visible; -} - -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.insecureLoginForms > #connection-icon:-moz-lwtheme, -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedActiveContent > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-white); - visibility: visible; -} - -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, -:root[devtoolstheme="dark"] #urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-white); - visibility: visible; -} - -#urlbar { - border-inline-start: none !important; - opacity: 1 !important; -} - -window:not([chromehidden~="toolbar"]) #urlbar-wrapper { - overflow: -moz-hidden-unscrollable; - clip-path: none; - margin-inline-start: 0; -} - -:root[devtoolstheme="dark"] #urlbar-zoom-button:hover { - background-color: rgba(255,255,255,.2); -} - -:root[devtoolstheme="dark"] #urlbar-zoom-button:hover:active { - background-color: rgba(255,255,255,.3); -} - -/* Nav bar specific stuff */ -#nav-bar { - margin-top: 0 !important; - border-top: none !important; - border-bottom: none !important; - border-radius: 0 !important; - box-shadow: 0 -1px var(--chrome-nav-bar-separator-color) !important; -} - -/* No extra vertical padding for nav bar */ -#nav-bar-customization-target, -#nav-bar { - padding-top: 0; - padding-bottom: 0; -} - -/* Use smaller back button icon */ -#back-button { - -moz-image-region: rect(0, 54px, 18px, 36px); -} - -@media (min-resolution: 1.1dppx) { - #back-button { - -moz-image-region: rect(0, 108px, 36px, 72px); - } -} - -.tab-background { - visibility: hidden; -} - -/* Tab separators */ -.tabbrowser-tab::after, -.tabbrowser-tab::before { - background: currentColor; - opacity: 0.2 !important; -} - -.tabbrowser-arrowscrollbox > .scrollbutton-down, -.tabbrowser-arrowscrollbox > .scrollbutton-up { - background-color: var(--tab-background-color); - border-color: transparent; -} - -.tabbrowser-tab { - /* We normally rely on other tab elements for pointer events, but this - theme hides those so we need it set here instead */ - pointer-events: auto; -} - -.tabbrowser-tab:-moz-any([image], [pinned]) > .tab-stack > .tab-content[attention]:not([selected="true"]), -.tabbrowser-tab > .tab-stack > .tab-content[pinned][titlechanged]:not([selected="true"]) { - background-image: var(--pinned-tab-glow); - background-position: center; - background-size: 100%; -} - -.tabbrowser-tab[image] > .tab-stack > .tab-content[attention]:not([pinned]):not([selected="true"]) { - background-position: left bottom var(--tab-toolbar-navbar-overlap); - background-size: 34px 100%; -} - -.tabbrowser-arrowscrollbox > .scrollbutton-down:not([disabled]):hover, -.tabbrowser-arrowscrollbox > .scrollbutton-up:not([disabled]):hover, -.tabbrowser-tab:hover { - background-color: var(--tab-hover-background-color); -} - -.tabbrowser-tab[visuallyselected] { - color: var(--tab-selection-color) !important; /* Override color: inherit */ - background-color: var(--tab-selection-background-color); -} - -.tab-icon-sound[soundplaying], -.tab-icon-sound[muted] { - filter: url(chrome://browser/skin/filters.svg#fill) !important; /* removes drop-shadow filter */ -} - -/* Don't need space for the tab curves (66px - 30px) */ -.tabs-newtab-button { - width: 36px; -} - -.tabs-newtab-button:hover { - /* Important needed because !important is used in browser.css */ - background-color: var(--tab-hover-background-color) !important; - background-image: none; -} - -:root { - --forwardbutton-width: 29px; -} - -:root[devtoolstheme="light"] { - --urlbar-dropmarker-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); - --urlbar-dropmarker-region: rect(0px, 11px, 14px, 0px); - --urlbar-dropmarker-hover-region: rect(0, 22px, 14px, 11px); - --urlbar-dropmarker-active-region: rect(0px, 33px, 14px, 22px); - --urlbar-dropmarker-2x-url: url("chrome://browser/skin/devedition/urlbar-history-dropmarker.svg"); - --urlbar-dropmarker-2x-region: rect(0px, 11px, 14px, 0px); - --urlbar-dropmarker-hover-2x-region: rect(0, 22px, 14px, 11px); - --urlbar-dropmarker-active-2x-region: rect(0px, 33px, 14px, 22px); -} - -:root[devtoolstheme="dark"] .findbar-closebutton:not(:hover), -:root[devtoolstheme="dark"] #sidebar-header > .close-icon:not(:hover), -.tab-close-button[selected]:not(:hover) { - background-image: -moz-image-rect(url("chrome://global/skin/icons/close.svg"), 0, 80, 16, 64); -} - -/* The menubar and tabs toolbar should match the devedition theme */ -#TabsToolbar, -#toolbar-menubar { - -moz-appearance: none !important; -} -#main-menubar { - color: var(--chrome-color); -} -#main-menubar > menu:not([open]) { - color: inherit; -} - -/* Allow buttons with -moz-appearance set to look normal on hover and open states */ -#navigator-toolbox .toolbarbutton-1:-moz-any(:hover, [open="true"]), -#PlacesToolbar toolbarbutton.bookmark-item:-moz-any(:hover, [open="true"]) { - color: initial; -} - -/* Square back and forward buttons */ -#back-button > .toolbarbutton-icon, -#forward-button > .toolbarbutton-icon { - margin: 0; - border: 1px solid var(--chrome-nav-bar-controls-border-color); - padding: 2px 5px; - background: var(--chrome-nav-buttons-background); - box-shadow: none !important; -} - -#forward-button > .toolbarbutton-icon { - border-inline-start: none; -} - -/* Override a box shadow for disabled back button */ -#main-window:not([customizing]) #back-button[disabled] > .toolbarbutton-icon { - box-shadow: none !important; -} - -#back-button:hover:not([disabled="true"]) > .toolbarbutton-icon, -#forward-button:hover:not([disabled="true"]) > .toolbarbutton-icon { - background: var(--chrome-nav-buttons-hover-background) !important; -} - -#back-button > .toolbarbutton-icon { - border-radius: 2px 0 0 2px !important; -} - -.urlbar-history-dropmarker { - -moz-appearance: none; - padding: 0 3px; - list-style-image: var(--urlbar-dropmarker-url); - -moz-image-region: var(--urlbar-dropmarker-region); -} - -/* Add the proper background for tab overflow */ -#alltabs-button, -#new-tab-button { - background: var(--chrome-background-color); -} - -#new-tab-button:hover > .toolbarbutton-icon { - border-color: transparent !important; -} - -/* Prevent double border below tabs toolbar */ -#TabsToolbar:not([collapsed="true"]) + #nav-bar { - border-top-width: 0 !important; -} - -/* Fix the bad-looking text-shadow in the sidebar header: */ -.sidebar-header, -#sidebar-header { - text-shadow: none; -} - -.ac-type-icon { - /* Left-align the type icon in awesomebar popup results with the icon in the - urlbar. */ - margin-inline-start: 11px; -} diff --git a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css index 2b23903..1637216 100644 --- a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css +++ b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css @@ -83,7 +83,7 @@ richlistitem.download > toolbarseparator { width: 16px; height: 16px; margin: 0; - filter: url("chrome://browser/skin/filters.svg#fill"); + filter: url("chrome://global/skin/filters.svg#fill"); fill: currentColor; } diff --git a/arc-firefox-theme/chrome/browser/downloads/downloads.css b/arc-firefox-theme/chrome/browser/downloads/downloads.css index 1bd933a..03c47d0 100644 --- a/arc-firefox-theme/chrome/browser/downloads/downloads.css +++ b/arc-firefox-theme/chrome/browser/downloads/downloads.css @@ -133,8 +133,8 @@ richlistitem[type="download"]:hover > toolbarseparator, .downloadsDropmarker > .button-box > .button-menu-dropmarker > .dropmarker-icon { width: 16px; height: 16px; - list-style-image: url("chrome://browser/skin/downloads/menubutton-dropmarker.svg"); - filter: url("chrome://browser/skin/filters.svg#fill"); + list-style-image: url("chrome://global/skin/icons/menubutton-dropmarker.svg"); + filter: url("chrome://global/skin/filters.svg#fill"); fill: currentColor; } @@ -247,7 +247,7 @@ richlistitem[type="download"][verdict] > toolbarseparator { width: 16px; height: 16px; margin: 1px; - filter: url("chrome://browser/skin/filters.svg#fill"); + filter: url("chrome://global/skin/filters.svg#fill"); fill: currentColor; } diff --git a/arc-firefox-theme/chrome/browser/downloads/menubutton-dropmarker.svg b/arc-firefox-theme/chrome/browser/downloads/menubutton-dropmarker.svg deleted file mode 100644 index 76af113..0000000 --- a/arc-firefox-theme/chrome/browser/downloads/menubutton-dropmarker.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - diff --git a/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css b/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css deleted file mode 100644 index f165003..0000000 --- a/arc-firefox-theme/chrome/browser/feeds/subscribe-ui.css +++ /dev/null @@ -1,7 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -.alwaysUse { - padding: 5px; -} diff --git a/arc-firefox-theme/chrome/browser/filters.svg b/arc-firefox-theme/chrome/browser/filters.svg deleted file mode 100644 index 8fccb13..0000000 --- a/arc-firefox-theme/chrome/browser/filters.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - diff --git a/arc-firefox-theme/chrome/browser/newtab/whimsycorn.png b/arc-firefox-theme/chrome/browser/newtab/whimsycorn.png deleted file mode 100644 index 5c5c2f4..0000000 Binary files a/arc-firefox-theme/chrome/browser/newtab/whimsycorn.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/notification-icons.svg b/arc-firefox-theme/chrome/browser/notification-icons.svg index 5250770..de73d82 100644 --- a/arc-firefox-theme/chrome/browser/notification-icons.svg +++ b/arc-firefox-theme/chrome/browser/notification-icons.svg @@ -34,9 +34,8 @@ @@ -83,13 +89,24 @@ - + + + + + + + + + + + + @@ -108,6 +125,7 @@ + @@ -115,6 +133,7 @@ + diff --git a/arc-firefox-theme/chrome/browser/places/autocomplete-star.png b/arc-firefox-theme/chrome/browser/places/autocomplete-star.png deleted file mode 100644 index 2675f93..0000000 Binary files a/arc-firefox-theme/chrome/browser/places/autocomplete-star.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/preferences/containers.css b/arc-firefox-theme/chrome/browser/preferences/containers.css index 308f573..e2f23fc 100644 --- a/arc-firefox-theme/chrome/browser/preferences/containers.css +++ b/arc-firefox-theme/chrome/browser/preferences/containers.css @@ -87,7 +87,7 @@ .subviewbutton[usercontextid] > .toolbarbutton-icon, #userContext-indicator { background-image: var(--identity-icon); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: var(--identity-icon-color); background-size: contain; background-repeat: no-repeat; @@ -100,12 +100,12 @@ --preference-active-color: #858585; } -radiogroup { +.radio-buttons { display: flex; margin-inline-start: 0.35rem; } -radio { +.radio-buttons > radio { flex: auto; display: flex; align-items: center; @@ -125,19 +125,23 @@ radio { fill: #4d4d4d; } +.radio-buttons > radio { + padding-inline-start: 2px; +} + radio > [data-identity-icon] { inline-size: 22px; block-size: 22px; } -radio[selected=true] { +.radio-buttons > radio[selected=true] { outline-color: var(--preference-unselected-color); } -radio[focused=true] { +.radio-buttons > radio[focused=true] { outline-color: var(--preference-selected-color); } -radio:hover:active { +.radio-buttons > radio:hover:active { outline-color: var(--preference-active-color); } diff --git a/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css b/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css index 73e499a..3f21fed 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css @@ -87,7 +87,7 @@ .subviewbutton[usercontextid] > .toolbarbutton-icon, #userContext-indicator { background-image: var(--identity-icon); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: var(--identity-icon-color); background-size: contain; background-repeat: no-repeat; 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 51042a4..d774c77 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css @@ -42,6 +42,12 @@ treecol { min-width: 26px; } +.learnMore { + margin-inline-start: 1.5em; + font-weight: normal; + white-space: nowrap; +} + /* Category List */ #categories { @@ -173,15 +179,6 @@ treecol { } /* Content pane */ -#playDRMContentLink { - /* Line up with the buttons in the other grid bits: */ - margin-left: 4px !important; - margin-right: 4px !important; -} - -#notificationsPolicyLearnMore { - margin-inline-start: 1.5em !important; -} #defaultFontSizeLabel { /* !important needed to override common !important rule */ @@ -230,14 +227,6 @@ treecol { /* Privacy pane */ -#trackingProtectionPBMLearnMore, -#trackingProtectionLearnMore, -#browserContainersLearnMore { - margin-inline-start: 1.5em !important; - margin-top: 0; - font-weight: normal; -} - .doNotTrackLearnMore { margin-inline-start: calc(1em + 30px); margin-bottom: 1em; @@ -283,17 +272,6 @@ description > html|a { margin-inline-end: 4px; /* add the 4px end-margin of other elements */ } -#telemetryLearnMore, -#FHRLearnMore, -#crashReporterLearnMore { - /* provide some margin between the links and the label text */ - /* !important is needed to override the rules defined in common.css */ - margin-inline-start: 20px !important; - /* center the links */ - margin-top: 8px; - margin-bottom: 8px; -} - .indent { /* !important needed to override margin-inline-start:0 !important; rule define in common.css for labels */ @@ -420,9 +398,6 @@ description > html|a { } #noFxaAccount { - /* Overriding the margins from the base preferences.css theme file. - These overrides can be simplified by fixing bug 1027174 */ - margin: 0; padding-top: 15px; } @@ -512,7 +487,7 @@ description > html|a { } .fxaAccountBoxButtons > button:first-child { - margin-right: 14px !important; + margin-inline-end: 14px !important; } .fxaSyncIllustration { diff --git a/arc-firefox-theme/chrome/browser/preferences/preferences.css b/arc-firefox-theme/chrome/browser/preferences/preferences.css index 45e2dc2..810a9f8 100644 --- a/arc-firefox-theme/chrome/browser/preferences/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/preferences.css @@ -54,7 +54,7 @@ #advancedPrefs { margin-left: 0; - margin-right: 0; + margin-right: 0; } #cookiesChildren::-moz-tree-image(domainCol, container) { @@ -97,7 +97,6 @@ } #noFxaAccount { - margin: 5px; line-height: 1.2em; } diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss index 1e89eed..90b5124 100644 --- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss +++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss @@ -1009,7 +1009,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, # :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } @@ -1546,6 +1546,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); visibility: visible; @@ -1557,13 +1560,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); - visibility: visible; -} - #identity-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); @@ -1604,6 +1600,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); visibility: visible; @@ -1615,13 +1614,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); - visibility: visible; -} - #identity-box { --identity-box-verified-color: hsl(92,100%,30%); --identity-box-chrome-color: rgb(229,115,0); @@ -1727,10 +1719,11 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { #identity-box[sharing] > #identity-icon, #sharing-icon { - animation: 3s linear pulse infinite; + animation: 3s linear identity-box-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */ +@keyframes identity-box-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } @@ -1793,31 +1786,15 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); -} - -@media (min-resolution: 1.1dppx) { - .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); - } -} - -.popup-notification-icon { - width: 64px; - height: 64px; - margin-inline-end: 10px; + list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); } .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme, #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } -.notification-anchor-icon:not(.plugin-blocked):not(:hover) { - opacity: .8; -} - /* INDIVIDUAL NOTIFICATIONS */ .popup-notification-icon[popupid="web-notifications"], @@ -2063,6 +2040,29 @@ html|*#webRTC-previewVideo { font-weight: bold; } +.addon-webext-perm-header { + font-size: 1.3em; +} + +.addon-webext-name { + font-weight: bold; + margin: 0; +} + +.addon-addon-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/menuPanel.svg"); + -moz-image-region: rect(0px, 288px, 32px, 256px); +} + +.addon-toolbar-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/Toolbar.png"); + -moz-image-region: rect(0, 486px, 18px, 468px); +} + /* Notification icon box */ .notification-anchor-icon:-moz-focusring { @@ -2315,14 +2315,13 @@ notification[value="translation"] menulist > .menulist-dropmarker { border: 1px solid transparent; } -.autocomplete-richlistitem[selected=true] { - background-color: Highlight; -} - .ac-title { font-size: 1.05em; } +.ac-separator, +.ac-url, +.ac-action, .ac-tags { font-size: 0.9em; } @@ -2335,20 +2334,12 @@ html|span.ac-tag { padding: 0 1px; } -.ac-separator, -.ac-url, -.ac-action { - font-size: 0.9em; +.ac-separator:not([selected=true]), +.ac-url:not([selected=true]), +.ac-action:not([selected=true]) { color: -moz-nativehyperlinktext; } -.ac-title[selected=true], -.ac-separator[selected], -.ac-url[selected=true], -.ac-action[selected=true] { - color: inherit !important; -} - .ac-tags-text[selected] > html|span.ac-tag { background-color: HighlightText; color: Highlight; @@ -2368,30 +2359,16 @@ html|span.ac-emphasize-text-url { list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); } -.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); - width: 16px; - height: 16px; -} - .ac-type-icon[type=keyword], -.ac-site-icon[type=searchengine], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { +.ac-site-icon[type=searchengine] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); } .ac-type-icon[type=keyword][selected], -.ac-site-icon[type=searchengine][selected], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) { +.ac-site-icon[type=searchengine][selected] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); } -.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; - height: 16px; -} - .ac-type-icon[type=switchtab], .ac-type-icon[type=remotetab] { list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); @@ -2865,10 +2842,11 @@ html|span.ac-emphasize-text-url { .tab-icon-image[sharing]:not([selected]), .tab-sharing-icon-overlay { - animation: 3s linear pulse infinite; + animation: 3s linear tab-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */ +@keyframes tab-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } @@ -2980,7 +2958,7 @@ html|span.ac-emphasize-text-url { .tab-icon-sound[muted], .tab-icon-sound[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } @@ -2995,13 +2973,13 @@ html|span.ac-emphasize-text-url { .tab-icon-sound:-moz-lwtheme-darktext[soundplaying], .tab-icon-sound:-moz-lwtheme-darktext[muted], .tab-icon-sound:-moz-lwtheme-darktext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying], .tab-icon-sound:-moz-lwtheme-brighttext[muted], .tab-icon-sound:-moz-lwtheme-brighttext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } .tab-icon-sound[soundplaying]:not(:hover), @@ -3277,7 +3255,7 @@ html|span.ac-emphasize-text-url { .alltabs-endimage[muted], .alltabs-endimage[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } @@ -3964,7 +3942,7 @@ html|*.pointerlockfswarning-exit-button { /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS. 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 { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar { --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ --gcli-input-background: #fcfcfc; /* --theme-toolbar-background */ --gcli-input-focused-background: #ffffff; /* --theme-sidebar-background */ @@ -3976,7 +3954,7 @@ html|*.pointerlockfswarning-exit-button { --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus); /* --theme-command-line-image-focus */ } -:root[devtoolstheme="dark"] #developer-toolbar { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar { --gcli-background-color: #272b35; /* --theme-toolbar-background */ --gcli-input-background: #272b35; /* --theme-tab-toolbar-background */ --gcli-input-focused-background: #272b35; /* --theme-tab-toolbar-background */ @@ -4009,8 +3987,8 @@ html|*.pointerlockfswarning-exit-button { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, -:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, +#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } @@ -4020,7 +3998,7 @@ html|*.pointerlockfswarning-exit-button { } /* The toolkit close button is low contrast in the dark theme so invert it. */ -:root[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { filter: invert(1); } @@ -4614,7 +4592,7 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; - background-image: url("chrome://browser/skin/theme-switcher-icon.png"); + background-image: url("chrome://browser/content/default-theme-icon.svg"); background-size: contain; } @@ -4783,7 +4761,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { } .customization-lwtheme-menu-theme[defaulttheme] { - list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); + list-style-image: url(chrome://browser/content/default-theme-icon.svg); } .customization-lwtheme-menu-theme[active="true"], @@ -5292,7 +5270,7 @@ notification.heartbeat { } /** - * Override the --panel-arrowcontent-padding so the background extends + * Override the --arrowpanel-padding so the background extends * to the sides and bottom of the panel. */ #UITourTooltipButtons { @@ -5314,7 +5292,7 @@ notification.heartbeat { width: 16px; height: 16px; margin: 7px; - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css index 4a15269..1171e26 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css @@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, # :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #home-button[cui-areatype="menu-panel"], @@ -1154,6 +1154,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); visibility: visible; } @@ -1163,12 +1166,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); - visibility: visible; } - #identity-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); } @@ -1198,6 +1195,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); visibility: visible; } @@ -1207,12 +1207,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); - visibility: visible; } - #identity-box { --identity-box-verified-color: #479900; --identity-box-chrome-color: #e57300; @@ -1281,9 +1275,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { #identity-box[sharing] > #identity-icon, #sharing-icon { - animation: 3s linear pulse infinite; } + animation: 3s linear identity-box-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */ +@keyframes identity-box-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -1331,24 +1326,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); } - -@media (min-resolution: 1.1dppx) { - .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } } -.popup-notification-icon { - width: 64px; - height: 64px; - margin-inline-end: 10px; } + list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); } .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme, #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } -.notification-anchor-icon:not(.plugin-blocked):not(:hover) { - opacity: .8; } - /* INDIVIDUAL NOTIFICATIONS */ .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon { @@ -1536,6 +1520,25 @@ html|*#webRTC-previewVideo { .addon-install-confirmation-name { font-weight: bold; } +.addon-webext-perm-header { + font-size: 1.3em; } + +.addon-webext-name { + font-weight: bold; + margin: 0; } + +.addon-addon-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/menuPanel.svg"); + -moz-image-region: rect(0px, 288px, 32px, 256px); } + +.addon-toolbar-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/Toolbar.png"); + -moz-image-region: rect(0, 486px, 18px, 468px); } + /* Notification icon box */ .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1733,12 +1736,12 @@ notification[value="translation"] menulist > .menulist-dropmarker { border-radius: 2px; border: 1px solid transparent; } -.autocomplete-richlistitem[selected=true] { - background-color: Highlight; } - .ac-title { font-size: 1.05em; } +.ac-separator, +.ac-url, +.ac-action, .ac-tags { font-size: 0.9em; } @@ -1749,18 +1752,11 @@ html|span.ac-tag { border: 1px solid transparent; padding: 0 1px; } -.ac-separator, -.ac-url, -.ac-action { - font-size: 0.9em; +.ac-separator:not([selected=true]), +.ac-url:not([selected=true]), +.ac-action:not([selected=true]) { color: -moz-nativehyperlinktext; } -.ac-title[selected=true], -.ac-separator[selected], -.ac-url[selected=true], -.ac-action[selected=true] { - color: inherit !important; } - .ac-tags-text[selected] > html|span.ac-tag { background-color: HighlightText; color: Highlight; } @@ -1776,26 +1772,14 @@ html|span.ac-emphasize-text-url { .ac-type-icon[type=bookmark][selected][current] { list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); } -.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=keyword], -.ac-site-icon[type=searchengine], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { +.ac-site-icon[type=searchengine] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); } .ac-type-icon[type=keyword][selected], -.ac-site-icon[type=searchengine][selected], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) { +.ac-site-icon[type=searchengine][selected] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); } -.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=switchtab], .ac-type-icon[type=remotetab] { list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); } @@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url { .tab-icon-image[sharing]:not([selected]), .tab-sharing-icon-overlay { - animation: 3s linear pulse infinite; } + animation: 3s linear tab-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */ +@keyframes tab-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url { .tab-icon-sound[muted], .tab-icon-sound[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .tab-icon-sound[muted] { @@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url { .tab-icon-sound:-moz-lwtheme-darktext[soundplaying], .tab-icon-sound:-moz-lwtheme-darktext[muted], .tab-icon-sound:-moz-lwtheme-darktext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying], .tab-icon-sound:-moz-lwtheme-brighttext[muted], .tab-icon-sound:-moz-lwtheme-brighttext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } .tab-icon-sound[soundplaying]:not(:hover), .tab-icon-sound[muted]:not(:hover), @@ -2454,7 +2439,7 @@ lwtHeader;*/ .alltabs-endimage[muted], .alltabs-endimage[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .alltabs-endimage[muted] { @@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button { /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS. 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 { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar { --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ --gcli-input-background: #fcfcfc; @@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button { --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus); /* --theme-command-line-image-focus */ } -:root[devtoolstheme="dark"] #developer-toolbar { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar { --gcli-background-color: #272b35; /* --theme-toolbar-background */ --gcli-input-background: #272b35; @@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, -:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, +#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon { @@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button { 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 { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { filter: invert(1); } #developer-toolbar-toolbox-button { @@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; - background-image: url("chrome://browser/skin/theme-switcher-icon.png"); + background-image: url("chrome://browser/content/default-theme-icon.svg"); background-size: contain; } #main-window[customize-entered] #customization-panel-container { @@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { padding-inline-start: 0; } .customization-lwtheme-menu-theme[defaulttheme] { - list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); } + list-style-image: url(chrome://browser/content/default-theme-icon.svg); } .customization-lwtheme-menu-theme[active="true"], .customization-lwtheme-menu-theme:hover { @@ -4086,7 +4071,7 @@ notification.heartbeat { width: 16px; } /** - * Override the --panel-arrowcontent-padding so the background extends + * Override the --arrowpanel-padding so the background extends * to the sides and bottom of the panel. */ #UITourTooltipButtons { @@ -4105,7 +4090,7 @@ notification.heartbeat { width: 16px; height: 16px; margin: 7px; - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #context-back { diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css index f48dd3c..ddc4dfd 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css @@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, # :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #home-button[cui-areatype="menu-panel"], @@ -1153,6 +1153,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); visibility: visible; } @@ -1162,12 +1165,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); - visibility: visible; } - #identity-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); } @@ -1197,6 +1194,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); visibility: visible; } @@ -1206,12 +1206,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); - visibility: visible; } - #identity-box { --identity-box-verified-color: #479900; --identity-box-chrome-color: #e57300; @@ -1280,9 +1274,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { #identity-box[sharing] > #identity-icon, #sharing-icon { - animation: 3s linear pulse infinite; } + animation: 3s linear identity-box-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */ +@keyframes identity-box-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -1330,24 +1325,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); } - -@media (min-resolution: 1.1dppx) { - .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } } -.popup-notification-icon { - width: 64px; - height: 64px; - margin-inline-end: 10px; } + list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); } .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme, #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } -.notification-anchor-icon:not(.plugin-blocked):not(:hover) { - opacity: .8; } - /* INDIVIDUAL NOTIFICATIONS */ .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon { @@ -1535,6 +1519,25 @@ html|*#webRTC-previewVideo { .addon-install-confirmation-name { font-weight: bold; } +.addon-webext-perm-header { + font-size: 1.3em; } + +.addon-webext-name { + font-weight: bold; + margin: 0; } + +.addon-addon-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/menuPanel.svg"); + -moz-image-region: rect(0px, 288px, 32px, 256px); } + +.addon-toolbar-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/Toolbar.png"); + -moz-image-region: rect(0, 486px, 18px, 468px); } + /* Notification icon box */ .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1732,12 +1735,12 @@ notification[value="translation"] menulist > .menulist-dropmarker { border-radius: 2px; border: 1px solid transparent; } -.autocomplete-richlistitem[selected=true] { - background-color: Highlight; } - .ac-title { font-size: 1.05em; } +.ac-separator, +.ac-url, +.ac-action, .ac-tags { font-size: 0.9em; } @@ -1748,18 +1751,11 @@ html|span.ac-tag { border: 1px solid transparent; padding: 0 1px; } -.ac-separator, -.ac-url, -.ac-action { - font-size: 0.9em; +.ac-separator:not([selected=true]), +.ac-url:not([selected=true]), +.ac-action:not([selected=true]) { color: -moz-nativehyperlinktext; } -.ac-title[selected=true], -.ac-separator[selected], -.ac-url[selected=true], -.ac-action[selected=true] { - color: inherit !important; } - .ac-tags-text[selected] > html|span.ac-tag { background-color: HighlightText; color: Highlight; } @@ -1775,26 +1771,14 @@ html|span.ac-emphasize-text-url { .ac-type-icon[type=bookmark][selected][current] { list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); } -.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=keyword], -.ac-site-icon[type=searchengine], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { +.ac-site-icon[type=searchengine] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); } .ac-type-icon[type=keyword][selected], -.ac-site-icon[type=searchengine][selected], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) { +.ac-site-icon[type=searchengine][selected] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); } -.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=switchtab], .ac-type-icon[type=remotetab] { list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); } @@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url { .tab-icon-image[sharing]:not([selected]), .tab-sharing-icon-overlay { - animation: 3s linear pulse infinite; } + animation: 3s linear tab-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */ +@keyframes tab-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url { .tab-icon-sound[muted], .tab-icon-sound[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .tab-icon-sound[muted] { @@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url { .tab-icon-sound:-moz-lwtheme-darktext[soundplaying], .tab-icon-sound:-moz-lwtheme-darktext[muted], .tab-icon-sound:-moz-lwtheme-darktext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying], .tab-icon-sound:-moz-lwtheme-brighttext[muted], .tab-icon-sound:-moz-lwtheme-brighttext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } .tab-icon-sound[soundplaying]:not(:hover), .tab-icon-sound[muted]:not(:hover), @@ -2454,7 +2439,7 @@ lwtHeader;*/ .alltabs-endimage[muted], .alltabs-endimage[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .alltabs-endimage[muted] { @@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button { /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS. 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 { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar { --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ --gcli-input-background: #fcfcfc; @@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button { --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus); /* --theme-command-line-image-focus */ } -:root[devtoolstheme="dark"] #developer-toolbar { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar { --gcli-background-color: #272b35; /* --theme-toolbar-background */ --gcli-input-background: #272b35; @@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, -:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, +#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon { @@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button { 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 { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { filter: invert(1); } #developer-toolbar-toolbox-button { @@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; - background-image: url("chrome://browser/skin/theme-switcher-icon.png"); + background-image: url("chrome://browser/content/default-theme-icon.svg"); background-size: contain; } #main-window[customize-entered] #customization-panel-container { @@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { padding-inline-start: 0; } .customization-lwtheme-menu-theme[defaulttheme] { - list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); } + list-style-image: url(chrome://browser/content/default-theme-icon.svg); } .customization-lwtheme-menu-theme[active="true"], .customization-lwtheme-menu-theme:hover { @@ -4086,7 +4071,7 @@ notification.heartbeat { width: 16px; } /** - * Override the --panel-arrowcontent-padding so the background extends + * Override the --arrowpanel-padding so the background extends * to the sides and bottom of the panel. */ #UITourTooltipButtons { @@ -4105,7 +4090,7 @@ notification.heartbeat { width: 16px; height: 16px; margin: 7px; - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #context-back { diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css index 6ccccc4..e3de08a 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-light.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css @@ -760,7 +760,7 @@ toolbarpaletteitem[place="palette"] > :-moz-any(#back-button, #forward-button, # :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #panic-button, #webide-button, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-badge-stack > .toolbarbutton-icon, :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #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, #containers-panelmenu)[cui-areatype="menu-panel"][panel-multiview-anchor=true] > .toolbarbutton-menubutton-button > .toolbarbutton-icon { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #home-button[cui-areatype="menu-panel"], @@ -1153,6 +1153,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); visibility: visible; } @@ -1162,12 +1165,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon); - visibility: visible; } - #identity-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/identity-icon.svg#normal-black); } @@ -1197,6 +1194,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-secure.svg); visibility: visible; } +#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, +#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme, #urlbar[pageproxystate="valid"] > #identity-box.certUserOverridden > #connection-icon:-moz-lwtheme { list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); visibility: visible; } @@ -1206,12 +1206,6 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon-black); visibility: visible; } -#urlbar[pageproxystate="valid"] > #identity-box.weakCipher > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContent > #connection-icon:-moz-lwtheme, -#urlbar[pageproxystate="valid"] > #identity-box.mixedDisplayContentLoadedActiveBlocked > #connection-icon:-moz-lwtheme { - list-style-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg#icon-black); - visibility: visible; } - #identity-box { --identity-box-verified-color: #479900; --identity-box-chrome-color: #e57300; @@ -1280,9 +1274,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { #identity-box[sharing] > #identity-icon, #sharing-icon { - animation: 3s linear pulse infinite; } + animation: 3s linear identity-box-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to tab-sharing-icon-pulse in tabs.inc.css */ +@keyframes identity-box-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -1330,24 +1325,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { type of icon displayed. This rule must be defined before the others in order for its list-style-image to be overridden. */ .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=16); } - -@media (min-resolution: 1.1dppx) { - .notification-anchor-icon { - list-style-image: url(moz-icon://stock/gtk-dialog-info?size=dialog); } } -.popup-notification-icon { - width: 64px; - height: 64px; - margin-inline-end: 10px; } + list-style-image: url(chrome://browser/skin/notification-icons.svg#default-info); } .notification-anchor-icon:not(.plugin-blocked):-moz-lwtheme, #blocked-permissions-container > .blocked-permission-icon:-moz-lwtheme { - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } -.notification-anchor-icon:not(.plugin-blocked):not(:hover) { - opacity: .8; } - /* INDIVIDUAL NOTIFICATIONS */ .popup-notification-icon[popupid="web-notifications"], .desktop-notification-icon { @@ -1535,6 +1519,25 @@ html|*#webRTC-previewVideo { .addon-install-confirmation-name { font-weight: bold; } +.addon-webext-perm-header { + font-size: 1.3em; } + +.addon-webext-name { + font-weight: bold; + margin: 0; } + +.addon-addon-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/menuPanel.svg"); + -moz-image-region: rect(0px, 288px, 32px, 256px); } + +.addon-toolbar-icon { + width: 14px; + height: 14px; + list-style-image: url("chrome://browser/skin/Toolbar.png"); + -moz-image-region: rect(0, 486px, 18px, 468px); } + /* Notification icon box */ .notification-anchor-icon:-moz-focusring { outline: 1px dotted -moz-DialogText; } @@ -1732,12 +1735,12 @@ notification[value="translation"] menulist > .menulist-dropmarker { border-radius: 2px; border: 1px solid transparent; } -.autocomplete-richlistitem[selected=true] { - background-color: Highlight; } - .ac-title { font-size: 1.05em; } +.ac-separator, +.ac-url, +.ac-action, .ac-tags { font-size: 0.9em; } @@ -1748,18 +1751,11 @@ html|span.ac-tag { border: 1px solid transparent; padding: 0 1px; } -.ac-separator, -.ac-url, -.ac-action { - font-size: 0.9em; +.ac-separator:not([selected=true]), +.ac-url:not([selected=true]), +.ac-action:not([selected=true]) { color: -moz-nativehyperlinktext; } -.ac-title[selected=true], -.ac-separator[selected], -.ac-url[selected=true], -.ac-action[selected=true] { - color: inherit !important; } - .ac-tags-text[selected] > html|span.ac-tag { background-color: HighlightText; color: Highlight; } @@ -1775,26 +1771,14 @@ html|span.ac-emphasize-text-url { .ac-type-icon[type=bookmark][selected][current] { list-style-image: url("chrome://browser/skin/urlbar-star.svg#star-inverted"); } -.autocomplete-treebody::-moz-tree-image(bookmark, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/autocomplete-star.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=keyword], -.ac-site-icon[type=searchengine], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage) { +.ac-site-icon[type=searchengine] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon); } .ac-type-icon[type=keyword][selected], -.ac-site-icon[type=searchengine][selected], -.autocomplete-treebody::-moz-tree-image(keyword, treecolAutoCompleteImage, selected) { +.ac-site-icon[type=searchengine][selected] { list-style-image: url(chrome://global/skin/icons/autocomplete-search.svg#search-icon-inverted); } -.autocomplete-treebody::-moz-tree-image(tag, treecolAutoCompleteImage) { - list-style-image: url("chrome://browser/skin/places/tag.png"); - width: 16px; - height: 16px; } - .ac-type-icon[type=switchtab], .ac-type-icon[type=remotetab] { list-style-image: url("chrome://browser/skin/urlbar-tab.svg#tab"); } @@ -2158,9 +2142,10 @@ html|span.ac-emphasize-text-url { .tab-icon-image[sharing]:not([selected]), .tab-sharing-icon-overlay { - animation: 3s linear pulse infinite; } + animation: 3s linear tab-sharing-icon-pulse infinite; } -@keyframes pulse { +/* This should remain identical to identity-box-sharing-icon-pulse in identity-block.inc.css */ +@keyframes tab-sharing-icon-pulse { 0%, 16.66%, 83.33%, 100% { opacity: 0; } 33.33%, 66.66% { @@ -2236,7 +2221,7 @@ html|span.ac-emphasize-text-url { .tab-icon-sound[muted], .tab-icon-sound[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .tab-icon-sound[muted] { @@ -2248,12 +2233,12 @@ html|span.ac-emphasize-text-url { .tab-icon-sound:-moz-lwtheme-darktext[soundplaying], .tab-icon-sound:-moz-lwtheme-darktext[muted], .tab-icon-sound:-moz-lwtheme-darktext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px white); } .tab-icon-sound:-moz-lwtheme-brighttext[soundplaying], .tab-icon-sound:-moz-lwtheme-brighttext[muted], .tab-icon-sound:-moz-lwtheme-brighttext[blocked] { - filter: url(chrome://browser/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } + filter: url(chrome://global/skin/filters.svg#fill) drop-shadow(1px 1px 1px black); } .tab-icon-sound[soundplaying]:not(:hover), .tab-icon-sound[muted]:not(:hover), @@ -2454,7 +2439,7 @@ lwtHeader;*/ .alltabs-endimage[muted], .alltabs-endimage[blocked] { list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } .alltabs-endimage[muted] { @@ -2987,7 +2972,7 @@ html|*.pointerlockfswarning-exit-button { /* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS. 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 { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar { --gcli-background-color: #fcfcfc; /* --theme-tab-toolbar-background */ --gcli-input-background: #fcfcfc; @@ -3007,7 +2992,7 @@ html|*.pointerlockfswarning-exit-button { --command-line-image-focus: url(chrome://devtools/skin/images/commandline-icon.svg#light-theme-focus); /* --theme-command-line-image-focus */ } -:root[devtoolstheme="dark"] #developer-toolbar { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar { --gcli-background-color: #272b35; /* --theme-toolbar-background */ --gcli-input-background: #272b35; @@ -3045,8 +3030,8 @@ html|*.pointerlockfswarning-exit-button { .developer-toolbar-button > image { margin: auto 10px; } -:root[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, -:root[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { +#browser-bottombox[devtoolstheme="light"] #developer-toolbar > .developer-toolbar-button:not([checked=true]) > image, +#browser-bottombox[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before { filter: invert(1); } .developer-toolbar-button > .toolbarbutton-icon { @@ -3054,7 +3039,7 @@ html|*.pointerlockfswarning-exit-button { 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 { +#browser-bottombox[devtoolstheme="dark"] #developer-toolbar > .close-icon:not(:hover) > image { filter: invert(1); } #developer-toolbar-toolbox-button { @@ -3534,7 +3519,7 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; - background-image: url("chrome://browser/skin/theme-switcher-icon.png"); + background-image: url("chrome://browser/content/default-theme-icon.svg"); background-size: contain; } #main-window[customize-entered] #customization-panel-container { @@ -3671,7 +3656,7 @@ toolbarpaletteitem[place="toolbar"]:not([mousedown="true"]):-moz-focusring { padding-inline-start: 0; } .customization-lwtheme-menu-theme[defaulttheme] { - list-style-image: url(chrome://browser/skin/theme-switcher-icon.png); } + list-style-image: url(chrome://browser/content/default-theme-icon.svg); } .customization-lwtheme-menu-theme[active="true"], .customization-lwtheme-menu-theme:hover { @@ -4086,7 +4071,7 @@ notification.heartbeat { width: 16px; } /** - * Override the --panel-arrowcontent-padding so the background extends + * Override the --arrowpanel-padding so the background extends * to the sides and bottom of the panel. */ #UITourTooltipButtons { @@ -4105,7 +4090,7 @@ notification.heartbeat { width: 16px; height: 16px; margin: 7px; - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } #context-back { diff --git a/arc-firefox-theme/chrome/browser/searchReset.css b/arc-firefox-theme/chrome/browser/searchReset.css index 3573d7d..8005073 100644 --- a/arc-firefox-theme/chrome/browser/searchReset.css +++ b/arc-firefox-theme/chrome/browser/searchReset.css @@ -17,6 +17,6 @@ body { background-size: 16px, 16px; } -#defaultEngine:-moz-dir(rtl) { +#defaultEngine:dir(rtl) { background-position: calc(100% - 5px) center; } diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css index cb4103d..a07413c 100644 --- a/arc-firefox-theme/chrome/browser/searchbar.css +++ b/arc-firefox-theme/chrome/browser/searchbar.css @@ -266,6 +266,11 @@ menuitem[cmd="cmd_clearhistory"][disabled] { color: HighlightText; } +.addengine-item[type=menu][selected] { + color: inherit; + background-color: var(--arrowpanel-dimmed-further); +} + .addengine-icon { width: 16px; } @@ -277,7 +282,8 @@ menuitem[cmd="cmd_clearhistory"][disabled] { list-style-image: url("chrome://browser/skin/badge-add-engine.png"); } -.addengine-item > .button-box > .button-text { +.addengine-item > .button-box > .button-text, +.addengine-item[type=menu] > .button-box > .box-inherit > .button-text { -moz-box-flex: 1; text-align: start; padding-inline-start: 10px; @@ -297,6 +303,12 @@ menuitem[cmd="cmd_clearhistory"][disabled] { } } +.addengine-item[type=menu] > .button-box > .button-menu-dropmarker { + display: -moz-box; + -moz-appearance: menuarrow !important; + list-style-image: none; +} + .search-panel-tree > .autocomplete-treebody::-moz-tree-cell { border-top: none !important; } @@ -331,6 +343,6 @@ menuitem[cmd="cmd_clearhistory"][disabled] { .search-setting-button-compact > .button-box > .button-icon { list-style-image: url("chrome://browser/skin/gear.svg"); - filter: url(chrome://browser/skin/filters.svg#fill); + filter: url(chrome://global/skin/filters.svg#fill); fill: currentColor; } diff --git a/arc-firefox-theme/chrome/browser/social/gear_clicked.png b/arc-firefox-theme/chrome/browser/social/gear_clicked.png deleted file mode 100644 index 7c93aa7..0000000 Binary files a/arc-firefox-theme/chrome/browser/social/gear_clicked.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/social/gear_default.png b/arc-firefox-theme/chrome/browser/social/gear_default.png deleted file mode 100644 index 2a9c8e1..0000000 Binary files a/arc-firefox-theme/chrome/browser/social/gear_default.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/social/share-button-active.png b/arc-firefox-theme/chrome/browser/social/share-button-active.png deleted file mode 100644 index 7df438d..0000000 Binary files a/arc-firefox-theme/chrome/browser/social/share-button-active.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/social/share-button.png b/arc-firefox-theme/chrome/browser/social/share-button.png deleted file mode 100644 index c5298c1..0000000 Binary files a/arc-firefox-theme/chrome/browser/social/share-button.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel.png b/arc-firefox-theme/chrome/browser/syncProgress-menuPanel.png deleted file mode 100644 index 6fd6f9c..0000000 Binary files a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel@2x.png b/arc-firefox-theme/chrome/browser/syncProgress-menuPanel@2x.png deleted file mode 100644 index 04b2cae..0000000 Binary files a/arc-firefox-theme/chrome/browser/syncProgress-menuPanel@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/syncProgress-toolbar-inverted.png b/arc-firefox-theme/chrome/browser/syncProgress-toolbar-inverted.png deleted file mode 100644 index 4ede438..0000000 Binary files a/arc-firefox-theme/chrome/browser/syncProgress-toolbar-inverted.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/syncProgress-toolbar.png b/arc-firefox-theme/chrome/browser/syncProgress-toolbar.png deleted file mode 100644 index 49e224f..0000000 Binary files a/arc-firefox-theme/chrome/browser/syncProgress-toolbar.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/theme-switcher-icon.png b/arc-firefox-theme/chrome/browser/theme-switcher-icon.png deleted file mode 100644 index 891e7af..0000000 Binary files a/arc-firefox-theme/chrome/browser/theme-switcher-icon.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png b/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png deleted file mode 100644 index 286adfe..0000000 Binary files a/arc-firefox-theme/chrome/browser/theme-switcher-icon@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/webRTC-camera-white-16.png b/arc-firefox-theme/chrome/browser/webRTC-camera-white-16.png deleted file mode 100644 index e1e360b..0000000 Binary files a/arc-firefox-theme/chrome/browser/webRTC-camera-white-16.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/webRTC-indicator.css b/arc-firefox-theme/chrome/browser/webRTC-indicator.css index c22f942..938d643 100644 --- a/arc-firefox-theme/chrome/browser/webRTC-indicator.css +++ b/arc-firefox-theme/chrome/browser/webRTC-indicator.css @@ -29,7 +29,7 @@ window { } #screenShareButton { - background-image: url("webRTC-screen-white-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#screen-indicator"); background-position: center center; background-repeat: no-repeat; background-size: 16px; @@ -61,17 +61,17 @@ window[sharingaudio] > #audioVideoButton { } window[sharingvideo] > #audioVideoButton { - background-image: url("webRTC-camera-white-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#camera-indicator"); } window[sharingaudio] > #audioVideoButton { - background-image: url("webRTC-microphone-white-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#microphone-indicator"); } /* Multi-icon button: */ window[sharingaudio][sharingvideo] > #audioVideoButton { - background-image: url("webRTC-camera-white-16.png"), - url("webRTC-microphone-white-16.png"); + background-image: url("chrome://browser/skin/notification-icons.svg#camera-indicator"), + url("chrome://browser/skin/notification-icons.svg#microphone-indicator"); background-position: 6px center, 26px center; background-size: 16px, 16px; min-width: 46px; diff --git a/arc-firefox-theme/chrome/browser/webRTC-microphone-white-16.png b/arc-firefox-theme/chrome/browser/webRTC-microphone-white-16.png deleted file mode 100644 index 0091529..0000000 Binary files a/arc-firefox-theme/chrome/browser/webRTC-microphone-white-16.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/webRTC-screen-white-16.png b/arc-firefox-theme/chrome/browser/webRTC-screen-white-16.png deleted file mode 100644 index 045bfd3..0000000 Binary files a/arc-firefox-theme/chrome/browser/webRTC-screen-white-16.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/about.css b/arc-firefox-theme/chrome/global/about.css index 25f5299..de37ccd 100644 --- a/arc-firefox-theme/chrome/global/about.css +++ b/arc-firefox-theme/chrome/global/about.css @@ -39,6 +39,7 @@ img { font-weight: bold; color: #909090; margin: -24px 0 9px 17px; + text-align: left; /* Override direction alignment on RTL to make sure that the version will fit well on the background. bug 1325232 */ } ul { diff --git a/arc-firefox-theme/chrome/global/aboutReader.css b/arc-firefox-theme/chrome/global/aboutReader.css index 49436de..36945de 100644 --- a/arc-firefox-theme/chrome/global/aboutReader.css +++ b/arc-firefox-theme/chrome/global/aboutReader.css @@ -6,19 +6,6 @@ body { padding: 64px 51px; } -@media print { - #container { - max-width: 100% !important; - font-size: 14px !important; - font-family: Georgia, "Times New Roman", serif !important; - } - - body { - padding-top: 0px; - padding-bottom: 0px; - } -} - body.loaded { transition: color 0.4s, background-color 0.4s; } diff --git a/arc-firefox-theme/chrome/global/aboutReaderContent.css b/arc-firefox-theme/chrome/global/aboutReaderContent.css index 633391d..f69c17b 100644 --- a/arc-firefox-theme/chrome/global/aboutReaderContent.css +++ b/arc-firefox-theme/chrome/global/aboutReaderContent.css @@ -55,6 +55,7 @@ figure, .wp-caption { margin: 0 0 10px 0 !important; + padding: 0 !important; } } diff --git a/arc-firefox-theme/chrome/global/aboutReaderControls.css b/arc-firefox-theme/chrome/global/aboutReaderControls.css index a624901..1acd81e 100644 --- a/arc-firefox-theme/chrome/global/aboutReaderControls.css +++ b/arc-firefox-theme/chrome/global/aboutReaderControls.css @@ -63,11 +63,16 @@ .header > .credits { font-size: 0.9em; line-height: 1.48em; - margin: 0 0 30px 0; + margin: 0 0 10px 0; padding: 0; font-style: italic; } +.header > .meta-data { + font-size: 0.65em; + margin: 0 0 15px 0; +} + /*======= Controls toolbar =======*/ .toolbar { @@ -134,7 +139,7 @@ border-radius: 4px; border: 1px solid #b5b5b5; border-bottom-width: 0; - box-shadow: 0 1px 12px #666; + box-shadow: 0 1px 3px #c1c1c1; } .keep-open .dropdown-popup { @@ -153,7 +158,7 @@ position: absolute; top: 30px; /* offset arrow from top of popup */ left: -16px; - width: 24px; + width: 16px; height: 24px; background-image: url("chrome://global/skin/reader/RM-Type-Controls-Arrow.svg"); display: block; diff --git a/arc-firefox-theme/chrome/global/autocomplete.css b/arc-firefox-theme/chrome/global/autocomplete.css index 0b4536c..6b31eed 100644 --- a/arc-firefox-theme/chrome/global/autocomplete.css +++ b/arc-firefox-theme/chrome/global/autocomplete.css @@ -105,6 +105,7 @@ treechildren.autocomplete-treebody::-moz-tree-cell-text(selected) { } .autocomplete-richlistitem[selected] { + background-color: Highlight; color: HighlightText; } diff --git a/arc-firefox-theme/chrome/global/datetimeinputpickers.css b/arc-firefox-theme/chrome/global/datetimeinputpickers.css new file mode 100644 index 0000000..bed7be5 --- /dev/null +++ b/arc-firefox-theme/chrome/global/datetimeinputpickers.css @@ -0,0 +1,342 @@ +/* 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/. */ + +:root { + --font-size-default: 1.1rem; + --spinner-width: 3rem; + --spinner-margin-top-bottom: 0.4rem; + --spinner-item-height: 2.4rem; + --spinner-item-margin-bottom: 0.1rem; + --spinner-button-height: 1.2rem; + --colon-width: 2rem; + --day-period-spacing-width: 1rem; + --calendar-width: 23.1rem; + --date-picker-item-height: 2.4rem; + + --border: 0.1rem solid #D6D6D6; + --border-radius: 0.3rem; + --border-active-color: #B1B1B1; + + --font-color: #191919; + --fill-color: #EBEBEB; + + --selected-font-color: #FFFFFF; + --selected-fill-color: #0996F8; + + --button-font-color: #858585; + --button-font-color-hover: #4D4D4D; + --button-font-color-active: #191919; + --button-fill-color-active: #D4D4D4; + + --weekday-font-color: #6C6C6C; + --weekday-outside-font-color: #6C6C6C; + --weekend-font-color: #DA4E44; + --weekend-outside-font-color: #FF988F; + + --disabled-opacity: 0.2; +} + +html { + font-size: 10px; +} + +body { + margin: 0; + color: var(--font-color); + font: message-box; + font-size: var(--font-size-default); +} + +button { + -moz-appearance: none; + background: none; + border: none; +} + +.nav { + display: flex; + width: var(--calendar-width); + height: 2.4rem; + margin-bottom: 0.8rem; + justify-content: space-between; +} + +.nav > button { + width: 3rem; + height: var(--date-picker-item-height); + filter: url("chrome://global/skin/filters.svg#fill"); + fill: var(--button-font-color); +} + +.nav > button:hover { + fill: var(--button-font-color-hover); +} + +.nav > button.active { + fill: var(--button-font-color-active); +} + +.nav > button.left { + background: url("chrome://global/skin/icons/calendar-arrows.svg#left") no-repeat 50% 50%; +} + +.nav > button.right { + background: url("chrome://global/skin/icons/calendar-arrows.svg#right") no-repeat 50% 50%; +} + +.month-year-container { + position: absolute; + display: flex; + justify-content: center; + align-items: center; + top: 0; + left: 3rem; + width: 17.1rem; + height: var(--date-picker-item-height); + z-index: 10; +} + +button.month-year { + font-size: 1.3rem; + border: var(--border); + border-radius: 0.3rem; + padding: 0.2rem 2.6rem 0.2rem 1.2rem; +} + +button.month-year:hover { + background: var(--fill-color); +} + +button.month-year.active { + border-color: var(--border-active-color); + background: var(--button-fill-color-active); +} + +button.month-year::after { + position: absolute; + content: ""; + width: 2.6rem; + height: 1.6rem; + background: url("chrome://global/skin/icons/spinner-arrows.svg#down") no-repeat 50% 50%; + filter: url("chrome://global/skin/filters.svg#fill"); + fill: var(--button-font-color); +} + +button.month-year.active::after { + background: url("chrome://global/skin/icons/spinner-arrows.svg#up") no-repeat 50% 50%; +} + +.month-year-view { + position: absolute; + z-index: 5; + padding-top: 3.2rem; + top: 0; + left: 0; + bottom: 0; + width: var(--calendar-width); + background: window; + opacity: 1; + transition: opacity 0.15s; +} + +.month-year-view.hidden { + visibility: hidden; + opacity: 0; +} + +.month-year-view > .spinner-container { + width: 5.5rem; + margin: 0 0.5rem; +} + +.month-year-view .spinner { + transform: scaleY(1); + transform-origin: top; + transition: transform 0.15s; +} + +.month-year-view.hidden .spinner { + transform: scaleY(0); + transition: none; +} + +.month-year-view .spinner > div { + transform: scaleY(1); + transition: transform 0.15s; +} + +.month-year-view.hidden .spinner > div { + transform: scaleY(2.5); + transition: none; +} + +.calendar-container { + cursor: default; + display: flex; + flex-direction: column; + width: var(--calendar-width); +} + +.week-header { + display: flex; +} + +.week-header > div { + color: var(--weekday-font-color); +} + +.week-header > div.weekend { + color: var(--weekend-font-color); +} + +.days-viewport { + height: 15rem; + overflow: hidden; + position: relative; +} + +.days-view { + position: absolute; + display: flex; + flex-wrap: wrap; + flex-direction: row; +} + +.week-header > div, +.days-view > div { + align-items: center; + display: flex; + height: var(--date-picker-item-height); + margin: 0.05rem 0.15rem; + position: relative; + justify-content: center; + width: 3rem; +} + +.days-view > div.outside { + color: var(--weekday-outside-font-color); +} + +.days-view > div.weekend { + color: var(--weekend-font-color); +} + +.days-view > div.weekend.outside { + color: var(--weekend-outside-font-color); +} + +#time-picker, +.month-year-view { + display: flex; + flex-direction: row; + justify-content: center; +} + +.spinner-container { + display: flex; + flex-direction: column; + width: var(--spinner-width); +} + +.spinner-container > button { + height: var(--spinner-button-height); + filter: url("chrome://global/skin/filters.svg#fill"); + fill: var(--button-font-color); +} + +.spinner-container > button:hover { + fill: var(--button-font-color-hover); +} + +.spinner-container > button.active { + fill: var(--button-font-color-active); +} + +.spinner-container > button.up { + background: url("chrome://global/skin/icons/spinner-arrows.svg#up") no-repeat 50% 50%; +} + +.spinner-container > button.down { + background: url("chrome://global/skin/icons/spinner-arrows.svg#down") no-repeat 50% 50%; +} + +.spinner-container.hide-buttons > button { + visibility: hidden; +} + +.spinner-container > .spinner { + position: relative; + width: 100%; + margin: var(--spinner-margin-top-bottom) 0; + cursor: default; + overflow-y: scroll; + scroll-snap-type: mandatory; + scroll-snap-points-y: repeat(100%); +} + +.spinner-container > .spinner > div { + box-sizing: border-box; + position: relative; + text-align: center; + padding: calc((var(--spinner-item-height) - var(--font-size-default)) / 2) 0; + margin-bottom: var(--spinner-item-margin-bottom); + height: var(--spinner-item-height); + -moz-user-select: none; + scroll-snap-coordinate: 0 0; +} + +.spinner-container > .spinner > div:hover::before, +.calendar-container .days-view > div:hover::before { + background: var(--fill-color); + border: var(--border); + border-radius: var(--border-radius); + content: ""; + position: absolute; + top: 0%; + bottom: 0%; + left: 0%; + right: 0%; + z-index: -10; +} + +.spinner-container > .spinner:not(.scrolling) > div.selection, +.calendar-container .days-view > div.selection { + color: var(--selected-font-color); +} + +.spinner-container > .spinner > div.selection::before, +.calendar-container .days-view > div.selection::before { + background: var(--selected-fill-color); + border: none; + border-radius: var(--border-radius); + content: ""; + position: absolute; + top: 0%; + bottom: 0%; + left: 0%; + right: 0%; + z-index: -10; +} + +.spinner-container > .spinner > div.disabled::before, +.spinner-container > .spinner.scrolling > div.selection::before, +.spinner-container > .spinner.scrolling > div:hover::before { + display: none; +} + +.spinner-container > .spinner > div.disabled { + opacity: var(--disabled-opacity); +} + +.colon { + display: flex; + justify-content: center; + align-items: center; + width: var(--colon-width); + margin-bottom: 0.3rem; +} + +.spacer { + width: var(--day-period-spacing-width); +} \ No newline at end of file diff --git a/arc-firefox-theme/chrome/global/datetimepopup.css b/arc-firefox-theme/chrome/global/datetimepopup.css new file mode 100644 index 0000000..52f6fc7 --- /dev/null +++ b/arc-firefox-theme/chrome/global/datetimepopup.css @@ -0,0 +1,11 @@ +/* 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/. */ + +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +panel[type="arrow"][side="top"], +panel[type="arrow"][side="bottom"] { + margin-left: 0; + margin-right: 0; +} diff --git a/arc-firefox-theme/chrome/global/filters.svg b/arc-firefox-theme/chrome/global/filters.svg new file mode 100644 index 0000000..2d0f219 --- /dev/null +++ b/arc-firefox-theme/chrome/global/filters.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/findBar.css b/arc-firefox-theme/chrome/global/findBar.css index f049114..9bf610b 100644 --- a/arc-firefox-theme/chrome/global/findBar.css +++ b/arc-firefox-theme/chrome/global/findBar.css @@ -105,12 +105,20 @@ findbar[noanim] { } .findbar-find-previous { - list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-previous); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#previous); border-inline-end-width: 0; } .findbar-find-next { - list-style-image: url(chrome://global/skin/icons/find-arrows.svg#glyph-find-next); + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#next); +} + +.findbar-find-previous[disabled] { + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#previous-disabled); +} + +.findbar-find-next[disabled] { + list-style-image: url(chrome://global/skin/icons/find-arrows.svg#next-disabled); } .findbar-find-previous > .toolbarbutton-icon, diff --git a/arc-firefox-theme/chrome/global/global.css b/arc-firefox-theme/chrome/global/global.css index 1f9e7e4..d78a911 100644 --- a/arc-firefox-theme/chrome/global/global.css +++ b/arc-firefox-theme/chrome/global/global.css @@ -292,6 +292,20 @@ popupnotificationcontent { margin-top: .5em; } +.popup-notification-panel > .panel-arrowcontainer > .panel-arrowcontent { + /* In order to display the action buttons near the edge of the arrow panel we + * have to reset its default padding and specify the padding in the individual + * "popupnotification" elements instead. To keep the rounded borders of the + * panel, we also have to ensure the contents are clipped to the border box + * by hiding the overflow, and we have to override the "display" property so + * that the height of the contents is computed correctly in that case. */ + padding: 0; + overflow: hidden; + display: flex; + /* Make multiple popupnotifications stack vertically. */ + flex-direction: column; +} + /* :::::: autoscroll popup ::::: */ .autoscroller { diff --git a/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg b/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg new file mode 100644 index 0000000..858676f --- /dev/null +++ b/arc-firefox-theme/chrome/global/icons/calendar-arrows.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/arc-firefox-theme/chrome/global/icons/find-arrows.svg b/arc-firefox-theme/chrome/global/icons/find-arrows.svg index 608c0a7..d6c59c7 100644 --- a/arc-firefox-theme/chrome/global/icons/find-arrows.svg +++ b/arc-firefox-theme/chrome/global/icons/find-arrows.svg @@ -2,15 +2,26 @@ - + - - + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg b/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg new file mode 100644 index 0000000..76af113 --- /dev/null +++ b/arc-firefox-theme/chrome/global/icons/menubutton-dropmarker.svg @@ -0,0 +1,8 @@ + + + + + diff --git a/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg b/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg new file mode 100644 index 0000000..a8ba72d --- /dev/null +++ b/arc-firefox-theme/chrome/global/icons/spinner-arrows.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css index 05c91b4..2f1bfac 100644 --- a/arc-firefox-theme/chrome/global/in-content/common.css +++ b/arc-firefox-theme/chrome/global/in-content/common.css @@ -109,7 +109,7 @@ xul|groupbox { font-size: 1.25rem; } -xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent), +xul|groupbox xul|label:not(.menu-accel):not(.menu-text):not(.indent):not(.learnMore), xul|groupbox xul|description { /* !important needed to override toolkit !important rule */ margin-inline-start: 0 !important; diff --git a/arc-firefox-theme/chrome/global/in-content/info-pages.css b/arc-firefox-theme/chrome/global/in-content/info-pages.css index b75b06a..3de0ce5 100644 --- a/arc-firefox-theme/chrome/global/in-content/info-pages.css +++ b/arc-firefox-theme/chrome/global/in-content/info-pages.css @@ -37,6 +37,7 @@ body { font-size: 2.5em; } +.title:-moz-locale-dir(rtl), .title:dir(rtl) { background-position: right 0; } diff --git a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css index 760cdcd..2d857ce 100644 --- a/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css +++ b/arc-firefox-theme/chrome/global/media/TopLevelVideoDocument.css @@ -8,5 +8,5 @@ body { } video { - box-shadow: 0 0 15px #000; + box-shadow: 0 0 5px rgba(0,0,0,0.6); } diff --git a/arc-firefox-theme/chrome/global/media/closeCaptionButton.png b/arc-firefox-theme/chrome/global/media/closeCaptionButton.png deleted file mode 100644 index 469310f..0000000 Binary files a/arc-firefox-theme/chrome/global/media/closeCaptionButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png b/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png deleted file mode 100644 index 0335078..0000000 Binary files a/arc-firefox-theme/chrome/global/media/closeCaptionButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg b/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg new file mode 100644 index 0000000..0c55071 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/closedCaptionButton.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/error.png b/arc-firefox-theme/chrome/global/media/error.png index 58e3728..362a293 100644 Binary files a/arc-firefox-theme/chrome/global/media/error.png and b/arc-firefox-theme/chrome/global/media/error.png differ diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton.png b/arc-firefox-theme/chrome/global/media/fullscreenButton.png deleted file mode 100644 index ffbc3d5..0000000 Binary files a/arc-firefox-theme/chrome/global/media/fullscreenButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton.svg b/arc-firefox-theme/chrome/global/media/fullscreenButton.svg new file mode 100644 index 0000000..0bf3ec2 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/fullscreenButton.svg @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png b/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png deleted file mode 100644 index b09ebbd..0000000 Binary files a/arc-firefox-theme/chrome/global/media/fullscreenButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/muteButton.png b/arc-firefox-theme/chrome/global/media/muteButton.png deleted file mode 100644 index 8944807..0000000 Binary files a/arc-firefox-theme/chrome/global/media/muteButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/muteButton.svg b/arc-firefox-theme/chrome/global/media/muteButton.svg new file mode 100644 index 0000000..779957c --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/muteButton.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/muteButton@2x.png b/arc-firefox-theme/chrome/global/media/muteButton@2x.png deleted file mode 100644 index b2cd21c..0000000 Binary files a/arc-firefox-theme/chrome/global/media/muteButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/noAudio.png b/arc-firefox-theme/chrome/global/media/noAudio.png deleted file mode 100644 index 3db8c97..0000000 Binary files a/arc-firefox-theme/chrome/global/media/noAudio.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/noAudio@2x.png b/arc-firefox-theme/chrome/global/media/noAudio@2x.png deleted file mode 100644 index 7de728b..0000000 Binary files a/arc-firefox-theme/chrome/global/media/noAudio@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/pauseButton.png b/arc-firefox-theme/chrome/global/media/pauseButton.png deleted file mode 100644 index 944098c..0000000 Binary files a/arc-firefox-theme/chrome/global/media/pauseButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/pauseButton.svg b/arc-firefox-theme/chrome/global/media/pauseButton.svg new file mode 100644 index 0000000..8d56b96 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/pauseButton.svg @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/pauseButton@2x.png b/arc-firefox-theme/chrome/global/media/pauseButton@2x.png deleted file mode 100644 index df22919..0000000 Binary files a/arc-firefox-theme/chrome/global/media/pauseButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/playButton.png b/arc-firefox-theme/chrome/global/media/playButton.png deleted file mode 100644 index 11e2731..0000000 Binary files a/arc-firefox-theme/chrome/global/media/playButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/playButton.svg b/arc-firefox-theme/chrome/global/media/playButton.svg new file mode 100644 index 0000000..dc20c61 --- /dev/null +++ b/arc-firefox-theme/chrome/global/media/playButton.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/media/playButton@2x.png b/arc-firefox-theme/chrome/global/media/playButton@2x.png deleted file mode 100644 index fb20075..0000000 Binary files a/arc-firefox-theme/chrome/global/media/playButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumb.png b/arc-firefox-theme/chrome/global/media/scrubberThumb.png deleted file mode 100644 index f159627..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumb.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png b/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png deleted file mode 100644 index f8790f4..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumb@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png b/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png deleted file mode 100644 index 96d2ed7..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumbWide.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png b/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png deleted file mode 100644 index 52c9d72..0000000 Binary files a/arc-firefox-theme/chrome/global/media/scrubberThumbWide@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/unmuteButton.png b/arc-firefox-theme/chrome/global/media/unmuteButton.png deleted file mode 100644 index 5b76e2f..0000000 Binary files a/arc-firefox-theme/chrome/global/media/unmuteButton.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png b/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png deleted file mode 100644 index 86f2185..0000000 Binary files a/arc-firefox-theme/chrome/global/media/unmuteButton@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/videocontrols.css b/arc-firefox-theme/chrome/global/media/videocontrols.css index 6907620..03a050e 100644 --- a/arc-firefox-theme/chrome/global/media/videocontrols.css +++ b/arc-firefox-theme/chrome/global/media/videocontrols.css @@ -2,271 +2,369 @@ * 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/. */ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -@namespace html url("http://www.w3.org/1999/xhtml"); +@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); +@namespace url("http://www.w3.org/1999/xhtml"); + +video > xul|videocontrols, +audio > xul|videocontrols { + writing-mode: horizontal-tb; + width: 100%; + height: 100%; + display: inline-block; +} + +.controlsContainer [hidden="true"], +.controlBar[hidden] { + display: none; +} + +.controlBar[size="hidden"] { + display: none; +} + +.controlsSpacer[hideCursor] { + cursor: none; +} + +.controlsContainer, +.progressContainer { + position: relative; + height: 100%; +} + +.stackItem { + position: absolute; + left: 0; + bottom: 0; + width: 100%; + height: 100%; +} + +.statusOverlay { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + background-color: rgb(80,80,80); +} + +.controlsOverlay { + display: flex; + flex-direction: column; + justify-content: center; + position: relative; +} + +.controlsSpacerStack { + display: flex; + flex-direction: column; + flex-grow: 1; + justify-content: center; + align-items: center; +} + +.controlsSpacer { + background-color: rgba(255,255,255,.4); +} .controlBar { - height: 28px; - background-color: rgba(35,31,32,.74); + position: relative; + display: flex; + justify-content: center; + align-items: center; + overflow: hidden; + height: 40px; + padding: 0 9px; + background-color: rgba(26,26,26,.8); } .playButton, .muteButton, .closedCaptionButton, .fullscreenButton { + height: 100%; + min-height: 30px; + min-width: 30px; + padding: 6px; + border: 0; + margin: 0; background-color: transparent; background-repeat: no-repeat; background-position: center; - -moz-appearance: none; /* Remove the native button appearance and styling */ - margin: 0; - padding: 0; - min-height: 28px; - min-width: 28px; - border: none; - opacity: 0.7; + background-origin: content-box; + background-clip: content-box; } -.playButton:hover, -.muteButton:hover, -.closedCaptionButton:hover, -.fullscreenButton:hover { - opacity: 1; +.playButton { + background-image: url(chrome://global/skin/media/pauseButton.svg#pause); } - -.playButton:hover:active, -.muteButton:hover:active, -.closedCaptionButton:hover:active, -.fullscreenButton:hover:active { - opacity: 0.4; +.playButton:hover { + background-image: url(chrome://global/skin/media/pauseButton.svg#pause-hover); } - -.playButton { - background-image: url(chrome://global/skin/media/pauseButton.png); - margin-right: -22px; /* 1/2 of scrubber thumb width, for overhang. */ - position: relative; /* Trick to work around negative margin interfering with clicking on the button. */ +.playButton:hover:active { + background-image: url(chrome://global/skin/media/pauseButton.svg#pause-active); } - .playButton[paused] { - background-image: url(chrome://global/skin/media/playButton.png); + background-image: url(chrome://global/skin/media/playButton.svg#play); +} +.playButton[paused]:hover { + background-image: url(chrome://global/skin/media/playButton.svg#play-hover); +} +.playButton[paused]:hover:active { + background-image: url(chrome://global/skin/media/playButton.svg#play-active); } .muteButton { - background-image: url(chrome://global/skin/media/muteButton.png); - min-width: 33px; + background-image: url(chrome://global/skin/media/muteButton.svg#unmute); +} +.muteButton:hover { + background-image: url(chrome://global/skin/media/muteButton.svg#unmute-hover); +} +.muteButton:hover:active { + background-image: url(chrome://global/skin/media/muteButton.svg#unmute-active); } .muteButton[muted] { - background-image: url(chrome://global/skin/media/unmuteButton.png); + background-image: url(chrome://global/skin/media/muteButton.svg#mute); } - -.muteButton[noAudio] { - background-image: url(chrome://global/skin/media/noAudio.png); +.muteButton[muted]:hover { + background-image: url(chrome://global/skin/media/muteButton.svg#mute-hover); +} +.muteButton[muted]:hover:active { + background-image: url(chrome://global/skin/media/muteButton.svg#mute-active); +} +.muteButton[noAudio], +.muteButton[noAudio]:hover, +.muteButton[noAudio]:hover:active { + background-image: url(chrome://global/skin/media/muteButton.svg#noaudio); } - .muteButton[noAudio] + .volumeStack { display: none; } .closedCaptionButton { - background-image: url(chrome://global/skin/media/closeCaptionButton.png); - background-position: 4px; + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off); +} +.closedCaptionButton:hover { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-hover); +} +.closedCaptionButton:hover:active { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-active); } - .closedCaptionButton[enabled] { - opacity: 1; + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc); } - -.closedCaptionButton[hidden] { - display: none; +.closedCaptionButton[enabled]:hover { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-hover); +} +.closedCaptionButton[enabled]:hover:active { + background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-active); } .fullscreenButton { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 16, 16, 0); + background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen); +} +.fullscreenButton:hover { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-hover); +} +.fullscreenButton:hover:active { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-active); } - .fullscreenButton[fullscreened] { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton.png"), 0, 32, 16, 16); + background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen); +} +.fullscreenButton[fullscreened]:hover { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-hover); +} +.fullscreenButton[fullscreened]:hover:active { + background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-active); } -.volumeControl { - width: 32px; - opacity: 0; +.controlBarSpacer { + flex-grow: 1; } -.volumeBackground, -.volumeForeground { - background-repeat: no-repeat; - background-position: center; - width: 32px; +.volumeControl::-moz-range-thumb, +.scrubber::-moz-range-thumb { + height: 13px; + width: 13px; + border: none; + border-radius: 50%; + background-color: #ffffff; + filter: drop-shadow(0px 0px 2px rgba(0,0,0,0.65)); } -.volumeBackground { - background-image: url(chrome://global/skin/media/volume-empty.png); +.volumeControl::-moz-focus-outer, +.scrubber::-moz-focus-outer { + border: 0; } -.volumeForeground { - background-image: url(chrome://global/skin/media/volume-full.png); - background-clip: content-box; +.progressBackgroundBar { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; } -.textTrackList { - display: -moz-box; - -moz-appearance: none; - -moz-box-pack: end; - -moz-box-align: end; - padding: 0; +.progressStack { + position: relative; + width: 100%; + height: 5px; } -.textTrackList[hidden] { - display: none; +.scrubberStack { + min-width: 48px; + flex-basis: 48px; + flex-grow: 2; + flex-shrink: 0; + margin: 0 9px; } -.textTrackList > html|*.textTrackItem { - -moz-appearance: none; - -moz-box-align: start; - text-align: start; - overflow: hidden; +.volumeStack { + max-width: 60px; + min-width: 48px; + flex-grow: 1; + flex-shrink: 0; + margin-right: 6px; + margin-left: 4px; +} + +.bufferBar, +.progressBar, +.scrubber, +.volumeBackground, +.volumeControl { + bottom: 0; + left: 0; + position: absolute; + width: 100%; + height: 100%; + padding: 0; + border: 0; + border-radius: 2.5px; margin: 0; - padding: 2px 10px; - -moz-margin-end: 10px; - border: none; - color: rgba(255,255,255,.5); - background-color: rgba(35,31,32,.74); - white-space: nowrap; + background: none; + background-color: transparent; } -.textTrackList > html|*.textTrackItem[on] { - color: white; - background-color: black; +.bufferBar, +.volumeBackground { + background-color: rgba(0,0,0,0.7); } -.textTrackList > html|*.textTrackItem:hover { - background-color: rgba(0,0,0,.55); +.bufferBar::-moz-progress-bar, +.progressBar::-moz-progress-bar, +.volumeBackground::-moz-meter-bar { + height: 100%; + padding: 0; + margin: 0; + border: 0; + border-radius: 2.5px; + background: none; } -.controlBar[fullscreen-unavailable] { - /* This value is duplicated in the videocontrols.xml adjustControlSize function. */ - padding-inline-end: 8px; +.scrubber:hover::-moz-range-thumb, +.volumeControl:hover::-moz-range-thumb { + background-color: #48a0f7; } -.volumeControl .scale-thumb { - min-width: 0; - opacity: 0; +.scrubber:active::-moz-range-thumb, +.volumeControl:active::-moz-range-thumb { + background-color: #2d89e6; } -.durationBox { - -moz-box-pack: center; +.scrubber::-moz-range-track, +.scrubber::-moz-range-progress { + background-color: transparent; } -.durationLabel { - margin-left: -22px; /* 1/2 of scrubber thumb width, for overhang. */ - padding-left: 8px; /* don't bump into the scrubber bar */ - color: rgba(255,255,255,.75); - font: message-box; - font-size: 11px; +.volumeControl::-moz-range-progress, +.volumeControl::-moz-range-track { + height: 5px; + border-radius: 2.5px; } -.durationLabel { - padding-top: 0; /* center vertically with scrubber bar */ +.volumeControl::-moz-range-progress { + background-color: #ffffff; } -.positionLabel { - display: none; +.volumeControl::-moz-range-track { + background-color: rgba(0,0,0,0.7); } -.backgroundBar { - /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ - margin: 10px 22px; - background-color: rgba(255,255,255,.5); + +.bufferBar::-moz-progress-bar { + background-color: rgba(255,255,255,0.3); border-radius: 2.5px; } -.bufferBar, -.progressBar { - /* margin top/bottom: make bar 8px tall (control height = 28, minus 2 * 10 margin) */ - /* margin left/right: 1/2 of scrubber thumb width, for overhang. */ - margin: 10px 22px; - -moz-appearance: none; - border: none; - background-color: transparent; - min-width: 0; - min-height: 0; -} - -/* .progress-bar is an element inside the implementation. */ -.bufferBar .progress-bar { - /* - * Note that this is drawn on top of the .backgroundBar. So although this - * has the same background-color specified, the semitransparent - * compositing gives it a different visual appearance. - */ - background-color: rgba(255,255,255,.5); - border-radius: 2.5px; - -moz-appearance: none; +.progressBar::-moz-progress-bar { + background-color: #00b6f0; } -.progressBar .progress-bar { - background-color: white; +.textTrackList { + position: absolute; + right: 5px; + bottom: 45px; + max-width: 80%; + border: 1px solid #000000; border-radius: 2.5px; - -moz-appearance: none; + padding: 5px 0; + vertical-align: middle; + font-size: 12px; + background-color: #000000; + opacity: 0.7; } -/* .scale-slider is an element inside the implementation. */ -.scrubber .scale-slider, -.volumeControl .scale-slider { - /* Hide the default horizontal bar. */ - -moz-appearance: none; - background: none; +.textTrackList > .textTrackItem { + display: block; + width: 100%; + height: 30px; + padding: 2px 10px; + border: none; margin: 0; + white-space: nowrap; + overflow: hidden; + text-align: left; + text-overflow: ellipsis; + color: #ffffff; + background-color: transparent; } -.scrubber .scale-slider { - /* abs(margin-top) + margin-bottom + bar height == timeThumb height */ - margin-top: -10px; - margin-bottom: 10px; -} -/* .scale-thumb is an element inside the implementation. */ -.scrubber .scale-thumb, -.volumeControl .scale-thumb { - /* Override the default thumb appearance with a custom image. */ - -moz-appearance: none; - background: transparent; - border: none; +.textTrackList > .textTrackItem:hover { + background-color: #444444; } -.timeThumb { - background: url(chrome://global/skin/media/scrubberThumb.png) no-repeat center; - min-width: 45px; - min-height: 28px; - -moz-box-pack: center; +.textTrackList > .textTrackItem[on] { + color: #48a0f7; } -.timeThumb[showhours="true"] { - background-image: url(chrome://global/skin/media/scrubberThumbWide.png); +.positionLabel, +.durationLabel { + display: none; } -.timeLabel { - color: rgba(255,255,255,.75); +.positionDurationBox { + text-align: center; + padding-inline-start: 1px; + padding-inline-end: 9px; + white-space: nowrap; font: message-box; - font-size: 10px; - text-shadow: rgba(0,0,0,.3) 0 1px; - padding-top: 7px; + font-size: 13px; + font-size-adjust: 0.55; + color: #ffffff; } -.timeLabel { - padding-top: 5px; /* center vertically with scrubber bar */ -} -.statusOverlay { - -moz-box-align: center; - -moz-box-pack: center; - background-color: rgba(0,0,0,.55); +.duration { + display: inline-block; + white-space: pre; + color: #929292; } .statusIcon { - margin-bottom: 28px; /* same height as .controlBar, to keep icon centered above it */ width: 36px; height: 36px; + margin-bottom: 20px; } .statusIcon[type="throbber"] { @@ -278,61 +376,55 @@ } .statusIcon[type="error"] { + min-width: 70px; + min-height: 60px; background: url(chrome://global/skin/media/error.png) no-repeat center; + background-size: contain; } /* Overlay Play button */ .clickToPlay { - width: 64px; - height: 64px; - -moz-box-pack: center; - -moz-box-align: center; - opacity: 0.7; - background-image: url(chrome://global/skin/media/clicktoplay-bgtexture.png), - url(chrome://global/skin/media/videoClickToPlayButton.svg); - background-repeat: repeat, no-repeat; - background-position: center, center; - background-size: auto, 64px 64px; - background-color: hsla(0,0%,10%,.5); + min-width: 48px; + min-height: 48px; + border-radius: 50%; + background-image: url(chrome://global/skin/media/playButton.svg#play); + background-repeat: no-repeat; + background-position: 54% 50%; + background-size: 40% 40%; + background-color: #1a1a1a; + opacity: 0.8; + position: relative; + top: 20px; } + +.controlsSpacerStack:hover > .clickToPlay, .clickToPlay:hover { - opacity: 1; + opacity: 0.55; } -/* Statistics formatting */ -html|*.statsDiv { - position: relative; +.controlsSpacerStack:hover > .clickToPlay[fadeout] { + opacity: 0; } -html|td { - height: 1em; - max-height: 1em; - padding: 0 2px; -} -html|table { - font-family: Helvetica, Arial, sans-serif; - font-size: 11px; - color: white; - text-shadow: - -1px -1px 0 #000, - 1px -1px 0 #000, - -1px 1px 0 #000, - 1px 1px 0 #000; - min-width: 100%; - background: rgba(68,68,68,.7); - table-layout: fixed; - border-collapse: collapse; - position: absolute; + +.controlBar[fullscreen-unavailable] .fullscreenButton { + display: none; } /* CSS Transitions */ .clickToPlay { - transition-property: opacity, background-size; + transition-property: transform, opacity; transition-duration: 400ms, 400ms; } + +.controlsSpacer[fadeout] { + opacity: 0; +} + .clickToPlay[fadeout] { - background-size: auto, 192px 192px; + transform: scale(3); opacity: 0; } + .clickToPlay[fadeout][immediate] { transition-property: opacity, background-size; transition-duration: 0s, 0s; @@ -348,10 +440,6 @@ html|table { transition-property: opacity, margin-top; transition-duration: 200ms, 200ms; } -.volumeStack[fadeout] { - opacity: 0; - margin-top: 0; -} .statusOverlay:not([immediate]) { transition-property: opacity; transition-duration: 300ms; @@ -363,66 +451,22 @@ html|table { /* Error description formatting */ .errorLabel { - font-family: Helvetica, Arial, sans-serif; - font-size: 11px; - color: #bbb; - text-shadow: - -1px -1px 0 #000, - 1px -1px 0 #000, - -1px 1px 0 #000, - 1px 1px 0 #000; padding: 0 10px; text-align: center; + font: message-box; + font-size: 14px; + color: #ffffff; +} + +.errorLabel { + display: none; } -@media (min-resolution: 2dppx) { - .playButton { - background-image: url(chrome://global/skin/media/pauseButton@2x.png); - background-size: 28px 28px; - } - .playButton[paused] { - background-image: url(chrome://global/skin/media/playButton@2x.png); - background-size: 28px 28px; - } - .volumeBackground { - background-image: url(chrome://global/skin/media/volume-empty@2x.png); - background-size: 32px 16px; - } - .volumeForeground { - background-image: url(chrome://global/skin/media/volume-full@2x.png); - background-size: 32px 16px; - } - .muteButton { - background-image: url(chrome://global/skin/media/muteButton@2x.png); - background-size: 33px 28px; - } - .muteButton[muted] { - background-image: url(chrome://global/skin/media/unmuteButton@2x.png); - background-size: 33px 28px; - } - .muteButton[noAudio] { - background-image: url(chrome://global/skin/media/noAudio@2x.png); - background-size: 33px 28px; - } - .closedCaptionButton { - background-image: url(chrome://global/skin/media/closeCaptionButton@2x.png); - background-position: 4px; - background-size: 28px 28px; - } - .fullscreenButton { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton@2x.png"), 0, 32, 32, 0); - background-size: 16px 16px; - } - .fullscreenButton[fullscreened] { - background-image: -moz-image-rect(url("chrome://global/skin/media/fullscreenButton@2x.png"), 0, 64, 32, 32); - background-size: 16px 16px; - } - .timeThumb { - background-image: url(chrome://global/skin/media/scrubberThumb@2x.png); - background-size: 33px 28px; - } - .timeThumb[showhours="true"] { - background-image: url(chrome://global/skin/media/scrubberThumbWide@2x.png); - background-size: 45px 28px; - } +[error="errorAborted"] > [anonid="errorAborted"], +[error="errorNetwork"] > [anonid="errorNetwork"], +[error="errorDecode"] > [anonid="errorDecode"], +[error="errorSrcNotSupported"] > [anonid="errorSrcNotSupported"], +[error="errorNoSource"] > [anonid="errorNoSource"], +[error="errorGeneric"] > [anonid="errorGeneric"] { + display: inline; } diff --git a/arc-firefox-theme/chrome/global/media/volume-empty.png b/arc-firefox-theme/chrome/global/media/volume-empty.png deleted file mode 100644 index 589abfb..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-empty.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/volume-empty@2x.png b/arc-firefox-theme/chrome/global/media/volume-empty@2x.png deleted file mode 100644 index ca494e8..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-empty@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/volume-full.png b/arc-firefox-theme/chrome/global/media/volume-full.png deleted file mode 100644 index 4398a56..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-full.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/media/volume-full@2x.png b/arc-firefox-theme/chrome/global/media/volume-full@2x.png deleted file mode 100644 index 5bf63c7..0000000 Binary files a/arc-firefox-theme/chrome/global/media/volume-full@2x.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css index 06e3b21..386d911 100644 --- a/arc-firefox-theme/chrome/global/menu.css +++ b/arc-firefox-theme/chrome/global/menu.css @@ -12,8 +12,7 @@ menu, menuitem, -menucaption, -.splitmenu-menuitem { +menucaption { -moz-appearance: menuitem; -moz-box-align: center; max-width: 42em; @@ -28,15 +27,13 @@ menuitem[default="true"] { } menu[_moz-menuactive="true"], -menuitem[_moz-menuactive="true"], -.splitmenu-menuitem[_moz-menuactive="true"] { +menuitem[_moz-menuactive="true"] { color: -moz-menuhovertext; background-color: -moz-menuhover; } menu[disabled="true"], menuitem[disabled="true"], -.splitmenu-menuitem[disabled="true"], menucaption[disabled="true"] { color: GrayText; } diff --git a/arc-firefox-theme/chrome/global/narrate.css b/arc-firefox-theme/chrome/global/narrate.css index 8a44e78..4514eff 100644 --- a/arc-firefox-theme/chrome/global/narrate.css +++ b/arc-firefox-theme/chrome/global/narrate.css @@ -22,7 +22,7 @@ body.dark .narrating { z-index: -1; border-bottom-style: solid; border-bottom-width: 7px; - transition: left 0.1s ease; + transition: left 0.1s ease, width 0.1s ease; } .narrating > .narrate-word-highlight { diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css index 2e57051..a9e3ea8 100644 --- a/arc-firefox-theme/chrome/global/notification.css +++ b/arc-firefox-theme/chrome/global/notification.css @@ -73,10 +73,27 @@ notification[type="critical"] { padding-right: 11px; } -/* Popup notification */ +/* 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/. */ + +.popup-notification-body-container { + padding: var(--arrowpanel-padding); +} + +.popup-notification-icon { + width: 32px; + height: 32px; + margin-inline-end: var(--arrowpanel-padding); +} .popup-notification-body { - max-width: 25em; + width: 25em; +} + +.popup-notification-closebutton { + margin-inline-end: -8px; + margin-top: -8px; } .popup-notification-origin:not([value]), @@ -93,14 +110,106 @@ notification[type="critical"] { } .popup-notification-button-container { - margin-top: 17px; + background-color: var(--arrowpanel-dimmed); + display: flex; } -.popup-notification-closebutton { - margin-inline-end: -10px; - margin-top: -6px; +.popup-notification-button-container > toolbarseparator { + -moz-appearance: none; + border: 0; + border-left: 1px solid var(--panel-separator-color); + margin: 7px 0 7px; + min-width: 0; +} + +.popup-notification-button-container:hover > toolbarseparator { + margin: 0; +} + +.popup-notification-button { + flex: 1; + -moz-appearance: none; + background-color: transparent; + color: inherit; + margin: 0; + padding: 0; + min-width: 0; + min-height: 41px; + border: none; + border-top: 1px solid var(--panel-separator-color); +} + +.popup-notification-button:hover:not([disabled]) { + background-color: var(--arrowpanel-dimmed); +} + +.popup-notification-button:hover:active:not([disabled]) { + background-color: var(--arrowpanel-dimmed-further); + box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset; +} + +.popup-notification-button[disabled] { + background-color: var(--arrowpanel-dimmed-further); + color: graytext; + /* the !important is to override the button[disabled] settings in + * windows/linux button.css */ + -moz-border-top-colors: var(--panel-separator-color) !important; +} + +.popup-notification-button[default] { + flex: 0 50%; +} + +.popup-notification-button[default]:not([disabled]) { + background-color: #0996f8; + color: white; +} + +.popup-notification-button[default]:hover:not([disabled]) { + background-color: #0675d3; +} + +.popup-notification-button[default]:hover:active:not([disabled]) { + background-color: #0568ba; +} + +.popup-notification-button[anonid="secondarybutton"][hidden="true"] ~ .popup-notification-button[default] { + flex: 1; +} + +.popup-notification-button > .button-box { + padding: 0; + margin: 0; + /* prevent double border on windows when focused */ + border: none; +} + +.popup-notification-dropmarker { + flex: none; + padding: 0 15px; +} + +.popup-notification-dropmarker > .button-box > hbox { + display: none; +} + +.popup-notification-dropmarker > .button-box > .button-menu-dropmarker { + /* This is to override the linux !important */ + -moz-appearance: none !important; + display: -moz-box; + padding: 0; + margin: 0; +} + +.popup-notification-dropmarker > .button-box > .button-menu-dropmarker > .dropmarker-icon { + width: 16px; + height: 16px; + list-style-image: url(chrome://global/skin/icons/menubutton-dropmarker.svg); + filter: url(chrome://global/skin/filters.svg#fill); + fill: currentColor; } -.popup-notification-menubutton > .button-menubutton-button[disabled] { - opacity: 0.5; +.popup-notification-button:-moz-focusring { + outline: 1px -moz-dialogtext dotted; + outline-offset: -5px; } diff --git a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg index 837392f..9c66311 100644 --- a/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg +++ b/arc-firefox-theme/chrome/global/reader/RM-Type-Controls-Arrow.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/arc-firefox-theme/chrome/global/timepicker.css b/arc-firefox-theme/chrome/global/timepicker.css deleted file mode 100644 index e8d081b..0000000 --- a/arc-firefox-theme/chrome/global/timepicker.css +++ /dev/null @@ -1,153 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -:root { - --font-size-default: 1.1rem; - --spinner-width: 3rem; - --spinner-margin-top-bottom: 0.4rem; - --spinner-item-height: 2.4rem; - --spinner-item-margin-bottom: 0.1rem; - --spinner-button-height: 1.2rem; - --colon-width: 2rem; - --day-period-spacing-width: 1rem; - - --border: 0.1rem solid #D6D6D6; - --border-radius: 0.3rem; - - --font-color: #191919; - --fill-color: #EBEBEB; - - --selected-font-color: #FFFFFF; - --selected-fill-color: #0996F8; - - --button-font-color: #858585; - --button-font-color-hover: #4D4D4D; - --button-font-color-active: #191919; - - --disabled-opacity: 0.2; -} - -html { - font-size: 10px; -} - -body { - margin: 0; - color: var(--font-color); - font-size: var(--font-size-default); -} - -#time-picker { - display: flex; - flex-direction: row; - justify-content: space-around; -} - -.spinner-container { - font-family: sans-serif; - display: flex; - flex-direction: column; - width: var(--spinner-width); -} - -.spinner-container > button { - -moz-appearance: none; - border: none; - background: none; - background-color: var(--button-font-color); - height: var(--spinner-button-height); -} - -.spinner-container > button:hover { - background-color: var(--button-font-color-hover); -} - -.spinner-container > button.active { - background-color: var(--button-font-color-active); -} - -.spinner-container > button.up { - mask: url("chrome://global/skin/icons/find-arrows.svg#glyph-find-previous") no-repeat 50% 50%; -} - -.spinner-container > button.down { - mask: url("chrome://global/skin/icons/find-arrows.svg#glyph-find-next") no-repeat 50% 50%; -} - -.spinner-container.hide-buttons > button { - visibility: hidden; -} - -.spinner-container > .spinner { - position: relative; - width: 100%; - margin: var(--spinner-margin-top-bottom) 0; - cursor: default; - overflow-y: scroll; - scroll-snap-type: mandatory; - scroll-snap-points-y: repeat(100%); -} - -.spinner-container > .spinner > div { - box-sizing: border-box; - position: relative; - text-align: center; - padding: calc((var(--spinner-item-height) - var(--font-size-default)) / 2) 0; - margin-bottom: var(--spinner-item-margin-bottom); - height: var(--spinner-item-height); - -moz-user-select: none; - scroll-snap-coordinate: 0 0; -} - -.spinner-container > .spinner > div:hover::before { - background: var(--fill-color); - border: var(--border); - border-radius: var(--border-radius); - content: ""; - position: absolute; - top: 0%; - bottom: 0%; - left: 0%; - right: 0%; - z-index: -10; -} - -.spinner-container > .spinner:not(.scrolling) > div.selection { - color: var(--selected-font-color); -} - -.spinner-container > .spinner > div.selection::before { - background: var(--selected-fill-color); - border: none; - border-radius: var(--border-radius); - content: ""; - position: absolute; - top: 0%; - bottom: 0%; - left: 0%; - right: 0%; - z-index: -10; -} - -.spinner-container > .spinner > div.disabled::before, -.spinner-container > .spinner.scrolling > div.selection::before, -.spinner-container > .spinner.scrolling > div:hover::before { - display: none; -} - -.spinner-container > .spinner > div.disabled { - opacity: var(--disabled-opacity); -} - -.colon { - display: flex; - justify-content: center; - align-items: center; - width: var(--colon-width); - margin-bottom: 0.3rem; -} - -.spacer { - width: var(--day-period-spacing-width); -} \ No newline at end of file diff --git a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css index 981c04a..619a367 100644 --- a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css +++ b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css @@ -18,6 +18,10 @@ body { float: left; } +#sectionTitle:dir(rtl) { + float: right; +} + #refreshDiv { justify-content: flex-end; margin-bottom: 0.5em; @@ -86,6 +90,11 @@ body { background-size: 1.6em; } +.title:dir(rtl)::before { + left: auto; + right: -2.3em; +} + .warningBackground button { margin-top: 1em; margin-left: 0; diff --git a/arc-firefox-theme/chrome/mozapps/aboutProfiles.css b/arc-firefox-theme/chrome/mozapps/aboutProfiles.css index 09dc9ea..0640b71 100644 --- a/arc-firefox-theme/chrome/mozapps/aboutProfiles.css +++ b/arc-firefox-theme/chrome/mozapps/aboutProfiles.css @@ -48,6 +48,7 @@ th.column { td { border-color: var(--in-content-table-border-dark-color); + unicode-bidi: plaintext; /* Make sure file paths will be LTR */ } #action-box { diff --git a/arc-firefox-theme/chrome/mozapps/downloads/downloads.css b/arc-firefox-theme/chrome/mozapps/downloads/downloads.css deleted file mode 100644 index bb441f4..0000000 --- a/arc-firefox-theme/chrome/mozapps/downloads/downloads.css +++ /dev/null @@ -1,112 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#downloadManager { - background-color: ThreeDFace; -} - -/* Download View */ -#downloadView { - -moz-appearance: none !important; - margin: 0; - border-bottom: 2px solid; - -moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow; -} - -/* Download View Items */ -richlistitem[type="download"] { - padding: 4px 8px 4px 4px; - min-height: 46px; -} - -richlistitem[type="download"]:not([selected="true"]):nth-child(odd) { - background-color: -moz-oddtreerow; -} - -richlistitem[type="download"] .name { - font-size: larger; -} - -richlistitem[type="download"] .dateTime { - font-size: smaller; -} - -.mini-button { - -moz-appearance: none; - background-color: transparent; - border: none; - padding: 0; - margin: 0; - min-width: 0; - min-height: 0; -} - -.mini-button > .button-box { - padding: 0 !important; -} - -menuitem:not([type]) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); -} - -.cancel, -#menuitem_cancel { - list-style-image: url("moz-icon://stock/gtk-cancel?size=menu"); -} - -#menuitem_open { - list-style-image: url("moz-icon://stock/gtk-open?size=menu"); -} -#menuitem_open[disabled="true"] { - list-style-image: url("moz-icon://stock/gtk-open?size=menu&state=disabled"); -} - -.pause, -#menuitem_pause { - list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu"); -} - -.pause[disabled="true"], -#menuitem_pause[disabled="true"] { - list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu&state=disabled"); -} - -.resume, -#menuitem_resume { - list-style-image: url("moz-icon://stock/gtk-media-play?size=menu"); -} - -.retry, -#menuitem_retry { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); -} - -#menuitem_removeFromList { - list-style-image: url("moz-icon://stock/gtk-remove?size=menu"); -} - -#menuitem_copyLocation { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); -} - -.blockedIcon { - list-style-image: url("moz-icon://stock/gtk-dialog-error?size=dialog"); - width: 32px; - height: 32px; -} - -/* prevent flickering when changing states */ -.downloadTypeIcon { - min-height: 32px; - min-width: 32px; -} - -#clearListButton { - list-style-image: url(moz-icon://stock/gtk-clear?size=button); - margin-top: 3px; -} - -#clearListButton[disabled="true"] { - list-style-image: url(moz-icon://stock/gtk-clear?size=button&state=disabled); -} -- cgit v1.2.3 From f1e554fcca35a04b6bede84ba8dfd2f669a48c7c Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Thu, 20 Apr 2017 01:31:01 +0200 Subject: bump version --- arc-firefox-theme/install.rdf | 6 +++--- configure.ac | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arc-firefox-theme/install.rdf b/arc-firefox-theme/install.rdf index 14512f8..e10d79e 100644 --- a/arc-firefox-theme/install.rdf +++ b/arc-firefox-theme/install.rdf @@ -5,7 +5,7 @@ {52c2877e-44e1-11e5-8874-a62d1d5d46B0} - 52.20170311 + 53.20170420 4 Arc Theme Arc Theme for Firefox @@ -21,8 +21,8 @@ {ec8030f7-c20a-464f-9b0e-13a3a9e97384} - 52.0 - 55.0 + 53.0 + 56.0 diff --git a/configure.ac b/configure.ac index 11fc973..aacac62 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([arc-firefox-theme], [52.20170311], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme]) +AC_INIT([arc-firefox-theme], [53.20170420], [https://github.com/horst3180/arc-firefox-theme/issues], [arc-firefox-theme], [https://github.com/horst3180/arc-firefox-theme]) AM_INIT_AUTOMAKE([-Wno-portability no-dist-gzip dist-xz foreign subdir-objects tar-ustar]) AC_PREFIX_DEFAULT(/usr/local) AM_SILENT_RULES([yes]) -- cgit v1.2.3