From bc3725e858b0c1bc27dd1164cb2908dcef21f404 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sat, 11 Mar 2017 14:54:09 +0100 Subject: update to 52.0 --- arc-firefox-theme/chrome/browser/aboutNetError.css | 24 +- .../chrome/browser/aboutTabCrashed.css | 69 +++- .../chrome/browser/addons/addon-install-anchor.svg | 30 +- arc-firefox-theme/chrome/browser/browser.css | 375 +++++++---------- .../chrome/browser/controlcenter/panel.css | 10 +- .../custom_images/dark/tabs/tab-audio-small.svg | 99 ----- .../browser/custom_images/dark/tabs/tab-audio.svg | 150 ------- .../custom_images/light/tabs/tab-audio-small.svg | 97 ----- .../browser/custom_images/light/tabs/tab-audio.svg | 150 ------- .../chrome/browser/customizableui/panelUI.css | 12 +- arc-firefox-theme/chrome/browser/devedition.css | 1 - .../chrome/browser/devtools/common.css | 2 +- .../browser/downloads/allDownloadsViewOverlay.css | 194 +++++---- .../chrome/browser/downloads/buttons.png | Bin 12765 -> 0 bytes .../chrome/browser/downloads/downloads.css | 293 ++++++------- arc-firefox-theme/chrome/browser/menuPanel.svg | 1 - arc-firefox-theme/chrome/browser/newtab/newTab.css | 13 + .../chrome/browser/notification-icons.svg | 6 + arc-firefox-theme/chrome/browser/pageInfo.css | 13 - arc-firefox-theme/chrome/browser/panel-icons.svg | 10 + .../chrome/browser/places/organizer.css | 17 +- arc-firefox-theme/chrome/browser/places/places.css | 99 ----- .../chrome/browser/preferences/containers.css | 143 +++++++ .../browser/preferences/in-content/containers.css | 122 ++++++ .../browser/preferences/in-content/preferences.css | 3 +- .../privatebrowsing/aboutPrivateBrowsing.css | 17 + .../chrome/browser/sanitizeDialog.css | 2 +- .../chrome/browser/sass/_browser-sass.scss | 460 ++++++++------------- .../chrome/browser/sass/browser-dark.css | 375 +++++++---------- .../chrome/browser/sass/browser-darker.css | 375 +++++++---------- .../chrome/browser/sass/browser-light.css | 375 +++++++---------- arc-firefox-theme/chrome/browser/searchbar.css | 31 +- .../chrome/browser/tabbrowser/tab-audio-small.svg | 14 + .../chrome/browser/tabbrowser/tab-audio.svg | 3 + .../chrome/browser/usercontext/banking.svg | 8 - .../chrome/browser/usercontext/personal.svg | 8 - .../chrome/browser/usercontext/shopping.svg | 8 - .../chrome/browser/usercontext/work.svg | 8 - arc-firefox-theme/chrome/browser/warning-white.svg | 6 + arc-firefox-theme/chrome/browser/wifi.svg | 30 ++ .../chrome/global/aboutReaderControls.css | 1 + arc-firefox-theme/chrome/global/button.css | 196 --------- arc-firefox-theme/chrome/global/global.css | 8 +- .../chrome/global/icons/input-clear.svg | 16 + .../chrome/global/in-content/common.css | 10 + arc-firefox-theme/chrome/global/menu.css | 19 +- arc-firefox-theme/chrome/global/narrate.css | 35 ++ arc-firefox-theme/chrome/global/notification.css | 10 + arc-firefox-theme/chrome/global/popup.css | 10 +- .../chrome/global/scale/scale-tray-horiz.gif | Bin 0 -> 50 bytes .../chrome/global/scale/scale-tray-vert.gif | Bin 0 -> 50 bytes arc-firefox-theme/chrome/global/textbox.css | 55 --- arc-firefox-theme/chrome/global/timepicker.css | 153 +++++++ arc-firefox-theme/chrome/global/tree.css | 15 +- .../chrome/mozapps/aboutNetworking.css | 5 +- .../chrome/mozapps/extensions/extensions.css | 5 - .../chrome/mozapps/extensions/newaddon.css | 1 - .../chrome/mozapps/extensions/update.css | 4 - .../mozapps/plugins/contentPluginDisabled.png | Bin 1620 -> 0 bytes .../mozapps/plugins/contentPluginDownload.png | Bin 1061 -> 0 bytes .../mozapps/plugins/contentPluginMissing.png | Bin 1572 -> 0 bytes .../chrome/mozapps/plugins/pluginProblem.css | 17 +- 62 files changed, 1781 insertions(+), 2432 deletions(-) delete mode 100644 arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio-small.svg delete mode 100644 arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio.svg delete mode 100644 arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio-small.svg delete mode 100644 arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio.svg delete mode 100644 arc-firefox-theme/chrome/browser/downloads/buttons.png create mode 100644 arc-firefox-theme/chrome/browser/preferences/containers.css create mode 100644 arc-firefox-theme/chrome/browser/preferences/in-content/containers.css delete mode 100644 arc-firefox-theme/chrome/browser/usercontext/banking.svg delete mode 100644 arc-firefox-theme/chrome/browser/usercontext/personal.svg delete mode 100644 arc-firefox-theme/chrome/browser/usercontext/shopping.svg delete mode 100644 arc-firefox-theme/chrome/browser/usercontext/work.svg create mode 100644 arc-firefox-theme/chrome/browser/warning-white.svg create mode 100644 arc-firefox-theme/chrome/browser/wifi.svg create mode 100644 arc-firefox-theme/chrome/global/icons/input-clear.svg create mode 100644 arc-firefox-theme/chrome/global/scale/scale-tray-horiz.gif create mode 100644 arc-firefox-theme/chrome/global/scale/scale-tray-vert.gif create mode 100644 arc-firefox-theme/chrome/global/timepicker.css delete mode 100644 arc-firefox-theme/chrome/mozapps/plugins/contentPluginDisabled.png delete mode 100644 arc-firefox-theme/chrome/mozapps/plugins/contentPluginDownload.png delete mode 100644 arc-firefox-theme/chrome/mozapps/plugins/contentPluginMissing.png diff --git a/arc-firefox-theme/chrome/browser/aboutNetError.css b/arc-firefox-theme/chrome/browser/aboutNetError.css index 7141c0c..c0b76aa 100644 --- a/arc-firefox-theme/chrome/browser/aboutNetError.css +++ b/arc-firefox-theme/chrome/browser/aboutNetError.css @@ -16,6 +16,10 @@ body.certerror { #f0d000 66%, #f0d000); } +body.captiveportal .title { + background-image: url("wifi.svg"); +} + body.certerror .title { background-image: url("cert-error.svg"); } @@ -39,15 +43,15 @@ button:disabled { display: none; } -#certErrorButtonContainer { +#certErrorAndCaptivePortalButtonContainer { display: none; } -body.certerror #certErrorButtonContainer { +body:not(.neterror) #certErrorAndCaptivePortalButtonContainer { display: flex; } -body.certerror #netErrorButtonContainer { +body:not(.neterror) #netErrorButtonContainer { display: none; } @@ -64,7 +68,19 @@ body.certerror #netErrorButtonContainer { display: none; } -body.certerror #advancedButton { +body.captiveportal #returnButton { + display: none; +} + +body:not(.captiveportal) #openPortalLoginPageButton { + display: none; +} + +#openPortalLoginPageButton { + margin-inline-start: 0; +} + +body:not(.neterror) #advancedButton { display: block; } diff --git a/arc-firefox-theme/chrome/browser/aboutTabCrashed.css b/arc-firefox-theme/chrome/browser/aboutTabCrashed.css index e42922a..264fb42 100644 --- a/arc-firefox-theme/chrome/browser/aboutTabCrashed.css +++ b/arc-firefox-theme/chrome/browser/aboutTabCrashed.css @@ -2,16 +2,35 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +body { + font-size: 1.25rem; +} + .title { background-image: url("chrome://browser/skin/tab-crashed.svg"); } +.title > h1, +.offers { + margin-left: 14px; +} + +.title > h1 { + /** + * Add commentary? + */ + padding-right: 14px; +} + +.container { + width: 45%; +} + #reportSent { font-weight: bold; } -#crash-reporter-container { - width: 80%; +#reportBox { background-color: var(--in-content-box-background-hover); margin: 24px 0; padding: 14px; @@ -19,6 +38,10 @@ border-radius: 2px; } +#reportBox > h2:first-child { + margin-top: 0; +} + #crash-reporter-title { font-weight: bold; margin: 0 0 14px 0; @@ -31,12 +54,48 @@ textarea { resize: none; } +input[type="text"], +input[type="checkbox"] { + -moz-margin-start: 0px; +} + #options { list-style: none; margin-inline-start: 0; } -input[type="text"], -#options > li { - margin: 14px 0 0 0; +#options > li, +#email { + margin-top: 14px; +} + +.checkbox-with-label { + display: flex; } + +.checkbox-with-label > label { + margin-top: auto; + margin-bottom: auto; +} + +/** + * Hack alert: the #autoSubmit checkbox has a long label, which means + * it often wraps, at least in en-US. Bug 418833 and bug 1317795 allows + * us to fix this properly, but bug 418833 didn't uplift in time for this + * release. We use some hackery here to make sure that this label wraps + * properly, and doesn't end up underneath the checkbox pseudoelement. + * We do this by setting a negative margin on the pseudoelement, and then + * a positive equivalent margin on the label itself. + * + * The magic number of 35px is derived from the total width of the checkbox. + * The checkbox width is explicitly set at 23px. This, plus the 1px border on either + * side gives us 25px. Then there's the 10px margin-inline-end, which gives us 35px. + */ +#autoSubmit + label:before { + margin-inline-start: -35px; +} + +#autoSubmit + label { + margin-inline-start: 35px; + line-height: 1.75em; +} \ No newline at end of file diff --git a/arc-firefox-theme/chrome/browser/addons/addon-install-anchor.svg b/arc-firefox-theme/chrome/browser/addons/addon-install-anchor.svg index 60c59cf..901109e 100644 --- a/arc-firefox-theme/chrome/browser/addons/addon-install-anchor.svg +++ b/arc-firefox-theme/chrome/browser/addons/addon-install-anchor.svg @@ -3,9 +3,37 @@ - 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/. --> + - + diff --git a/arc-firefox-theme/chrome/browser/browser.css b/arc-firefox-theme/chrome/browser/browser.css index 2f8a0c9..6ccccc4 100644 --- a/arc-firefox-theme/chrome/browser/browser.css +++ b/arc-firefox-theme/chrome/browser/browser.css @@ -285,194 +285,6 @@ menuitem.bookmark-item { .bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text { opacity: 0.7; } -/* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } - -#placesContext_open\:newwindow, -#menu_newNavigator, -#context-openlink, -#context-openframe { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 80px 16px 64px); } - -#placesContext_open\:newtab, -#placesContext_openContainer\:tabs, -#menu_newNavigatorTab, -#context-openlinkintab, -#context-openlinkincontainertab, -#context-openframeintab { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 64px 16px 48px); } - -#menu_openFile { - list-style-image: url("moz-icon://stock/gtk-open?size=menu"); } - -#menu_close { - list-style-image: url("moz-icon://stock/gtk-close?size=menu"); } - -#context-media-play { - list-style-image: url("moz-icon://stock/gtk-media-play?size=menu"); } - -#context-media-pause { - list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu"); } - -#menu_savePage, -#context-savelink, -#context-saveimage, -#context-savevideo, -#context-saveaudio, -#context-savepage, -#context-saveframe { - list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); } - -#menu_printPreview { - list-style-image: url("moz-icon://stock/gtk-print-preview?size=menu"); } - -#menu_print, -#context-printframe { - list-style-image: url("moz-icon://stock/gtk-print?size=menu"); } - -#menu_FileQuitItem { - list-style-image: url("moz-icon://stock/gtk-quit?size=menu"); } - -#menu_undo, -#context-undo { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); } - -#menu_undo[disabled], -#context-undo[disabled] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); } - -#menu_redo { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); } - -#menu_redo[disabled] { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu&state=disabled"); } - -#menu_cut, -#placesContext_cut, -#context-cut { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); } - -#menu_cut[disabled], -#placesContext_cut[disabled], -#context-cut[disabled] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); } - -#menu_copy, -#placesContext_copy, -#context-copy, -#context-copyimage, -#context-copyvideourl, -#context-copyaudiourl, -#context-copylink, -#context-copyemail { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); } - -#menu_copy[disabled], -#placesContext_copy[disabled], -#context-copy[disabled] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); } - -#menu_paste, -#placesContext_paste, -#context-paste { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); } - -#menu_paste[disabled], -#placesContext_paste[disabled], -#context-paste[disabled] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); } - -#menu_delete, -#placesContext_delete, -#placesContext_delete_history, -#context-delete { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); } - -#menu_delete[disabled], -#placesContext_delete[disabled], -#placesContext_delete_history[disabled], -#context-delete[disabled] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); } - -#menu_selectAll, -#context-selectall { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); } - -#menu_find { - list-style-image: url("moz-icon://stock/gtk-find?size=menu"); } - -#menu_find[disabled] { - list-style-image: url("moz-icon://stock/gtk-find?size=menu&state=disabled"); } - -#menu_preferences { - list-style-image: url("moz-icon://stock/gtk-preferences?size=menu"); } - -#placesContext_reload, -#context-reloadframe { - list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } - -#menu_zoomEnlarge { - list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu"); } - -#menu_zoomReduce { - list-style-image: url("moz-icon://stock/gtk-zoom-out?size=menu"); } - -#menu_zoomReset { - list-style-image: url("moz-icon://stock/gtk-zoom-100?size=menu"); } - -#menu_showAllHistory { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 32px 16px 16px); } - -#bookmarksShowAll { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 48px 16px 32px); } - -#subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/page-livemarks.png"); } - -#bookmarksToolbarFolderMenu, -#BMB_bookmarksToolbar, -#panelMenu_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); } - -#menu_unsortedBookmarks, -#BMB_unsortedBookmarks, -#panelMenu_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } - -#menu_openDownloads { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 16px 16px 0px); } - -#menu_openAddons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); } - -#menu_pageInfo, -#context-viewinfo, -#context-viewframeinfo { - list-style-image: url("moz-icon://stock/gtk-info?size=menu"); } - -#placesContext_open\:newprivatewindow, -#privateBrowsingItem { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); } - -#placesContext_show\:info { - list-style-image: url("moz-icon://stock/gtk-properties?size=menu"); } - -#sanitizeItem { - list-style-image: url("moz-icon://stock/gtk-clear?size=menu"); } - -#menu_openHelp { - list-style-image: url("moz-icon://stock/gtk-help?size=menu"); } - -#aboutName { - list-style-image: url("moz-icon://stock/gtk-about?size=menu"); } - /* Primary toolbar buttons */ :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon, :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { @@ -1439,6 +1251,12 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { width: 16px; height: 16px; } +#urlbar[actiontype="extension"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); + width: 16px; + height: 16px; } + /* SHARING ICON */ #sharing-icon { width: 16px; @@ -1560,8 +1378,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .popup-notification-icon[popupid="password"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed); } -.camera-icon, -.popup-notification-icon[popupid="webRTC-shareDevices"] { +.camera-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } .camera-icon.in-use { @@ -1579,10 +1396,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .microphone-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } -.popup-notification-icon[popupid="webRTC-shareMicrophone"] { +.popup-notification-icon.microphone-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed); } -.popup-notification-icon[popupid="webRTC-shareScreen"], .screen-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } @@ -1592,6 +1408,30 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .screen-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } +#webRTC-preview:not([hidden]) { + display: -moz-stack; + border-radius: 4px; + border: 1px solid GrayText; + overflow: hidden; + min-width: 300px; + min-height: 10em; } + +html|*#webRTC-previewVideo { + width: 300px; + /* If we don't set the min-width, width is ignored. */ + min-width: 300px; + max-height: 200px; } + +#webRTC-previewWarning { + background: rgba(255, 217, 99, 0.8) url("chrome://browser/skin/warning-white.svg") no-repeat 0.75em 0.75em; + margin: 0; + padding: .5em; + padding-inline-start: calc(1.5em + 16px); + border-top: 1px solid GrayText; } + +#webRTC-previewWarning > .text-link { + margin-inline-start: 0; } + /* This icon has a block sign in it, so we don't need a blocked version. */ .popup-icon { list-style-image: url("chrome://browser/skin/notification-icons.svg#popup"); } @@ -1618,7 +1458,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { transform: translateX(0); } } /* INSTALL ADDONS */ .install-icon { - list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); } + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); } .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-install-blocked"], @@ -1828,6 +1668,57 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } +/* AutoComplete */ +#PopupAutoComplete > richlistbox > richlistitem { + height: 20px; + min-height: 20px; + border: 0; + border-radius: 0; + padding: 0px 1px 0px 1px; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-site-icon { + margin-inline-start: 4px; + margin-inline-end: 0; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-title { + font: icon; + margin-inline-start: 4px; } + +#PopupAutoComplete > richlistbox { + padding: 0; } + +/* Login form autocompletion */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { + display: initial; + list-style-image: url(chrome://browser/skin/notification-icons.svg#login); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] { + list-style-image: url(chrome://browser/skin/notification-icons.svg#login-highlighted); } + +/* Insecure field warning */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] { + background-color: var(--arrowpanel-dimmed); + border-bottom: 1px solid var(--panel-separator-color); + padding-bottom: 4px; + padding-top: 4px; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] { + background-color: var(--arrowpanel-dimmed-further); + color: -moz-DialogText; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title { + color: GrayText; + font-size: 1em; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] > .ac-title { + color: inherit; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { + list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] { + border-top: 1px solid ThreeDShadow; } + #treecolAutoCompleteImage { max-width: 36px; } @@ -2302,18 +2193,23 @@ html|span.ac-emphasize-text-url { list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } .tab-icon-overlay[soundplaying], -.tab-icon-overlay[muted]:not([crashed]) { +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]) { border-radius: 8px; } .tab-icon-overlay[soundplaying]:hover, -.tab-icon-overlay[muted]:not([crashed]):hover { +.tab-icon-overlay[muted]:not([crashed]):hover, +.tab-icon-overlay[blocked]:not([crashed]):hover { background-color: white; } .tab-icon-overlay[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio"); } .tab-icon-overlay[muted]:not([crashed]) { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio-muted"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted"); } + +.tab-icon-overlay[blocked]:not([crashed]) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked"); } .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/custom_images/connecting.png"); } @@ -2336,27 +2232,38 @@ html|span.ac-emphasize-text-url { height: 16px; padding: 0; } -.tab-icon-sound[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab"); } +.tab-icon-sound[soundplaying], +.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); + fill: currentColor; } -.tab-icon-sound[soundplaying]:hover { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } +.tab-icon-sound[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } -.tab-icon-sound[soundplaying]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } +.tab-icon-sound[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } -.tab-icon-sound[muted] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } +.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); } -.tab-icon-sound[muted]:hover { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } +.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); } -.tab-icon-sound[muted]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } +.tab-icon-sound[soundplaying]:not(:hover), +.tab-icon-sound[muted]:not(:hover), +.tab-icon-sound[blocked]:not(:hover) { + opacity: .8; } -.tab-icon-sound:-moz-lwtheme, -.tab-icon-sound[selected=true][soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); } +.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover), +.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) { + transition: opacity 0.3s linear var(--soundplaying-removal-delay); + opacity: 0; } .tab-background, .tabs-newtab-button { @@ -2507,6 +2414,7 @@ lwtHeader;*/ .tabs-newtab-button, .tab-icon-overlay[soundplaying], .tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]), .tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2537,6 +2445,24 @@ lwtHeader;*/ .tabs-newtab-button { width: calc(36px + 30px); } +/* All tabs menupopup */ +.alltabs-item[tabIsVisible] { + /* box-shadow instead of background-color to work around native styling */ + box-shadow: inset -5px 0 ThreeDShadow; } + +.alltabs-endimage[soundplaying], +.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); + fill: currentColor; } + +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } + #tabbrowser-tabs { /* override the global style to allow the selected tab to be above the nav-bar */ z-index: auto; } @@ -3600,12 +3526,7 @@ toolbar[brighttext] #downloads-indicator-counter { .customizationmode-button > .button-box > .button-icon { height: 24px; } -#customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); - -moz-image-region: rect(0, 24px, 24px, 0); } - -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text, -#customization-titlebar-visibility-button > .button-box > .button-text { +#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text { /* Sadly, button.css thinks its margins are perfect for everyone. */ margin-inline-start: 6px !important; } @@ -3613,21 +3534,9 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; + background-image: url("chrome://browser/skin/theme-switcher-icon.png"); background-size: contain; } -#customization-titlebar-visibility-button > .button-box > .button-icon { - vertical-align: middle; } - -#customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 48px, 24px, 24px); } - -@media (min-resolution: 1.1dppx) { - #customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle@2x.png"); - -moz-image-region: rect(0, 48px, 48px, 0); } - - #customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 96px, 48px, 48px); } } #main-window[customize-entered] #customization-panel-container { background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"), url("chrome://browser/skin/customizableui/customizeMode-separatorVertical.png"), url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"), url("chrome://browser/skin/customizableui/background-noise-toolbar.png"), linear-gradient(to bottom, #3e86ce, #3878ba); background-position: center top, left center, left top, left top, left top; @@ -4226,7 +4135,6 @@ notification.heartbeat { list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); } #context-navigation > .menuitem-iconic > .menu-iconic-left { - visibility: visible; /* override toolkit/themes/linux/global/menu.css */ padding-inline-end: 0 !important; margin-inline-end: 0 !important; } @@ -4238,9 +4146,6 @@ notification.heartbeat { .webextension-popup-browser { border-radius: inherit; } -.menuitem-iconic[usercontextid] > .menu-iconic-left > .menu-iconic-icon { - visibility: visible; } - #nav-bar #loop-button, #nav-bar toolbar[brighttext] #loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg") !important; } diff --git a/arc-firefox-theme/chrome/browser/controlcenter/panel.css b/arc-firefox-theme/chrome/browser/controlcenter/panel.css index c872205..0488442 100644 --- a/arc-firefox-theme/chrome/browser/controlcenter/panel.css +++ b/arc-firefox-theme/chrome/browser/controlcenter/panel.css @@ -81,7 +81,7 @@ } #identity-popup-multiView > .panel-viewcontainer > .panel-viewstack > .panel-subviews { - background: var(--panel-arrowcontent-background); + background: var(--arrowpanel-background); padding: 0; } @@ -123,12 +123,8 @@ width: var(--identity-popup-expander-width); border: 0 none; -moz-appearance: none; - background-image: url("chrome://browser/skin/controlcenter/arrow-subview.svg"), - linear-gradient(rgba(255,255,255,0.3), transparent); + background: url("chrome://browser/skin/controlcenter/arrow-subview.svg") center no-repeat; background-size: 16px, auto; - background-position: center; - background-repeat: no-repeat; - background-color: transparent; } .identity-popup-expander:-moz-locale-dir(rtl) { @@ -156,6 +152,8 @@ .identity-popup-expander:hover { background-color: var(--arrowpanel-dimmed); + background-image: url("chrome://browser/skin/controlcenter/arrow-subview.svg"), + linear-gradient(rgba(255,255,255,0.3), transparent); } .identity-popup-expander:hover:active { diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio-small.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio-small.svg deleted file mode 100644 index c5bff69..0000000 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio-small.svg +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio.svg b/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio.svg deleted file mode 100644 index c2ff76e..0000000 --- a/arc-firefox-theme/chrome/browser/custom_images/dark/tabs/tab-audio.svg +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio-small.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio-small.svg deleted file mode 100644 index 8326f46..0000000 --- a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio-small.svg +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - diff --git a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio.svg b/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio.svg deleted file mode 100644 index 24231c6..0000000 --- a/arc-firefox-theme/chrome/browser/custom_images/light/tabs/tab-audio.svg +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - diff --git a/arc-firefox-theme/chrome/browser/customizableui/panelUI.css b/arc-firefox-theme/chrome/browser/customizableui/panelUI.css index 7549339..17faf34 100644 --- a/arc-firefox-theme/chrome/browser/customizableui/panelUI.css +++ b/arc-firefox-theme/chrome/browser/customizableui/panelUI.css @@ -150,7 +150,7 @@ .panel-subviews { padding: 4px; background-clip: padding-box; - border-left: 1px solid var(--panel-arrowcontent-border-color); + border-left: 1px solid var(--arrowpanel-border-color); box-shadow: 0 3px 5px hsla(210,4%,10%,.1), 0 0 7px hsla(210,4%,10%,.1); margin-inline-start: var(--panel-ui-exit-subview-gutter-width); @@ -557,7 +557,7 @@ toolbarpaletteitem[place="palette"] > toolbaritem > toolbarbutton { content: ""; width: 14px; height: 14px; - margin-right: 16.5px; + margin-inline-end: 16.5px; box-shadow: 0px 1px 0px rgba(255,255,255,.2) inset, 0px -1px 0px rgba(0,0,0,.1) inset, 0px 1px 0px rgba(12,27,38,.2); border-radius: 2px; background-size: contain; @@ -1757,7 +1757,7 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { } .panel-subviews { - background-color: var(--panel-arrowcontent-background); + background-color: var(--arrowpanel-background); } #BMB_bookmarksPopup > menuitem[type="checkbox"] { @@ -1766,9 +1766,9 @@ menuitem[checked="true"].subviewbutton > .menu-iconic-left { #BMB_bookmarksPopup menupopup { -moz-appearance: none; - background: var(--panel-arrowcontent-background); - color: var(--panel-arrowcontent-color); - border: 1px solid var(--panel-arrowcontent-border-color); + background: var(--arrowpanel-background); + color: var(--arrowpanel-color); + border: 1px solid var(--arrowpanel-border-color); margin-top: -6px; padding-top: 1px; } diff --git a/arc-firefox-theme/chrome/browser/devedition.css b/arc-firefox-theme/chrome/browser/devedition.css index 1331705..43603c1 100644 --- a/arc-firefox-theme/chrome/browser/devedition.css +++ b/arc-firefox-theme/chrome/browser/devedition.css @@ -182,7 +182,6 @@ toolbar[brighttext] #downloads-indicator-counter { #TabsToolbar { text-shadow: none !important; - color: var(--chrome-color) !important; /* Make sure that the brighttext attribute is added */ } /* URL bar and search bar*/ diff --git a/arc-firefox-theme/chrome/browser/devtools/common.css b/arc-firefox-theme/chrome/browser/devtools/common.css index fb6a8fe..c8a9956 100644 --- a/arc-firefox-theme/chrome/browser/devtools/common.css +++ b/arc-firefox-theme/chrome/browser/devtools/common.css @@ -7,4 +7,4 @@ * specific path. */ -@import url("chrome://devtools/skin/common.css"); +@import url("resource://devtools/client/themes/common.css"); diff --git a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css index 9d1a568..2b23903 100644 --- a/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css +++ b/arc-firefox-theme/chrome/browser/downloads/allDownloadsViewOverlay.css @@ -22,22 +22,14 @@ height: var(--downloads-item-height); } -#downloadsRichListBox > richlistitem.download { - padding: 5px 8px; -} - .downloadTypeIcon { - margin-top: 8px; - margin-inline-end: 12px; - margin-bottom: 8px; - margin-inline-start: 0; + margin: 8px 13px; width: 32px; height: 32px; } - .downloadBlockedBadge { - margin: 0 4px; + margin: 0 5px; background: url("chrome://browser/skin/downloads/download-blocked.svg") top right / 16px no-repeat; } @@ -53,107 +45,159 @@ richlistitem.download[verdict="Uncommon"] .downloadBlockedBadge { background-image: url("chrome://browser/skin/info.svg"); } +richlistitem.download > toolbarseparator { + display: none; +} + .downloadTarget { - margin-bottom: 3px; - cursor: inherit; + margin: 0; } .downloadDetails { opacity: 0.7; font-size: 95%; - cursor: inherit; + /* Use calc() to keep the height consistent with .downloadTarget, so that the + progress bar can be vertically centered. */ + margin: 4px 0 calc(1em / 0.95 - 1em); } .downloadButton { -moz-appearance: none; + -moz-box-align: center; background: transparent; min-width: 0; min-height: 0; - margin: 3px; + margin: 0; border: none; - padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); + color: inherit; + padding: 0 18px; } -/*** List items ***/ - -:root { - --downloads-item-height: 5em; +.downloadButton > .button-box { + -moz-appearance: none; + padding: 2px !important; + border-radius: 50%; } -/*** Button icons ***/ - -.downloadButton.downloadIconCancel { - -moz-image-region: rect(0px, 16px, 16px, 0px); -} -richlistitem.download:hover .downloadButton.downloadIconCancel { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} -richlistitem.download:hover .downloadButton.downloadIconCancel:hover { - -moz-image-region: rect(0px, 48px, 16px, 32px); -} -richlistitem.download:hover .downloadButton.downloadIconCancel:active { - -moz-image-region: rect(0px, 64px, 16px, 48px); -} -richlistitem.download[selected] .downloadButton.downloadIconCancel { - -moz-image-region: rect(0px, 80px, 16px, 64px); -} -richlistitem.download[selected]:hover .downloadButton.downloadIconCancel { - -moz-image-region: rect(0px, 96px, 16px, 80px); +.downloadButton > .button-box > .button-icon { + width: 16px; + height: 16px; + margin: 0; + filter: url("chrome://browser/skin/filters.svg#fill"); + fill: currentColor; } -richlistitem.download[selected]:hover .downloadButton.downloadIconCancel:hover { - -moz-image-region: rect(0px, 112px, 16px, 96px); + +.downloadButton > .button-box > .button-text { + display: none; } -richlistitem.download[selected]:hover .downloadButton.downloadIconCancel:active { - -moz-image-region: rect(0px, 128px, 16px, 112px); + +.downloadButton:hover > .button-box { + background-color: graytext; + color: -moz-field; } -.downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 16px, 32px, 0px); +.downloadButton:hover:active > .button-box { + background-color: -moz-fieldtext; } -richlistitem.download:hover .downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 32px, 32px, 16px); + +richlistitem.download[selected] > .downloadButtonArea > .downloadButton:hover > .button-box { + background-color: HighlightText; + color: Highlight; } -richlistitem.download:hover .downloadButton.downloadIconShow:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); + +richlistitem.download[selected] > .downloadButtonArea > .downloadButton:hover:active > .button-box { + background-color: -moz-field; + color: -moz-fieldtext; } -richlistitem.download:hover .downloadButton.downloadIconShow:active { - -moz-image-region: rect(16px, 64px, 32px, 48px); + +/*** Button icons ***/ + +.downloadIconCancel > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel"); } -richlistitem.download[selected] .downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 80px, 32px, 64px); + +.downloadIconShow > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#folder"); } -richlistitem.download[selected]:hover .downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 96px, 32px, 80px); + +.downloadIconRetry > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#retry"); } -richlistitem.download[selected]:hover .downloadButton.downloadIconShow:hover { - -moz-image-region: rect(16px, 112px, 32px, 96px); + +/*** Progressmeter ***/ +/*** Common-styled progressmeter ***/ +.downloadProgress { + height: 8px; + border-radius: 1px; + margin: 4px 0 0; + margin-inline-end: 12px; + + /* for overriding rules in progressmeter.css */ + -moz-appearance: none; + border-style: none; + background-color: transparent; + min-width: initial; + min-height: initial; } -richlistitem.download[selected]:hover .downloadButton.downloadIconShow:active { - -moz-image-region: rect(16px, 128px, 32px, 112px); + +.downloadProgress[mode="undetermined"] { + /* for overriding rules on global.css in Linux. */ + -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter"); } -.downloadButton.downloadIconRetry { - -moz-image-region: rect(32px, 16px, 48px, 0px); +.downloadProgress > .progress-bar { + background-color: Highlight; + + /* for overriding rules in progressmeter.css */ + -moz-appearance: none; } -richlistitem.download:hover .downloadButton.downloadIconRetry { - -moz-image-region: rect(32px, 32px, 48px, 16px); + +.downloadProgress[paused="true"] > .progress-bar { + background-color: GrayText; } -richlistitem.download:hover .downloadButton.downloadIconRetry:hover { - -moz-image-region: rect(32px, 48px, 48px, 32px); + +.downloadProgress[mode="undetermined"] > .progress-bar { + /* Make a white reflecting animation. + Create a gradient with 2 identical pattern, and enlarge the size to 200%. + This allows us to animate background-position with percentage. */ + background-image: linear-gradient(90deg, transparent 0%, + rgba(255,255,255,0.5) 25%, + transparent 50%, + rgba(255,255,255,0.5) 75%, + transparent 100%); + background-blend-mode: lighten; + background-size: 200% 100%; + animation: downloadProgressSlideX 1.5s linear infinite; } -richlistitem.download:hover .downloadButton.downloadIconRetry:active { - -moz-image-region: rect(32px, 64px, 48px, 48px); + +.downloadProgress > .progress-remainder { + border: solid ButtonShadow; + border-block-start-width: 1px; + border-block-end-width: 1px; + border-inline-start-width: 0; + border-inline-end-width: 1px; + background-color: ButtonFace; } -richlistitem.download[selected] .downloadButton.downloadIconRetry { - -moz-image-region: rect(32px, 80px, 48px, 64px); + +.downloadProgress[value="0"] > .progress-remainder { + border-width: 1px; } -richlistitem.download[selected]:hover .downloadButton.downloadIconRetry { - -moz-image-region: rect(32px, 96px, 48px, 80px); + +.downloadProgress > .progress-remainder[mode="undetermined"] { + border: none; } -richlistitem.download[selected]:hover .downloadButton.downloadIconRetry:hover { - -moz-image-region: rect(32px, 112px, 48px, 96px); + +@keyframes downloadProgressSlideX { + 0% { + background-position: 0 0; + } + 100% { + background-position: -100% 0; + } } -richlistitem.download[selected]:hover .downloadButton.downloadIconRetry:active { - -moz-image-region: rect(32px, 128px, 48px, 112px); + +/*** List items ***/ + +:root { + --downloads-item-height: 5em; } diff --git a/arc-firefox-theme/chrome/browser/downloads/buttons.png b/arc-firefox-theme/chrome/browser/downloads/buttons.png deleted file mode 100644 index 0c91695..0000000 Binary files a/arc-firefox-theme/chrome/browser/downloads/buttons.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/browser/downloads/downloads.css b/arc-firefox-theme/chrome/browser/downloads/downloads.css index ec00aba..1bd933a 100644 --- a/arc-firefox-theme/chrome/browser/downloads/downloads.css +++ b/arc-firefox-theme/chrome/browser/downloads/downloads.css @@ -22,11 +22,9 @@ #downloadsListBox { background: transparent; - padding: 4px; color: inherit; -moz-appearance: none; margin: 0; - border: none; } #emptyDownloads { @@ -42,7 +40,8 @@ border-top: 1px solid var(--panel-separator-color); } -.downloadsPanelFooter toolbarseparator { +.downloadsPanelFooter toolbarseparator, +richlistitem[type="download"] > toolbarseparator { margin: 0; border: 0; min-width: 0; @@ -105,6 +104,11 @@ toolbarseparator.downloadsDropmarkerSplitter { margin: 7px 0; } +richlistitem[type="download"] > toolbarseparator { + margin: 10px 0; +} + +richlistitem[type="download"]:hover > toolbarseparator, #downloadsFooter:hover toolbarseparator.downloadsDropmarkerSplitter, #downloadsFooter[showingdropdown] toolbarseparator { margin: 0; @@ -141,8 +145,6 @@ toolbarseparator.downloadsDropmarkerSplitter { } #downloadsSummary { - padding: 0 12px; - cursor: pointer; -moz-user-focus: normal; } @@ -159,37 +161,26 @@ toolbarseparator.downloadsDropmarkerSplitter { #downloadsSummary, richlistitem[type="download"] { height: var(--downloads-item-height); - padding-inline-end: 0; - color: inherit; } richlistitem[type="download"] { - margin: 0; - border-top: 1px solid var(--downloads-item-border-top-color); - border-bottom: 1px solid var(--downloads-item-border-bottom-color); + border-bottom: 1px solid var(--panel-separator-color); background: transparent; - padding: 8px; -} - -richlistitem[type="download"]:first-child { - border-top: 1px solid transparent; + color: inherit; } richlistitem[type="download"]:last-child { - border-bottom: 1px solid transparent; + border-bottom: none; } .downloadTypeIcon { - margin-top: 8px; - margin-inline-end: 12px; - margin-bottom: 8px; - margin-inline-start: 0; + margin: 8px 13px; width: 32px; height: 32px; } .downloadBlockedBadge { - margin: 0 4px; + margin: 0 5px; background: url("chrome://browser/skin/downloads/download-blocked.svg") top right / 16px no-repeat; } @@ -219,43 +210,99 @@ richlistitem[type="download"][verdict="Uncommon"] .downloadBlockedBadge { font-size of .downloadContainer's parent, we use calc to go from the smaller font-size back to the original font-size. */ -#downloadsSummaryDetails, .downloadContainer { font-size: calc(100% * var(--downloads-item-font-size-factor)); + margin-inline-end: 13px; } #downloadsSummaryDescription, .downloadTarget { - margin-bottom: var(--downloads-item-target-margin-bottom); - cursor: inherit; -} - -.downloadTarget { + margin: 0; font-size: calc(100% / var(--downloads-item-font-size-factor)); } #downloadsSummaryDetails, .downloadDetails { - margin-top: var(--downloads-item-details-margin-top); opacity: var(--downloads-item-details-opacity); - cursor: inherit; + /* Use calc() to keep the height consistent with .downloadTarget, so that the + progress bar can be vertically centered. */ + margin: 4px 0 calc(1em / var(--downloads-item-font-size-factor) - 1em); +} + +richlistitem[type="download"][verdict] > toolbarseparator { + visibility: hidden; } .downloadButton { -moz-appearance: none; - min-width: 0; - min-height: 0; - margin: 3px; + min-width: 58px; + margin: 0; border: none; background: transparent; - padding: 5px; - list-style-image: url("chrome://browser/skin/downloads/buttons.png"); + padding: 0; + color: inherit; } -.downloadButton > .button-box { +.downloadButton > .button-box > .button-icon { + width: 16px; + height: 16px; + margin: 1px; + filter: url("chrome://browser/skin/filters.svg#fill"); + fill: currentColor; +} + +.downloadButton > .button-box > .button-text { + margin: 0 !important; padding: 0; } +richlistitem[type="download"][state="1"][exists] .downloadMainArea:hover, +richlistitem[type="download"]:not([verdict]) > .downloadButtonArea:hover, +richlistitem[type="download"][verdict]:hover { + background-color: var(--arrowpanel-dimmed); +} + +richlistitem[type="download"][state="1"][exists] > .downloadMainArea:hover:active, +richlistitem[type="download"]:not([verdict]) > .downloadButtonArea:hover:active, +richlistitem[type="download"][verdict]:hover:active { + background-color: var(--arrowpanel-dimmed-further); +} + +richlistitem[type="download"][showingsubview] { + background-color: Highlight; + color: HighlightText; + transition: background-color var(--panelui-subview-transition-duration), + color var(--panelui-subview-transition-duration); +} + +richlistitem[type="download"][verdict="Malware"]:hover, +richlistitem[type="download"][verdict="Malware"]:hover:active, +richlistitem[type="download"][verdict="Malware"][showingsubview] { + background-color: #aa1b08; + color: white; +} + +/*** Button icons ***/ + +.downloadIconCancel > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#cancel"); +} + +.downloadIconShow > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#folder"); +} + +.downloadIconRetry > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#retry"); +} + +.downloadShowBlockedInfo > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-right"); +} + +.downloadShowBlockedInfo > .button-box > .button-icon:-moz-locale-dir(rtl) { + list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-left"); +} /*** Blocked subview ***/ @@ -268,11 +315,15 @@ richlistitem[type="download"][verdict="Uncommon"] .downloadBlockedBadge { /* When the subview is showing, turn the download button into an arrow pointing back to the main view. */ #downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton { - list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted.png"); + color: HighlightText; } -#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton:-moz-locale-dir(rtl) { - list-style-image: url("chrome://browser/skin/customizableui/subView-arrow-back-inverted-rtl.png"); +#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton > .button-box > .button-icon { + list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-left"); +} + +#downloadsPanel-multiView > .panel-viewcontainer > .panel-viewstack[viewtype="subview"] .download-state[showingsubview] .downloadButton > .button-box > .button-icon:-moz-locale-dir(rtl) { + list-style-image: url("chrome://browser/skin/panel-icons.svg#arrow-right"); } #downloadsPanel-blockedSubview { @@ -310,126 +361,90 @@ richlistitem[type="download"][verdict="Uncommon"] .downloadBlockedBadge { -moz-margin-end: 16px; } -/*** Panel and outer controls ***/ - -#downloadsPanel[keyfocus] #downloadsSummary:focus, -#downloadsPanel[keyfocus] .downloadsPanelFooterButton:focus { - outline: 1px -moz-dialogtext dotted; - outline-offset: -5px; -} - -/*** List items and similar elements in the summary ***/ +/*** Progressmeter ***/ +/*** Common-styled progressmeter ***/ +.downloadProgress { + height: 8px; + border-radius: 1px; + margin: 4px 0 0; + margin-inline-end: 12px; -:root { - --downloads-item-height: 6em; - --downloads-item-border-top-color: hsla(0,0%,100%,.2); - --downloads-item-border-bottom-color: hsla(0,0%,0%,.15); - --downloads-item-font-size-factor: 0.9; - --downloads-item-target-margin-bottom: 7px; - --downloads-item-details-margin-top: 1px; - --downloads-item-details-opacity: 0.6; + /* for overriding rules in progressmeter.css */ + -moz-appearance: none; + border-style: none; + background-color: transparent; + min-width: initial; + min-height: initial; } -.downloadButton:focus > .button-box { - outline: 1px -moz-dialogtext dotted; +.downloadProgress[mode="undetermined"] { + /* for overriding rules on global.css in Linux. */ + -moz-binding: url("chrome://global/content/bindings/progressmeter.xml#progressmeter"); } -/*** Highlighted list items ***/ +.downloadProgress > .progress-bar { + background-color: Highlight; -#downloadsPanel[keyfocus] #downloadsListBox:focus > richlistitem[type="download"][selected] { - outline: 1px -moz-dialogtext dotted; - outline-offset: -1px; + /* for overriding rules in progressmeter.css */ + -moz-appearance: none; } -#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"][exists]:hover, -richlistitem[type="download"][showingsubview] { - border-radius: 3px; - border-top: 1px solid hsla(0,0%,100%,.3); - border-bottom: 1px solid hsla(0,0%,0%,.2); - background-color: Highlight; - background-image: linear-gradient(hsla(0,0%,100%,.1), transparent); - color: HighlightText; - cursor: pointer; +.downloadProgress[paused="true"] > .progress-bar { + background-color: GrayText; } -#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"][exists][verdict="Malware"]:hover, -richlistitem[type="download"][showingsubview][verdict="Malware"] { - background-color: hsl(4, 82%, 47%); - color: white; +.downloadProgress[mode="undetermined"] > .progress-bar { + /* Make a white reflecting animation. + Create a gradient with 2 identical pattern, and enlarge the size to 200%. + This allows us to animate background-position with percentage. */ + background-image: linear-gradient(90deg, transparent 0%, + rgba(255,255,255,0.5) 25%, + transparent 50%, + rgba(255,255,255,0.5) 75%, + transparent 100%); + background-blend-mode: lighten; + background-size: 200% 100%; + animation: downloadProgressSlideX 1.5s linear infinite; } -/*** Button icons ***/ - -.downloadButton.downloadIconCancel { - -moz-image-region: rect(0px, 16px, 16px, 0px); -} -richlistitem[type="download"]:hover .downloadButton.downloadIconCancel { - -moz-image-region: rect(0px, 32px, 16px, 16px); -} -richlistitem[type="download"]:hover .downloadButton.downloadIconCancel:hover { - -moz-image-region: rect(0px, 48px, 16px, 32px); -} -richlistitem[type="download"]:hover .downloadButton.downloadIconCancel:active { - -moz-image-region: rect(0px, 64px, 16px, 48px); +.downloadProgress > .progress-remainder { + border: solid ButtonShadow; + border-block-start-width: 1px; + border-block-end-width: 1px; + border-inline-start-width: 0; + border-inline-end-width: 1px; + background-color: ButtonFace; } -.downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 16px, 32px, 0px); -} -richlistitem[type="download"]:not([state="1"]):hover .downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 32px, 32px, 16px); -} -richlistitem[type="download"]:not([state="1"]):hover .downloadButton.downloadIconShow:hover { - -moz-image-region: rect(16px, 48px, 32px, 32px); -} -richlistitem[type="download"]:not([state="1"]):hover .downloadButton.downloadIconShow:active { - -moz-image-region: rect(16px, 64px, 32px, 48px); -} -#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"]:hover .downloadButton.downloadIconShow { - -moz-image-region: rect(16px, 96px, 32px, 80px); -} -#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"]:hover .downloadButton.downloadIconShow:hover { - -moz-image-region: rect(16px, 112px, 32px, 96px); -} -#downloadsPanel:not([keyfocus]) richlistitem[type="download"][state="1"]:hover .downloadButton.downloadIconShow:active { - -moz-image-region: rect(16px, 128px, 32px, 112px); +.downloadProgress[value="0"] > .progress-remainder { + border-width: 1px; } -.downloadButton.downloadIconRetry { - -moz-image-region: rect(32px, 16px, 48px, 0px); -} -richlistitem[type="download"]:hover .downloadButton.downloadIconRetry { - -moz-image-region: rect(32px, 32px, 48px, 16px); -} -richlistitem[type="download"]:hover .downloadButton.downloadIconRetry:hover { - -moz-image-region: rect(32px, 48px, 48px, 32px); -} -richlistitem[type="download"]:hover .downloadButton.downloadIconRetry:active { - -moz-image-region: rect(32px, 64px, 48px, 48px); +.downloadProgress > .progress-remainder[mode="undetermined"] { + border: none; } -.downloadButton.downloadShowBlockedInfo { - -moz-image-region: rect(48px, 16px, 64px, 0px); -} -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo { - -moz-image-region: rect(48px, 32px, 64px, 16px); -} -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:hover { - -moz-image-region: rect(48px, 48px, 64px, 32px); -} -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:active { - -moz-image-region: rect(48px, 64px, 64px, 48px); +@keyframes downloadProgressSlideX { + 0% { + background-position: 0 0; + } + 100% { + background-position: -100% 0; + } } -.downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) { - -moz-image-region: rect(64px, 16px, 80px, 0px); -} -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:-moz-locale-dir(rtl) { - -moz-image-region: rect(64px, 32px, 80px, 16px); -} -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:hover:-moz-locale-dir(rtl) { - -moz-image-region: rect(64px, 48px, 80px, 32px); +/*** List items and similar elements in the summary ***/ + +:root { + --downloads-item-height: 5.5em; + --downloads-item-font-size-factor: 0.9; + --downloads-item-details-opacity: 0.6; } -richlistitem[type="download"]:hover .downloadButton.downloadShowBlockedInfo:active:-moz-locale-dir(rtl) { - -moz-image-region: rect(64px, 64px, 80px, 48px); + +#downloadsPanel[keyfocus] #downloadsListBox:focus > richlistitem[type="download"][selected], +#downloadsPanel[keyfocus] #downloadsSummary:focus, +#downloadsPanel[keyfocus] .downloadsPanelFooterButton:focus, +.downloadButton:focus { + outline: 1px -moz-dialogtext dotted; + outline-offset: -1px; } diff --git a/arc-firefox-theme/chrome/browser/menuPanel.svg b/arc-firefox-theme/chrome/browser/menuPanel.svg index 199278f..20e7979 100644 --- a/arc-firefox-theme/chrome/browser/menuPanel.svg +++ b/arc-firefox-theme/chrome/browser/menuPanel.svg @@ -47,7 +47,6 @@ - diff --git a/arc-firefox-theme/chrome/browser/newtab/newTab.css b/arc-firefox-theme/chrome/browser/newtab/newTab.css index 29bcead..3257b48 100644 --- a/arc-firefox-theme/chrome/browser/newtab/newTab.css +++ b/arc-firefox-theme/chrome/browser/newtab/newTab.css @@ -103,6 +103,19 @@ border-radius: 2px; } +/* GRID */ +#topsites-heading { + color: #7A7A7A; + font-size: 1em; + font-weight: normal; + /* Position the heading such that it doesn't affect how many cells we + can fit into the grid. */ + position: absolute; + /* The top margin moves the heading away from the grid. + The horizontal margin aligns the heading with the cells. */ + margin: -1em 10px 0; +} + /* CELLS */ .newtab-cell { --cell-corner-radius: 8px; diff --git a/arc-firefox-theme/chrome/browser/notification-icons.svg b/arc-firefox-theme/chrome/browser/notification-icons.svg index dfb35ce..5250770 100644 --- a/arc-firefox-theme/chrome/browser/notification-icons.svg +++ b/arc-firefox-theme/chrome/browser/notification-icons.svg @@ -47,6 +47,11 @@ clip-path: url(#clip); } + #login-highlighted { + fill: HighlightText; + fill-opacity: 1; + } + #plugin-blocked, #plugin-blocked:target ~ #strikeout { fill: #d92215; @@ -99,6 +104,7 @@ + diff --git a/arc-firefox-theme/chrome/browser/pageInfo.css b/arc-firefox-theme/chrome/browser/pageInfo.css index 8f56b34..f5b6138 100644 --- a/arc-firefox-theme/chrome/browser/pageInfo.css +++ b/arc-firefox-theme/chrome/browser/pageInfo.css @@ -260,16 +260,3 @@ treechildren::-moz-tree-cell-text(broken) { #securityPanel row { -moz-box-align: center; } - -/* Icons for context menus */ -menuitem:not([type]) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); -} - -#menu_selectall { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); -} - -#menu_copy { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); -} diff --git a/arc-firefox-theme/chrome/browser/panel-icons.svg b/arc-firefox-theme/chrome/browser/panel-icons.svg index 2f93607..2092e0f 100644 --- a/arc-firefox-theme/chrome/browser/panel-icons.svg +++ b/arc-firefox-theme/chrome/browser/panel-icons.svg @@ -4,5 +4,15 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> + + + + + + diff --git a/arc-firefox-theme/chrome/browser/places/organizer.css b/arc-firefox-theme/chrome/browser/places/organizer.css index 10804a2..d1881db 100644 --- a/arc-firefox-theme/chrome/browser/places/organizer.css +++ b/arc-firefox-theme/chrome/browser/places/organizer.css @@ -20,6 +20,10 @@ color: ButtonText; } +#placesToolbar > toolbarbutton[disabled=true] { + color: GrayText; +} + /* back button */ #back-button { @@ -90,19 +94,6 @@ padding-inline-start: 2px; } -/**** menuitem stock icons ****/ -#orgClose { - list-style-image: url("moz-icon://stock/gtk-close?size=menu"); -} - -#fileImport { - list-style-image: url("moz-icon://stock/gtk-revert-to-saved?size=menu"); -} - -#fileExport { - list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); -} - /** * Downloads pane */ diff --git a/arc-firefox-theme/chrome/browser/places/places.css b/arc-firefox-theme/chrome/browser/places/places.css index d2b806b..776191d 100644 --- a/arc-firefox-theme/chrome/browser/places/places.css +++ b/arc-firefox-theme/chrome/browser/places/places.css @@ -120,102 +120,3 @@ treechildren::-moz-tree-image(cutting) { treechildren::-moz-tree-cell-text(cutting) { opacity: 0.7; } - -/**** menuitem stock icons ****/ -menuitem:not([type]) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); -} - -menuitem[command="cmd_cut"], -menuitem[cmd="cmd_cut"] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); -} - -menuitem[command="cmd_cut"][disabled], -menuitem[cmd="cmd_cut"][disabled] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); -} - -menuitem[command="cmd_copy"], -menuitem[cmd="cmd_copy"] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); -} - -menuitem[command="cmd_copy"][disabled], -menuitem[cmd="cmd_copy"][disabled] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); -} - -menuitem[command="cmd_paste"], -menuitem[cmd="cmd_paste"] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); -} - -menuitem[command="cmd_paste"][disabled], -menuitem[cmd="cmd_paste"][disabled] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); -} - -menuitem[command="cmd_delete"], -menuitem[cmd="cmd_delete"] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); -} - -menuitem[command="cmd_delete"][disabled], -menuitem[cmd="cmd_delete"][disabled] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); -} - -menuitem[command="cmd_undo"], -menuitem[cmd="cmd_undo"] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); -} - -menuitem[command="cmd_undo"][disabled], -menuitem[cmd="cmd_undo"][disabled] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); -} - -menuitem[command="cmd_redo"] { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); -} - -menuitem[command="cmd_redo"][disabled] { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu&state=disabled"); -} - -menuitem[command="cmd_selectAll"], -menuitem[cmd="cmd_selectAll"] { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); -} - -menuitem[command="cmd_selectAll"][disabled], -menuitem[cmd="cmd_selectAll"][disabled] { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu&state=disabled"); -} - -#placesContext_open\:newwindow, -menuitem[command="placesCmd_open:window"] { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 80px 16px 64px); -} - -#placesContext_open\:newprivatewindow, -menuitem[command="placesCmd_open:privatewindow"] { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); -} - -#placesContext_open\:newtab, -menuitem[command="placesCmd_open:tab"] { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 64px 16px 48px); -} - -#placesContext_show\:info, -menuitem[command="placesCmd_show:info"] { - list-style-image: url("moz-icon://stock/gtk-properties?size=menu"); -} - -#placesContext_reload { - list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); -} diff --git a/arc-firefox-theme/chrome/browser/preferences/containers.css b/arc-firefox-theme/chrome/browser/preferences/containers.css new file mode 100644 index 0000000..308f573 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/preferences/containers.css @@ -0,0 +1,143 @@ +/* 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/. */ + +[data-identity-color="blue"] { + --identity-tab-color: #0996f8; + --identity-icon-color: #00a7e0; +} + +[data-identity-color="turquoise"] { + --identity-tab-color: #01bdad; + --identity-icon-color: #01bdad; +} + +[data-identity-color="green"] { + --identity-tab-color: #57bd35; + --identity-icon-color: #7dc14c; +} + +[data-identity-color="yellow"] { + --identity-tab-color: #ffcb00; + --identity-icon-color: #ffcb00; +} + +[data-identity-color="orange"] { + --identity-tab-color: #ff9216; + --identity-icon-color: #ff9216; +} + +[data-identity-color="red"] { + --identity-tab-color: #d92215; + --identity-icon-color: #d92215; +} + +[data-identity-color="pink"] { + --identity-tab-color: #ea385e; + --identity-icon-color: #ee5195; +} + +[data-identity-color="purple"] { + --identity-tab-color: #7a2f7a; + --identity-icon-color: #7a2f7a; +} + +[data-identity-icon="fingerprint"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#fingerprint"); +} + +[data-identity-icon="briefcase"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#briefcase"); +} + +[data-identity-icon="dollar"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#dollar"); +} + +[data-identity-icon="cart"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#cart"); +} + +[data-identity-icon="circle"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#circle"); +} + +#userContext-indicator { + height: 16px; + width: 16px; +} + +#userContext-label { + margin-inline-end: 3px; + color: var(--identity-tab-color); +} + +#userContext-icons { + -moz-box-align: center; +} + +.tabbrowser-tab[usercontextid] { + background-image: linear-gradient(to right, transparent 20%, var(--identity-tab-color) 30%, var(--identity-tab-color) 70%, transparent 80%); + background-size: auto 2px; + background-repeat: no-repeat; +} + +.userContext-icon, +.menuitem-iconic[data-usercontextid] > .menu-iconic-left > .menu-iconic-icon, +.subviewbutton[usercontextid] > .toolbarbutton-icon, +#userContext-indicator { + background-image: var(--identity-icon); + filter: url(chrome://browser/skin/filters.svg#fill); + fill: var(--identity-icon-color); + background-size: contain; + background-repeat: no-repeat; + background-position: center center; +} + +:root { + --preference-selected-color: #0996f8; + --preference-unselected-color: #333; + --preference-active-color: #858585; +} + +radiogroup { + display: flex; + margin-inline-start: 0.35rem; +} + +radio { + flex: auto; + display: flex; + align-items: center; + justify-content: center; + -moz-user-select: none; + outline: 2px solid transparent; + outline-offset: 4px; + -moz-outline-radius: 100%; + min-block-size: 24px; + min-inline-size: 24px; + border-radius: 50%; + padding: 2px; + margin: 10px; +} + +.icon-buttons > radio > [data-identity-icon] { + fill: #4d4d4d; +} + +radio > [data-identity-icon] { + inline-size: 22px; + block-size: 22px; +} + +radio[selected=true] { + outline-color: var(--preference-unselected-color); +} + +radio[focused=true] { + outline-color: var(--preference-selected-color); +} + +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 new file mode 100644 index 0000000..73e499a --- /dev/null +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/containers.css @@ -0,0 +1,122 @@ +/* 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/. */ + +[data-identity-color="blue"] { + --identity-tab-color: #0996f8; + --identity-icon-color: #00a7e0; +} + +[data-identity-color="turquoise"] { + --identity-tab-color: #01bdad; + --identity-icon-color: #01bdad; +} + +[data-identity-color="green"] { + --identity-tab-color: #57bd35; + --identity-icon-color: #7dc14c; +} + +[data-identity-color="yellow"] { + --identity-tab-color: #ffcb00; + --identity-icon-color: #ffcb00; +} + +[data-identity-color="orange"] { + --identity-tab-color: #ff9216; + --identity-icon-color: #ff9216; +} + +[data-identity-color="red"] { + --identity-tab-color: #d92215; + --identity-icon-color: #d92215; +} + +[data-identity-color="pink"] { + --identity-tab-color: #ea385e; + --identity-icon-color: #ee5195; +} + +[data-identity-color="purple"] { + --identity-tab-color: #7a2f7a; + --identity-icon-color: #7a2f7a; +} + +[data-identity-icon="fingerprint"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#fingerprint"); +} + +[data-identity-icon="briefcase"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#briefcase"); +} + +[data-identity-icon="dollar"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#dollar"); +} + +[data-identity-icon="cart"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#cart"); +} + +[data-identity-icon="circle"] { + --identity-icon: url("chrome://browser/content/usercontext.svg#circle"); +} + +#userContext-indicator { + height: 16px; + width: 16px; +} + +#userContext-label { + margin-inline-end: 3px; + color: var(--identity-tab-color); +} + +#userContext-icons { + -moz-box-align: center; +} + +.tabbrowser-tab[usercontextid] { + background-image: linear-gradient(to right, transparent 20%, var(--identity-tab-color) 30%, var(--identity-tab-color) 70%, transparent 80%); + background-size: auto 2px; + background-repeat: no-repeat; +} + +.userContext-icon, +.menuitem-iconic[data-usercontextid] > .menu-iconic-left > .menu-iconic-icon, +.subviewbutton[usercontextid] > .toolbarbutton-icon, +#userContext-indicator { + background-image: var(--identity-icon); + filter: url(chrome://browser/skin/filters.svg#fill); + fill: var(--identity-icon-color); + background-size: contain; + background-repeat: no-repeat; + background-position: center center; +} + +.container-header-links { + margin-block-end: 15px; +} + +[data-identity-icon] { + margin: 0; + margin-inline-end: 16px; +} + +#containersView { + border: 0 none; + background: transparent; +} + +#containersView richlistitem { + margin: 0px; + margin-inline-end: 8px; + padding: 0; + padding-block-end: 8px; + border-block-end: 1px solid var(--in-content-header-border-color); +} + +#containersView richlistitem:last-of-type { + border-block-end: 0 none; + margin-block-end: 8px; +} 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 a9bc23e..51042a4 100644 --- a/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css +++ b/arc-firefox-theme/chrome/browser/preferences/in-content/preferences.css @@ -368,7 +368,6 @@ description > html|a { #dialogFrame { -moz-box-flex: 1; /* Default dialog dimensions */ - height: 20em; width: 66ch; } @@ -496,6 +495,8 @@ description > html|a { .fxaAccountBoxButtons { margin-bottom: 0 !important; margin-top: 11px; + display: flex; + align-items: center; } .fxaAccountBoxButtons > * { diff --git a/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css b/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css index e0e023c..923aa92 100644 --- a/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css +++ b/arc-firefox-theme/chrome/browser/privatebrowsing/aboutPrivateBrowsing.css @@ -135,6 +135,23 @@ a.button { display: inline-block; } +/** + * We want to hide the checkbox in lieu of the toggle-btn + * "slider toggle". We need to make the toggle keyboard + * focusable, however, which is not possible if it's + * display:none. We work around this by making the toggle + * invisible but still present in the display list, allowing + * it to receive keyboard events. When it is focused by keyboard, + * we use the -moz-focusring selector on the invisible checkbox + * to show a focus ring around the slider toggle. + */ +.toggle-input { + opacity: 0; + width: 0; + pointer-events: none; + position: absolute; +} + .toggle + .toggle-btn { box-sizing: border-box; cursor: pointer; diff --git a/arc-firefox-theme/chrome/browser/sanitizeDialog.css b/arc-firefox-theme/chrome/browser/sanitizeDialog.css index 28d4e7e..e73cd27 100644 --- a/arc-firefox-theme/chrome/browser/sanitizeDialog.css +++ b/arc-firefox-theme/chrome/browser/sanitizeDialog.css @@ -56,7 +56,7 @@ padding: 0; margin-top: 6px; margin-bottom: 6px; - margin-inline-start: -6px; + margin-inline-start: -4px; margin-inline-end: 0; } diff --git a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss index 9f0b5f8..1e89eed 100644 --- a/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss +++ b/arc-firefox-theme/chrome/browser/sass/_browser-sass.scss @@ -381,238 +381,6 @@ menuitem.bookmark-item { opacity: 0.7; } -/* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); -} - -#placesContext_open\:newwindow, -#menu_newNavigator, -#context-openlink, -#context-openframe { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 80px 16px 64px); -} - -#placesContext_open\:newtab, -#placesContext_openContainer\:tabs, -#menu_newNavigatorTab, -#context-openlinkintab, -#context-openlinkincontainertab, -#context-openframeintab { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 64px 16px 48px); -} - -#menu_openFile { - list-style-image: url("moz-icon://stock/gtk-open?size=menu"); -} - -#menu_close { - list-style-image: url("moz-icon://stock/gtk-close?size=menu"); -} - -#context-media-play { - list-style-image: url("moz-icon://stock/gtk-media-play?size=menu"); -} - -#context-media-pause { - list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu"); -} - -#menu_savePage, -#context-savelink, -#context-saveimage, -#context-savevideo, -#context-saveaudio, -#context-savepage, -#context-saveframe { - list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); -} - -#menu_printPreview { - list-style-image: url("moz-icon://stock/gtk-print-preview?size=menu"); -} - -#menu_print, -#context-printframe { - list-style-image: url("moz-icon://stock/gtk-print?size=menu"); -} - -#menu_FileQuitItem { - list-style-image: url("moz-icon://stock/gtk-quit?size=menu"); -} - -#menu_undo, -#context-undo { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); -} - -#menu_undo[disabled], -#context-undo[disabled] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); -} - -#menu_redo { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); -} - -#menu_redo[disabled] { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu&state=disabled"); -} - -#menu_cut, -#placesContext_cut, -#context-cut { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); -} - -#menu_cut[disabled], -#placesContext_cut[disabled], -#context-cut[disabled] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); -} - -#menu_copy, -#placesContext_copy, -#context-copy, -#context-copyimage, -#context-copyvideourl, -#context-copyaudiourl, -#context-copylink, -#context-copyemail { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); -} - -#menu_copy[disabled], -#placesContext_copy[disabled], -#context-copy[disabled] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); -} - -#menu_paste, -#placesContext_paste, -#context-paste { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); -} - -#menu_paste[disabled], -#placesContext_paste[disabled], -#context-paste[disabled] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); -} - -#menu_delete, -#placesContext_delete, -#placesContext_delete_history, -#context-delete { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); -} - -#menu_delete[disabled], -#placesContext_delete[disabled], -#placesContext_delete_history[disabled], -#context-delete[disabled] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); -} - -#menu_selectAll, -#context-selectall { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); -} - -#menu_find { - list-style-image: url("moz-icon://stock/gtk-find?size=menu"); -} - -#menu_find[disabled] { - list-style-image: url("moz-icon://stock/gtk-find?size=menu&state=disabled"); -} - -#menu_preferences { - list-style-image: url("moz-icon://stock/gtk-preferences?size=menu"); -} - -#placesContext_reload, -#context-reloadframe { - list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); -} - -#menu_zoomEnlarge { - list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu"); -} - -#menu_zoomReduce { - list-style-image: url("moz-icon://stock/gtk-zoom-out?size=menu"); -} - -#menu_zoomReset { - list-style-image: url("moz-icon://stock/gtk-zoom-100?size=menu"); -} - -#menu_showAllHistory { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 32px 16px 16px); -} - -#bookmarksShowAll { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 48px 16px 32px); -} - -#subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/page-livemarks.png"); -} - -#bookmarksToolbarFolderMenu, -#BMB_bookmarksToolbar, -#panelMenu_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); -} - -#menu_unsortedBookmarks, -#BMB_unsortedBookmarks, -#panelMenu_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); -} - -#menu_openDownloads { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 16px 16px 0px); -} - -#menu_openAddons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); -} - -#menu_pageInfo, -#context-viewinfo, -#context-viewframeinfo { - list-style-image: url("moz-icon://stock/gtk-info?size=menu"); -} - -#placesContext_open\:newprivatewindow, -#privateBrowsingItem { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); -} - -#placesContext_show\:info { - list-style-image: url("moz-icon://stock/gtk-properties?size=menu"); -} - -#sanitizeItem { - list-style-image: url("moz-icon://stock/gtk-clear?size=menu"); -} - -#menu_openHelp { - list-style-image: url("moz-icon://stock/gtk-help?size=menu"); -} - -#aboutName { - list-style-image: url("moz-icon://stock/gtk-about?size=menu"); -} - /* Primary toolbar buttons */ :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon, @@ -1923,6 +1691,13 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { height: 16px; } +#urlbar[actiontype="extension"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); + width: 16px; + height: 16px; +} + /* SHARING ICON */ #sharing-icon { @@ -2083,8 +1858,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed); } -.camera-icon, -.popup-notification-icon[popupid="webRTC-shareDevices"] { +.camera-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } @@ -2108,11 +1882,10 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } -.popup-notification-icon[popupid="webRTC-shareMicrophone"] { +.popup-notification-icon.microphone-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed); } -.popup-notification-icon[popupid="webRTC-shareScreen"], .screen-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } @@ -2125,6 +1898,34 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } +#webRTC-preview:not([hidden]) { + display: -moz-stack; + border-radius: 4px; + border: 1px solid GrayText; + overflow: hidden; + min-width: 300px; + min-height: 10em; +} + +html|*#webRTC-previewVideo { + width: 300px; + /* If we don't set the min-width, width is ignored. */ + min-width: 300px; + max-height: 200px; +} + +#webRTC-previewWarning { + background: rgba(255, 217, 99, .8) url("chrome://browser/skin/warning-white.svg") no-repeat .75em .75em; + margin: 0; + padding: .5em; + padding-inline-start: calc(1.5em + 16px); + border-top: 1px solid GrayText; +} + +#webRTC-previewWarning > .text-link { + margin-inline-start: 0; +} + /* This icon has a block sign in it, so we don't need a blocked version. */ .popup-icon { list-style-image: url("chrome://browser/skin/notification-icons.svg#popup"); @@ -2155,7 +1956,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { /* INSTALL ADDONS */ .install-icon { - list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); } .popup-notification-icon[popupid="xpinstall-disabled"], @@ -2431,6 +2232,73 @@ notification[value="translation"] menulist > .menulist-dropmarker { display: block; } +/* AutoComplete */ + + +#PopupAutoComplete > richlistbox > richlistitem { + height: 20px; + min-height: 20px; + border: 0; + border-radius: 0; + padding: 0px 1px 0px 1px; +} + +#PopupAutoComplete > richlistbox > richlistitem > .ac-site-icon { + margin-inline-start: 4px; + margin-inline-end: 0; +} + +#PopupAutoComplete > richlistbox > richlistitem > .ac-title { + font: icon; + margin-inline-start: 4px; +} + +#PopupAutoComplete > richlistbox { + padding: 0; +} + + +/* Login form autocompletion */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { + display: initial; + list-style-image: url(chrome://browser/skin/notification-icons.svg#login); +} + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] { + list-style-image: url(chrome://browser/skin/notification-icons.svg#login-highlighted); +} + + +/* Insecure field warning */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] { + background-color: var(--arrowpanel-dimmed); + border-bottom: 1px solid var(--panel-separator-color); + padding-bottom: 4px; + padding-top: 4px; +} + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] { + background-color: var(--arrowpanel-dimmed-further); + color: -moz-DialogText; +} + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title { + color: GrayText; + font-size: 1em; +} + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] > .ac-title { + color: inherit; +} + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { + list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); +} + +#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] { + border-top: 1px solid ThreeDShadow; +} + #treecolAutoCompleteImage { max-width : 36px; } @@ -3044,32 +2912,43 @@ html|span.ac-emphasize-text-url { } .tab-icon-overlay[soundplaying], -.tab-icon-overlay[muted]:not([crashed]) { +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]) { border-radius: 8px; } .tab-icon-overlay[soundplaying]:hover, -.tab-icon-overlay[muted]:not([crashed]):hover { +.tab-icon-overlay[muted]:not([crashed]):hover, +.tab-icon-overlay[blocked]:not([crashed]):hover { background-color: white; } .tab-icon-overlay[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio-small.svg#tab-audio"); + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio"); } .tab-icon-overlay[muted]:not([crashed]) { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio-small.svg#tab-audio-muted"); + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted"); +} + +.tab-icon-overlay[blocked]:not([crashed]) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked"); } //#TabsToolbar[brighttext] .tab-icon-overlay[soundplaying]:not([selected]):not(:hover), //.tab-icon-overlay[soundplaying][selected]:-moz-lwtheme-brighttext:not(:hover) { // list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white"); //} - +// //#TabsToolbar[brighttext] .tab-icon-overlay[muted]:not([crashed]):not([selected]):not(:hover), //.tab-icon-overlay[muted][selected]:-moz-lwtheme-brighttext:not(:hover) { // list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-muted"); //} +// +//#TabsToolbar[brighttext] .tab-icon-overlay[blocked]:not([crashed]):not([selected]):not(:hover), +//.tab-icon-overlay[blocked][selected]:-moz-lwtheme-brighttext:not(:hover) { +// list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-white-blocked"); +//} .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/custom_images/connecting.png"); @@ -3097,33 +2976,44 @@ html|span.ac-emphasize-text-url { padding: 0; } -.tab-icon-sound[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab"); +.tab-icon-sound[soundplaying], +.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); + fill: currentColor; } -.tab-icon-sound[soundplaying]:hover { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); +.tab-icon-sound[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } -.tab-icon-sound[soundplaying]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); +.tab-icon-sound[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } -.tab-icon-sound[muted] { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); +.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); } -.tab-icon-sound[muted]:hover { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); +.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); } -.tab-icon-sound[muted]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/#{$darker_asset_path_2}/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); +.tab-icon-sound[soundplaying]:not(:hover), +.tab-icon-sound[muted]:not(:hover), +.tab-icon-sound[blocked]:not(:hover) { + opacity: .8; } -.tab-icon-sound:-moz-lwtheme, -.tab-icon-sound[selected=true][soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/#{$asset_path}/tabs/tab-audio.svg#tab-audio"); +.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover), +.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) { + transition: opacity .3s linear var(--soundplaying-removal-delay); + opacity: 0; } .tab-background, @@ -3313,6 +3203,7 @@ html|span.ac-emphasize-text-url { .tabs-newtab-button, .tab-icon-overlay[soundplaying], .tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]), .tab-icon-sound, .tab-close-button { pointer-events: auto; @@ -3375,6 +3266,29 @@ html|span.ac-emphasize-text-url { width: calc(36px + 30px); } +/* All tabs menupopup */ + +.alltabs-item[tabIsVisible] { + /* box-shadow instead of background-color to work around native styling */ + box-shadow: inset -5px 0 ThreeDShadow; +} + +.alltabs-endimage[soundplaying], +.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); + fill: currentColor; +} + +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); +} + +.alltabs-endimage[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); +} + #tabbrowser-tabs { /* override the global style to allow the selected tab to be above the nav-bar */ z-index: auto; @@ -4691,13 +4605,7 @@ toolbar[brighttext] #downloads-indicator-counter { height: 24px; } -#customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); - -moz-image-region: rect(0, 24px, 24px, 0); -} - -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text, -#customization-titlebar-visibility-button > .button-box > .button-text { +#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text { /* Sadly, button.css thinks its margins are perfect for everyone. */ margin-inline-start: 6px !important; } @@ -4706,27 +4614,10 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; + background-image: url("chrome://browser/skin/theme-switcher-icon.png"); background-size: contain; } -#customization-titlebar-visibility-button > .button-box > .button-icon { - vertical-align: middle; -} - -#customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 48px, 24px, 24px); -} - -@media (min-resolution: 1.1dppx) { - #customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle@2x.png"); - -moz-image-region: rect(0, 48px, 48px, 0); - } - - #customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 96px, 48px, 48px); - } -} #main-window[customize-entered] #customization-panel-container { background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"), @@ -5462,7 +5353,6 @@ notification.heartbeat { } #context-navigation > .menuitem-iconic > .menu-iconic-left { - visibility: visible; /* override toolkit/themes/linux/global/menu.css */ padding-inline-end: 0 !important; margin-inline-end: 0 !important; @@ -5476,7 +5366,3 @@ notification.heartbeat { .webextension-popup-browser { border-radius: inherit; } - -.menuitem-iconic[usercontextid] > .menu-iconic-left > .menu-iconic-icon { - visibility: visible; -} diff --git a/arc-firefox-theme/chrome/browser/sass/browser-dark.css b/arc-firefox-theme/chrome/browser/sass/browser-dark.css index 8e87e14..4a15269 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-dark.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-dark.css @@ -285,194 +285,6 @@ menuitem.bookmark-item { .bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text { opacity: 0.7; } -/* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } - -#placesContext_open\:newwindow, -#menu_newNavigator, -#context-openlink, -#context-openframe { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 80px 16px 64px); } - -#placesContext_open\:newtab, -#placesContext_openContainer\:tabs, -#menu_newNavigatorTab, -#context-openlinkintab, -#context-openlinkincontainertab, -#context-openframeintab { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 64px 16px 48px); } - -#menu_openFile { - list-style-image: url("moz-icon://stock/gtk-open?size=menu"); } - -#menu_close { - list-style-image: url("moz-icon://stock/gtk-close?size=menu"); } - -#context-media-play { - list-style-image: url("moz-icon://stock/gtk-media-play?size=menu"); } - -#context-media-pause { - list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu"); } - -#menu_savePage, -#context-savelink, -#context-saveimage, -#context-savevideo, -#context-saveaudio, -#context-savepage, -#context-saveframe { - list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); } - -#menu_printPreview { - list-style-image: url("moz-icon://stock/gtk-print-preview?size=menu"); } - -#menu_print, -#context-printframe { - list-style-image: url("moz-icon://stock/gtk-print?size=menu"); } - -#menu_FileQuitItem { - list-style-image: url("moz-icon://stock/gtk-quit?size=menu"); } - -#menu_undo, -#context-undo { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); } - -#menu_undo[disabled], -#context-undo[disabled] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); } - -#menu_redo { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); } - -#menu_redo[disabled] { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu&state=disabled"); } - -#menu_cut, -#placesContext_cut, -#context-cut { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); } - -#menu_cut[disabled], -#placesContext_cut[disabled], -#context-cut[disabled] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); } - -#menu_copy, -#placesContext_copy, -#context-copy, -#context-copyimage, -#context-copyvideourl, -#context-copyaudiourl, -#context-copylink, -#context-copyemail { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); } - -#menu_copy[disabled], -#placesContext_copy[disabled], -#context-copy[disabled] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); } - -#menu_paste, -#placesContext_paste, -#context-paste { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); } - -#menu_paste[disabled], -#placesContext_paste[disabled], -#context-paste[disabled] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); } - -#menu_delete, -#placesContext_delete, -#placesContext_delete_history, -#context-delete { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); } - -#menu_delete[disabled], -#placesContext_delete[disabled], -#placesContext_delete_history[disabled], -#context-delete[disabled] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); } - -#menu_selectAll, -#context-selectall { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); } - -#menu_find { - list-style-image: url("moz-icon://stock/gtk-find?size=menu"); } - -#menu_find[disabled] { - list-style-image: url("moz-icon://stock/gtk-find?size=menu&state=disabled"); } - -#menu_preferences { - list-style-image: url("moz-icon://stock/gtk-preferences?size=menu"); } - -#placesContext_reload, -#context-reloadframe { - list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } - -#menu_zoomEnlarge { - list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu"); } - -#menu_zoomReduce { - list-style-image: url("moz-icon://stock/gtk-zoom-out?size=menu"); } - -#menu_zoomReset { - list-style-image: url("moz-icon://stock/gtk-zoom-100?size=menu"); } - -#menu_showAllHistory { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 32px 16px 16px); } - -#bookmarksShowAll { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 48px 16px 32px); } - -#subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/page-livemarks.png"); } - -#bookmarksToolbarFolderMenu, -#BMB_bookmarksToolbar, -#panelMenu_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); } - -#menu_unsortedBookmarks, -#BMB_unsortedBookmarks, -#panelMenu_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } - -#menu_openDownloads { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 16px 16px 0px); } - -#menu_openAddons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); } - -#menu_pageInfo, -#context-viewinfo, -#context-viewframeinfo { - list-style-image: url("moz-icon://stock/gtk-info?size=menu"); } - -#placesContext_open\:newprivatewindow, -#privateBrowsingItem { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); } - -#placesContext_show\:info { - list-style-image: url("moz-icon://stock/gtk-properties?size=menu"); } - -#sanitizeItem { - list-style-image: url("moz-icon://stock/gtk-clear?size=menu"); } - -#menu_openHelp { - list-style-image: url("moz-icon://stock/gtk-help?size=menu"); } - -#aboutName { - list-style-image: url("moz-icon://stock/gtk-about?size=menu"); } - /* Primary toolbar buttons */ :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon, :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { @@ -1440,6 +1252,12 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { width: 16px; height: 16px; } +#urlbar[actiontype="extension"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); + width: 16px; + height: 16px; } + /* SHARING ICON */ #sharing-icon { width: 16px; @@ -1561,8 +1379,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .popup-notification-icon[popupid="password"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed); } -.camera-icon, -.popup-notification-icon[popupid="webRTC-shareDevices"] { +.camera-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } .camera-icon.in-use { @@ -1580,10 +1397,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .microphone-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } -.popup-notification-icon[popupid="webRTC-shareMicrophone"] { +.popup-notification-icon.microphone-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed); } -.popup-notification-icon[popupid="webRTC-shareScreen"], .screen-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } @@ -1593,6 +1409,30 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .screen-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } +#webRTC-preview:not([hidden]) { + display: -moz-stack; + border-radius: 4px; + border: 1px solid GrayText; + overflow: hidden; + min-width: 300px; + min-height: 10em; } + +html|*#webRTC-previewVideo { + width: 300px; + /* If we don't set the min-width, width is ignored. */ + min-width: 300px; + max-height: 200px; } + +#webRTC-previewWarning { + background: rgba(255, 217, 99, 0.8) url("chrome://browser/skin/warning-white.svg") no-repeat 0.75em 0.75em; + margin: 0; + padding: .5em; + padding-inline-start: calc(1.5em + 16px); + border-top: 1px solid GrayText; } + +#webRTC-previewWarning > .text-link { + margin-inline-start: 0; } + /* This icon has a block sign in it, so we don't need a blocked version. */ .popup-icon { list-style-image: url("chrome://browser/skin/notification-icons.svg#popup"); } @@ -1619,7 +1459,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { transform: translateX(0); } } /* INSTALL ADDONS */ .install-icon { - list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); } + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); } .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-install-blocked"], @@ -1829,6 +1669,57 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } +/* AutoComplete */ +#PopupAutoComplete > richlistbox > richlistitem { + height: 20px; + min-height: 20px; + border: 0; + border-radius: 0; + padding: 0px 1px 0px 1px; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-site-icon { + margin-inline-start: 4px; + margin-inline-end: 0; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-title { + font: icon; + margin-inline-start: 4px; } + +#PopupAutoComplete > richlistbox { + padding: 0; } + +/* Login form autocompletion */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { + display: initial; + list-style-image: url(chrome://browser/skin/notification-icons.svg#login); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] { + list-style-image: url(chrome://browser/skin/notification-icons.svg#login-highlighted); } + +/* Insecure field warning */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] { + background-color: var(--arrowpanel-dimmed); + border-bottom: 1px solid var(--panel-separator-color); + padding-bottom: 4px; + padding-top: 4px; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] { + background-color: var(--arrowpanel-dimmed-further); + color: -moz-DialogText; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title { + color: GrayText; + font-size: 1em; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] > .ac-title { + color: inherit; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { + list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] { + border-top: 1px solid ThreeDShadow; } + #treecolAutoCompleteImage { max-width: 36px; } @@ -2302,18 +2193,23 @@ html|span.ac-emphasize-text-url { list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } .tab-icon-overlay[soundplaying], -.tab-icon-overlay[muted]:not([crashed]) { +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]) { border-radius: 8px; } .tab-icon-overlay[soundplaying]:hover, -.tab-icon-overlay[muted]:not([crashed]):hover { +.tab-icon-overlay[muted]:not([crashed]):hover, +.tab-icon-overlay[blocked]:not([crashed]):hover { background-color: white; } .tab-icon-overlay[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio"); } .tab-icon-overlay[muted]:not([crashed]) { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio-muted"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted"); } + +.tab-icon-overlay[blocked]:not([crashed]) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked"); } .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/custom_images/connecting.png"); } @@ -2336,27 +2232,38 @@ html|span.ac-emphasize-text-url { height: 16px; padding: 0; } -.tab-icon-sound[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab"); } +.tab-icon-sound[soundplaying], +.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); + fill: currentColor; } -.tab-icon-sound[soundplaying]:hover { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } +.tab-icon-sound[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } -.tab-icon-sound[soundplaying]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } +.tab-icon-sound[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } -.tab-icon-sound[muted] { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } +.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); } -.tab-icon-sound[muted]:hover { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } +.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); } -.tab-icon-sound[muted]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } +.tab-icon-sound[soundplaying]:not(:hover), +.tab-icon-sound[muted]:not(:hover), +.tab-icon-sound[blocked]:not(:hover) { + opacity: .8; } -.tab-icon-sound:-moz-lwtheme, -.tab-icon-sound[selected=true][soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio"); } +.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover), +.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) { + transition: opacity 0.3s linear var(--soundplaying-removal-delay); + opacity: 0; } .tab-background, .tabs-newtab-button { @@ -2507,6 +2414,7 @@ lwtHeader;*/ .tabs-newtab-button, .tab-icon-overlay[soundplaying], .tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]), .tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2537,6 +2445,24 @@ lwtHeader;*/ .tabs-newtab-button { width: calc(36px + 30px); } +/* All tabs menupopup */ +.alltabs-item[tabIsVisible] { + /* box-shadow instead of background-color to work around native styling */ + box-shadow: inset -5px 0 ThreeDShadow; } + +.alltabs-endimage[soundplaying], +.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); + fill: currentColor; } + +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } + #tabbrowser-tabs { /* override the global style to allow the selected tab to be above the nav-bar */ z-index: auto; } @@ -3600,12 +3526,7 @@ toolbar[brighttext] #downloads-indicator-counter { .customizationmode-button > .button-box > .button-icon { height: 24px; } -#customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); - -moz-image-region: rect(0, 24px, 24px, 0); } - -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text, -#customization-titlebar-visibility-button > .button-box > .button-text { +#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text { /* Sadly, button.css thinks its margins are perfect for everyone. */ margin-inline-start: 6px !important; } @@ -3613,21 +3534,9 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; + background-image: url("chrome://browser/skin/theme-switcher-icon.png"); background-size: contain; } -#customization-titlebar-visibility-button > .button-box > .button-icon { - vertical-align: middle; } - -#customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 48px, 24px, 24px); } - -@media (min-resolution: 1.1dppx) { - #customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle@2x.png"); - -moz-image-region: rect(0, 48px, 48px, 0); } - - #customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 96px, 48px, 48px); } } #main-window[customize-entered] #customization-panel-container { background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"), url("chrome://browser/skin/customizableui/customizeMode-separatorVertical.png"), url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"), url("chrome://browser/skin/customizableui/background-noise-toolbar.png"), linear-gradient(to bottom, #3e86ce, #3878ba); background-position: center top, left center, left top, left top, left top; @@ -4226,7 +4135,6 @@ notification.heartbeat { list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); } #context-navigation > .menuitem-iconic > .menu-iconic-left { - visibility: visible; /* override toolkit/themes/linux/global/menu.css */ padding-inline-end: 0 !important; margin-inline-end: 0 !important; } @@ -4238,9 +4146,6 @@ notification.heartbeat { .webextension-popup-browser { border-radius: inherit; } -.menuitem-iconic[usercontextid] > .menu-iconic-left > .menu-iconic-icon { - visibility: visible; } - #nav-bar #loop-button, #nav-bar toolbar[brighttext] #loop-button { list-style-image: url("chrome://browser/skin/custom_images/dark/loop-toolbar-icons.svg") !important; } diff --git a/arc-firefox-theme/chrome/browser/sass/browser-darker.css b/arc-firefox-theme/chrome/browser/sass/browser-darker.css index c7127da..f48dd3c 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-darker.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-darker.css @@ -285,194 +285,6 @@ menuitem.bookmark-item { .bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text { opacity: 0.7; } -/* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } - -#placesContext_open\:newwindow, -#menu_newNavigator, -#context-openlink, -#context-openframe { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 80px 16px 64px); } - -#placesContext_open\:newtab, -#placesContext_openContainer\:tabs, -#menu_newNavigatorTab, -#context-openlinkintab, -#context-openlinkincontainertab, -#context-openframeintab { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 64px 16px 48px); } - -#menu_openFile { - list-style-image: url("moz-icon://stock/gtk-open?size=menu"); } - -#menu_close { - list-style-image: url("moz-icon://stock/gtk-close?size=menu"); } - -#context-media-play { - list-style-image: url("moz-icon://stock/gtk-media-play?size=menu"); } - -#context-media-pause { - list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu"); } - -#menu_savePage, -#context-savelink, -#context-saveimage, -#context-savevideo, -#context-saveaudio, -#context-savepage, -#context-saveframe { - list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); } - -#menu_printPreview { - list-style-image: url("moz-icon://stock/gtk-print-preview?size=menu"); } - -#menu_print, -#context-printframe { - list-style-image: url("moz-icon://stock/gtk-print?size=menu"); } - -#menu_FileQuitItem { - list-style-image: url("moz-icon://stock/gtk-quit?size=menu"); } - -#menu_undo, -#context-undo { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); } - -#menu_undo[disabled], -#context-undo[disabled] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); } - -#menu_redo { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); } - -#menu_redo[disabled] { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu&state=disabled"); } - -#menu_cut, -#placesContext_cut, -#context-cut { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); } - -#menu_cut[disabled], -#placesContext_cut[disabled], -#context-cut[disabled] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); } - -#menu_copy, -#placesContext_copy, -#context-copy, -#context-copyimage, -#context-copyvideourl, -#context-copyaudiourl, -#context-copylink, -#context-copyemail { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); } - -#menu_copy[disabled], -#placesContext_copy[disabled], -#context-copy[disabled] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); } - -#menu_paste, -#placesContext_paste, -#context-paste { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); } - -#menu_paste[disabled], -#placesContext_paste[disabled], -#context-paste[disabled] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); } - -#menu_delete, -#placesContext_delete, -#placesContext_delete_history, -#context-delete { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); } - -#menu_delete[disabled], -#placesContext_delete[disabled], -#placesContext_delete_history[disabled], -#context-delete[disabled] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); } - -#menu_selectAll, -#context-selectall { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); } - -#menu_find { - list-style-image: url("moz-icon://stock/gtk-find?size=menu"); } - -#menu_find[disabled] { - list-style-image: url("moz-icon://stock/gtk-find?size=menu&state=disabled"); } - -#menu_preferences { - list-style-image: url("moz-icon://stock/gtk-preferences?size=menu"); } - -#placesContext_reload, -#context-reloadframe { - list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } - -#menu_zoomEnlarge { - list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu"); } - -#menu_zoomReduce { - list-style-image: url("moz-icon://stock/gtk-zoom-out?size=menu"); } - -#menu_zoomReset { - list-style-image: url("moz-icon://stock/gtk-zoom-100?size=menu"); } - -#menu_showAllHistory { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 32px 16px 16px); } - -#bookmarksShowAll { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 48px 16px 32px); } - -#subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/page-livemarks.png"); } - -#bookmarksToolbarFolderMenu, -#BMB_bookmarksToolbar, -#panelMenu_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); } - -#menu_unsortedBookmarks, -#BMB_unsortedBookmarks, -#panelMenu_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } - -#menu_openDownloads { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 16px 16px 0px); } - -#menu_openAddons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); } - -#menu_pageInfo, -#context-viewinfo, -#context-viewframeinfo { - list-style-image: url("moz-icon://stock/gtk-info?size=menu"); } - -#placesContext_open\:newprivatewindow, -#privateBrowsingItem { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); } - -#placesContext_show\:info { - list-style-image: url("moz-icon://stock/gtk-properties?size=menu"); } - -#sanitizeItem { - list-style-image: url("moz-icon://stock/gtk-clear?size=menu"); } - -#menu_openHelp { - list-style-image: url("moz-icon://stock/gtk-help?size=menu"); } - -#aboutName { - list-style-image: url("moz-icon://stock/gtk-about?size=menu"); } - /* Primary toolbar buttons */ :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon, :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { @@ -1439,6 +1251,12 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { width: 16px; height: 16px; } +#urlbar[actiontype="extension"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); + width: 16px; + height: 16px; } + /* SHARING ICON */ #sharing-icon { width: 16px; @@ -1560,8 +1378,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .popup-notification-icon[popupid="password"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed); } -.camera-icon, -.popup-notification-icon[popupid="webRTC-shareDevices"] { +.camera-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } .camera-icon.in-use { @@ -1579,10 +1396,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .microphone-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } -.popup-notification-icon[popupid="webRTC-shareMicrophone"] { +.popup-notification-icon.microphone-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed); } -.popup-notification-icon[popupid="webRTC-shareScreen"], .screen-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } @@ -1592,6 +1408,30 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .screen-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } +#webRTC-preview:not([hidden]) { + display: -moz-stack; + border-radius: 4px; + border: 1px solid GrayText; + overflow: hidden; + min-width: 300px; + min-height: 10em; } + +html|*#webRTC-previewVideo { + width: 300px; + /* If we don't set the min-width, width is ignored. */ + min-width: 300px; + max-height: 200px; } + +#webRTC-previewWarning { + background: rgba(255, 217, 99, 0.8) url("chrome://browser/skin/warning-white.svg") no-repeat 0.75em 0.75em; + margin: 0; + padding: .5em; + padding-inline-start: calc(1.5em + 16px); + border-top: 1px solid GrayText; } + +#webRTC-previewWarning > .text-link { + margin-inline-start: 0; } + /* This icon has a block sign in it, so we don't need a blocked version. */ .popup-icon { list-style-image: url("chrome://browser/skin/notification-icons.svg#popup"); } @@ -1618,7 +1458,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { transform: translateX(0); } } /* INSTALL ADDONS */ .install-icon { - list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); } + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); } .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-install-blocked"], @@ -1828,6 +1668,57 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } +/* AutoComplete */ +#PopupAutoComplete > richlistbox > richlistitem { + height: 20px; + min-height: 20px; + border: 0; + border-radius: 0; + padding: 0px 1px 0px 1px; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-site-icon { + margin-inline-start: 4px; + margin-inline-end: 0; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-title { + font: icon; + margin-inline-start: 4px; } + +#PopupAutoComplete > richlistbox { + padding: 0; } + +/* Login form autocompletion */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { + display: initial; + list-style-image: url(chrome://browser/skin/notification-icons.svg#login); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] { + list-style-image: url(chrome://browser/skin/notification-icons.svg#login-highlighted); } + +/* Insecure field warning */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] { + background-color: var(--arrowpanel-dimmed); + border-bottom: 1px solid var(--panel-separator-color); + padding-bottom: 4px; + padding-top: 4px; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] { + background-color: var(--arrowpanel-dimmed-further); + color: -moz-DialogText; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title { + color: GrayText; + font-size: 1em; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] > .ac-title { + color: inherit; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { + list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] { + border-top: 1px solid ThreeDShadow; } + #treecolAutoCompleteImage { max-width: 36px; } @@ -2302,18 +2193,23 @@ html|span.ac-emphasize-text-url { list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } .tab-icon-overlay[soundplaying], -.tab-icon-overlay[muted]:not([crashed]) { +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]) { border-radius: 8px; } .tab-icon-overlay[soundplaying]:hover, -.tab-icon-overlay[muted]:not([crashed]):hover { +.tab-icon-overlay[muted]:not([crashed]):hover, +.tab-icon-overlay[blocked]:not([crashed]):hover { background-color: white; } .tab-icon-overlay[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio"); } .tab-icon-overlay[muted]:not([crashed]) { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio-small.svg#tab-audio-muted"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted"); } + +.tab-icon-overlay[blocked]:not([crashed]) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked"); } .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/custom_images/connecting.png"); } @@ -2336,27 +2232,38 @@ html|span.ac-emphasize-text-url { height: 16px; padding: 0; } -.tab-icon-sound[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab"); } +.tab-icon-sound[soundplaying], +.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); + fill: currentColor; } -.tab-icon-sound[soundplaying]:hover { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } +.tab-icon-sound[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } -.tab-icon-sound[soundplaying]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } +.tab-icon-sound[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } -.tab-icon-sound[muted] { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } +.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); } -.tab-icon-sound[muted]:hover { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } +.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); } -.tab-icon-sound[muted]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/dark/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } +.tab-icon-sound[soundplaying]:not(:hover), +.tab-icon-sound[muted]:not(:hover), +.tab-icon-sound[blocked]:not(:hover) { + opacity: .8; } -.tab-icon-sound:-moz-lwtheme, -.tab-icon-sound[selected=true][soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); } +.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover), +.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) { + transition: opacity 0.3s linear var(--soundplaying-removal-delay); + opacity: 0; } .tab-background, .tabs-newtab-button { @@ -2507,6 +2414,7 @@ lwtHeader;*/ .tabs-newtab-button, .tab-icon-overlay[soundplaying], .tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]), .tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2537,6 +2445,24 @@ lwtHeader;*/ .tabs-newtab-button { width: calc(36px + 30px); } +/* All tabs menupopup */ +.alltabs-item[tabIsVisible] { + /* box-shadow instead of background-color to work around native styling */ + box-shadow: inset -5px 0 ThreeDShadow; } + +.alltabs-endimage[soundplaying], +.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); + fill: currentColor; } + +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } + #tabbrowser-tabs { /* override the global style to allow the selected tab to be above the nav-bar */ z-index: auto; } @@ -3600,12 +3526,7 @@ toolbar[brighttext] #downloads-indicator-counter { .customizationmode-button > .button-box > .button-icon { height: 24px; } -#customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); - -moz-image-region: rect(0, 24px, 24px, 0); } - -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text, -#customization-titlebar-visibility-button > .button-box > .button-text { +#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text { /* Sadly, button.css thinks its margins are perfect for everyone. */ margin-inline-start: 6px !important; } @@ -3613,21 +3534,9 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; + background-image: url("chrome://browser/skin/theme-switcher-icon.png"); background-size: contain; } -#customization-titlebar-visibility-button > .button-box > .button-icon { - vertical-align: middle; } - -#customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 48px, 24px, 24px); } - -@media (min-resolution: 1.1dppx) { - #customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle@2x.png"); - -moz-image-region: rect(0, 48px, 48px, 0); } - - #customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 96px, 48px, 48px); } } #main-window[customize-entered] #customization-panel-container { background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"), url("chrome://browser/skin/customizableui/customizeMode-separatorVertical.png"), url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"), url("chrome://browser/skin/customizableui/background-noise-toolbar.png"), linear-gradient(to bottom, #3e86ce, #3878ba); background-position: center top, left center, left top, left top, left top; @@ -4226,7 +4135,6 @@ notification.heartbeat { list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); } #context-navigation > .menuitem-iconic > .menu-iconic-left { - visibility: visible; /* override toolkit/themes/linux/global/menu.css */ padding-inline-end: 0 !important; margin-inline-end: 0 !important; } @@ -4238,9 +4146,6 @@ notification.heartbeat { .webextension-popup-browser { border-radius: inherit; } -.menuitem-iconic[usercontextid] > .menu-iconic-left > .menu-iconic-icon { - visibility: visible; } - #nav-bar #loop-button, #nav-bar toolbar[brighttext] #loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg") !important; } diff --git a/arc-firefox-theme/chrome/browser/sass/browser-light.css b/arc-firefox-theme/chrome/browser/sass/browser-light.css index 2f8a0c9..6ccccc4 100644 --- a/arc-firefox-theme/chrome/browser/sass/browser-light.css +++ b/arc-firefox-theme/chrome/browser/sass/browser-light.css @@ -285,194 +285,6 @@ menuitem.bookmark-item { .bookmark-item[cutting] > .menu-iconic-left > .menu-iconic-text { opacity: 0.7; } -/* Stock icons for the menu bar items */ -menuitem:not([type]):not(.menuitem-tooltip):not(.menuitem-iconic-tooltip) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); } - -#placesContext_open\:newwindow, -#menu_newNavigator, -#context-openlink, -#context-openframe { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 80px 16px 64px); } - -#placesContext_open\:newtab, -#placesContext_openContainer\:tabs, -#menu_newNavigatorTab, -#context-openlinkintab, -#context-openlinkincontainertab, -#context-openframeintab { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 64px 16px 48px); } - -#menu_openFile { - list-style-image: url("moz-icon://stock/gtk-open?size=menu"); } - -#menu_close { - list-style-image: url("moz-icon://stock/gtk-close?size=menu"); } - -#context-media-play { - list-style-image: url("moz-icon://stock/gtk-media-play?size=menu"); } - -#context-media-pause { - list-style-image: url("moz-icon://stock/gtk-media-pause?size=menu"); } - -#menu_savePage, -#context-savelink, -#context-saveimage, -#context-savevideo, -#context-saveaudio, -#context-savepage, -#context-saveframe { - list-style-image: url("moz-icon://stock/gtk-save-as?size=menu"); } - -#menu_printPreview { - list-style-image: url("moz-icon://stock/gtk-print-preview?size=menu"); } - -#menu_print, -#context-printframe { - list-style-image: url("moz-icon://stock/gtk-print?size=menu"); } - -#menu_FileQuitItem { - list-style-image: url("moz-icon://stock/gtk-quit?size=menu"); } - -#menu_undo, -#context-undo { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); } - -#menu_undo[disabled], -#context-undo[disabled] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); } - -#menu_redo { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu"); } - -#menu_redo[disabled] { - list-style-image: url("moz-icon://stock/gtk-redo?size=menu&state=disabled"); } - -#menu_cut, -#placesContext_cut, -#context-cut { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); } - -#menu_cut[disabled], -#placesContext_cut[disabled], -#context-cut[disabled] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); } - -#menu_copy, -#placesContext_copy, -#context-copy, -#context-copyimage, -#context-copyvideourl, -#context-copyaudiourl, -#context-copylink, -#context-copyemail { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); } - -#menu_copy[disabled], -#placesContext_copy[disabled], -#context-copy[disabled] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); } - -#menu_paste, -#placesContext_paste, -#context-paste { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); } - -#menu_paste[disabled], -#placesContext_paste[disabled], -#context-paste[disabled] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); } - -#menu_delete, -#placesContext_delete, -#placesContext_delete_history, -#context-delete { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); } - -#menu_delete[disabled], -#placesContext_delete[disabled], -#placesContext_delete_history[disabled], -#context-delete[disabled] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); } - -#menu_selectAll, -#context-selectall { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); } - -#menu_find { - list-style-image: url("moz-icon://stock/gtk-find?size=menu"); } - -#menu_find[disabled] { - list-style-image: url("moz-icon://stock/gtk-find?size=menu&state=disabled"); } - -#menu_preferences { - list-style-image: url("moz-icon://stock/gtk-preferences?size=menu"); } - -#placesContext_reload, -#context-reloadframe { - list-style-image: url("moz-icon://stock/gtk-refresh?size=menu"); } - -#menu_zoomEnlarge { - list-style-image: url("moz-icon://stock/gtk-zoom-in?size=menu"); } - -#menu_zoomReduce { - list-style-image: url("moz-icon://stock/gtk-zoom-out?size=menu"); } - -#menu_zoomReset { - list-style-image: url("moz-icon://stock/gtk-zoom-100?size=menu"); } - -#menu_showAllHistory { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 32px 16px 16px); } - -#bookmarksShowAll { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 48px 16px 32px); } - -#subscribeToPageMenuitem:not([disabled]), -#subscribeToPageMenupopup { - list-style-image: url("chrome://browser/skin/page-livemarks.png"); } - -#bookmarksToolbarFolderMenu, -#BMB_bookmarksToolbar, -#panelMenu_bookmarksToolbar { - list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.png"); } - -#menu_unsortedBookmarks, -#BMB_unsortedBookmarks, -#panelMenu_unsortedBookmarks { - list-style-image: url("chrome://browser/skin/places/unsortedBookmarks.png"); } - -#menu_openDownloads { - list-style-image: url("chrome://browser/skin/Toolbar-small.png"); - -moz-image-region: rect(0px 16px 16px 0px); } - -#menu_openAddons { - list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png"); } - -#menu_pageInfo, -#context-viewinfo, -#context-viewframeinfo { - list-style-image: url("moz-icon://stock/gtk-info?size=menu"); } - -#placesContext_open\:newprivatewindow, -#privateBrowsingItem { - list-style-image: url("chrome://browser/skin/Privacy-16.png"); } - -#placesContext_show\:info { - list-style-image: url("moz-icon://stock/gtk-properties?size=menu"); } - -#sanitizeItem { - list-style-image: url("moz-icon://stock/gtk-clear?size=menu"); } - -#menu_openHelp { - list-style-image: url("moz-icon://stock/gtk-help?size=menu"); } - -#aboutName { - list-style-image: url("moz-icon://stock/gtk-about?size=menu"); } - /* Primary toolbar buttons */ :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > .toolbarbutton-icon, :-moz-any(toolbar, .widget-overflow-list) .toolbarbutton-1 > :-moz-any(.toolbarbutton-menubutton-button, .toolbarbutton-badge-stack) > .toolbarbutton-icon { @@ -1439,6 +1251,12 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { width: 16px; height: 16px; } +#urlbar[actiontype="extension"] > #identity-box > #identity-icon { + -moz-image-region: inherit; + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); + width: 16px; + height: 16px; } + /* SHARING ICON */ #sharing-icon { width: 16px; @@ -1560,8 +1378,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .popup-notification-icon[popupid="password"] { list-style-image: url(chrome://browser/skin/notification-icons.svg#login-detailed); } -.camera-icon, -.popup-notification-icon[popupid="webRTC-shareDevices"] { +.camera-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#camera); } .camera-icon.in-use { @@ -1579,10 +1396,9 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .microphone-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-blocked); } -.popup-notification-icon[popupid="webRTC-shareMicrophone"] { +.popup-notification-icon.microphone-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#microphone-detailed); } -.popup-notification-icon[popupid="webRTC-shareScreen"], .screen-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen); } @@ -1592,6 +1408,30 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { .screen-icon.blocked-permission-icon { list-style-image: url(chrome://browser/skin/notification-icons.svg#screen-blocked); } +#webRTC-preview:not([hidden]) { + display: -moz-stack; + border-radius: 4px; + border: 1px solid GrayText; + overflow: hidden; + min-width: 300px; + min-height: 10em; } + +html|*#webRTC-previewVideo { + width: 300px; + /* If we don't set the min-width, width is ignored. */ + min-width: 300px; + max-height: 200px; } + +#webRTC-previewWarning { + background: rgba(255, 217, 99, 0.8) url("chrome://browser/skin/warning-white.svg") no-repeat 0.75em 0.75em; + margin: 0; + padding: .5em; + padding-inline-start: calc(1.5em + 16px); + border-top: 1px solid GrayText; } + +#webRTC-previewWarning > .text-link { + margin-inline-start: 0; } + /* This icon has a block sign in it, so we don't need a blocked version. */ .popup-icon { list-style-image: url("chrome://browser/skin/notification-icons.svg#popup"); } @@ -1618,7 +1458,7 @@ toolbarpaletteitem[place="palette"] > #zoom-controls > #zoom-in-button { transform: translateX(0); } } /* INSTALL ADDONS */ .install-icon { - list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg#default); } + list-style-image: url(chrome://browser/skin/addons/addon-install-anchor.svg); } .popup-notification-icon[popupid="xpinstall-disabled"], .popup-notification-icon[popupid="addon-install-blocked"], @@ -1828,6 +1668,57 @@ notification[value="translation"] button:not([type="menu"]) > .button-box { notification[value="translation"] menulist > .menulist-dropmarker { display: block; } +/* AutoComplete */ +#PopupAutoComplete > richlistbox > richlistitem { + height: 20px; + min-height: 20px; + border: 0; + border-radius: 0; + padding: 0px 1px 0px 1px; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-site-icon { + margin-inline-start: 4px; + margin-inline-end: 0; } + +#PopupAutoComplete > richlistbox > richlistitem > .ac-title { + font: icon; + margin-inline-start: 4px; } + +#PopupAutoComplete > richlistbox { + padding: 0; } + +/* Login form autocompletion */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon { + display: initial; + list-style-image: url(chrome://browser/skin/notification-icons.svg#login); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="login"] > .ac-site-icon[selected] { + list-style-image: url(chrome://browser/skin/notification-icons.svg#login-highlighted); } + +/* Insecure field warning */ +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] { + background-color: var(--arrowpanel-dimmed); + border-bottom: 1px solid var(--panel-separator-color); + padding-bottom: 4px; + padding-top: 4px; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] { + background-color: var(--arrowpanel-dimmed-further); + color: -moz-DialogText; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-title { + color: GrayText; + font-size: 1em; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"][selected] > .ac-title { + color: inherit; } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { + list-style-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg#icon); } + +#PopupAutoComplete > richlistbox > richlistitem[originaltype~="datalist-first"] { + border-top: 1px solid ThreeDShadow; } + #treecolAutoCompleteImage { max-width: 36px; } @@ -2302,18 +2193,23 @@ html|span.ac-emphasize-text-url { list-style-image: url("chrome://browser/skin/tabbrowser/crashed.svg"); } .tab-icon-overlay[soundplaying], -.tab-icon-overlay[muted]:not([crashed]) { +.tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]) { border-radius: 8px; } .tab-icon-overlay[soundplaying]:hover, -.tab-icon-overlay[muted]:not([crashed]):hover { +.tab-icon-overlay[muted]:not([crashed]):hover, +.tab-icon-overlay[blocked]:not([crashed]):hover { background-color: white; } .tab-icon-overlay[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio"); } .tab-icon-overlay[muted]:not([crashed]) { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio-small.svg#tab-audio-muted"); } + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-muted"); } + +.tab-icon-overlay[blocked]:not([crashed]) { + list-style-image: url("chrome://browser/skin/tabbrowser/tab-audio-small.svg#tab-audio-blocked"); } .tab-throbber[busy] { list-style-image: url("chrome://browser/skin/custom_images/connecting.png"); } @@ -2336,27 +2232,38 @@ html|span.ac-emphasize-text-url { height: 16px; padding: 0; } -.tab-icon-sound[soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab"); } +.tab-icon-sound[soundplaying], +.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); + fill: currentColor; } -.tab-icon-sound[soundplaying]:hover { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-hover"); } +.tab-icon-sound[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } -.tab-icon-sound[soundplaying]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-pressed"); } +.tab-icon-sound[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } -.tab-icon-sound[muted] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted"); } +.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); } -.tab-icon-sound[muted]:hover { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-hover"); } +.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); } -.tab-icon-sound[muted]:hover:active { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio-backgroundTab-muted-pressed"); } +.tab-icon-sound[soundplaying]:not(:hover), +.tab-icon-sound[muted]:not(:hover), +.tab-icon-sound[blocked]:not(:hover) { + opacity: .8; } -.tab-icon-sound:-moz-lwtheme, -.tab-icon-sound[selected=true][soundplaying] { - list-style-image: url("chrome://browser/skin/custom_images/light/tabs/tab-audio.svg#tab-audio"); } +.tab-icon-sound[soundplaying-scheduledremoval]:not([muted]):not(:hover), +.tab-icon-overlay[soundplaying-scheduledremoval]:not([muted]):not(:hover) { + transition: opacity 0.3s linear var(--soundplaying-removal-delay); + opacity: 0; } .tab-background, .tabs-newtab-button { @@ -2507,6 +2414,7 @@ lwtHeader;*/ .tabs-newtab-button, .tab-icon-overlay[soundplaying], .tab-icon-overlay[muted]:not([crashed]), +.tab-icon-overlay[blocked]:not([crashed]), .tab-icon-sound, .tab-close-button { pointer-events: auto; } @@ -2537,6 +2445,24 @@ lwtHeader;*/ .tabs-newtab-button { width: calc(36px + 30px); } +/* All tabs menupopup */ +.alltabs-item[tabIsVisible] { + /* box-shadow instead of background-color to work around native styling */ + box-shadow: inset -5px 0 ThreeDShadow; } + +.alltabs-endimage[soundplaying], +.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); + fill: currentColor; } + +.alltabs-endimage[muted] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-muted); } + +.alltabs-endimage[blocked] { + list-style-image: url(chrome://browser/skin/tabbrowser/tab-audio.svg#tab-audio-blocked); } + #tabbrowser-tabs { /* override the global style to allow the selected tab to be above the nav-bar */ z-index: auto; } @@ -3600,12 +3526,7 @@ toolbar[brighttext] #downloads-indicator-counter { .customizationmode-button > .button-box > .button-icon { height: 24px; } -#customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle.png"); - -moz-image-region: rect(0, 24px, 24px, 0); } - -#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text, -#customization-titlebar-visibility-button > .button-box > .button-text { +#customization-lwtheme-button > .box-inherit > .box-inherit > .button-text { /* Sadly, button.css thinks its margins are perfect for everyone. */ margin-inline-start: 6px !important; } @@ -3613,21 +3534,9 @@ toolbar[brighttext] #downloads-indicator-counter { width: 20px; height: 20px; border-radius: 2px; + background-image: url("chrome://browser/skin/theme-switcher-icon.png"); background-size: contain; } -#customization-titlebar-visibility-button > .button-box > .button-icon { - vertical-align: middle; } - -#customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 48px, 24px, 24px); } - -@media (min-resolution: 1.1dppx) { - #customization-titlebar-visibility-button { - list-style-image: url("chrome://browser/skin/customizableui/customize-titleBar-toggle@2x.png"); - -moz-image-region: rect(0, 48px, 48px, 0); } - - #customization-titlebar-visibility-button[checked] { - -moz-image-region: rect(0, 96px, 48px, 48px); } } #main-window[customize-entered] #customization-panel-container { background-image: url("chrome://browser/skin/customizableui/customizeMode-separatorHorizontal.png"), url("chrome://browser/skin/customizableui/customizeMode-separatorVertical.png"), url("chrome://browser/skin/customizableui/customizeMode-gridTexture.png"), url("chrome://browser/skin/customizableui/background-noise-toolbar.png"), linear-gradient(to bottom, #3e86ce, #3878ba); background-position: center top, left center, left top, left top, left top; @@ -4226,7 +4135,6 @@ notification.heartbeat { list-style-image: url("chrome://browser/skin/drm-icon.svg#chains"); } #context-navigation > .menuitem-iconic > .menu-iconic-left { - visibility: visible; /* override toolkit/themes/linux/global/menu.css */ padding-inline-end: 0 !important; margin-inline-end: 0 !important; } @@ -4238,9 +4146,6 @@ notification.heartbeat { .webextension-popup-browser { border-radius: inherit; } -.menuitem-iconic[usercontextid] > .menu-iconic-left > .menu-iconic-icon { - visibility: visible; } - #nav-bar #loop-button, #nav-bar toolbar[brighttext] #loop-button { list-style-image: url("chrome://browser/skin/custom_images/light/loop-toolbar-icons.svg") !important; } diff --git a/arc-firefox-theme/chrome/browser/searchbar.css b/arc-firefox-theme/chrome/browser/searchbar.css index 130b90a..cb4103d 100644 --- a/arc-firefox-theme/chrome/browser/searchbar.css +++ b/arc-firefox-theme/chrome/browser/searchbar.css @@ -123,16 +123,39 @@ menuitem[cmd="cmd_clearhistory"][disabled] { } .search-panel-current-engine { - border-top: none !important; -moz-box-align: center; } +/** + * The borders of the various elements are specified as follows. + * + * The current engine always has a bottom border. + * The search results never have a border. + * + * When the search results are not collapsed: + * - The elements underneath the search results all have a top border. + * + * When the search results are collapsed: + * - The elements underneath the search results all have a bottom border, except + * the lowest one: search-setting-button. + */ + .search-panel-current-engine { - border-bottom: none; + border-top: none !important; + border-bottom: 1px solid var(--panel-separator-color) !important; +} + +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-header, +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-one-offs, +.search-panel-tree[collapsed=true] + .search-one-offs > vbox > .addengine-item:first-of-type { + border-top: none !important; } -.search-panel-tree { - border-top: 1px solid var(--panel-separator-color) !important; +.search-panel-tree[collapsed=true] + .search-one-offs > .searchbar-engine-one-off-item, +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-current-input, +.search-panel-tree[collapsed=true] + .search-one-offs > .search-panel-one-offs, +.search-panel-tree[collapsed=true] + .search-one-offs > vbox > .addengine-item:last-of-type { + border-bottom: 1px solid var(--panel-separator-color) !important; } .search-panel-header { diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio-small.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio-small.svg index 27a36c4..abfe712 100644 --- a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio-small.svg +++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio-small.svg @@ -41,4 +41,18 @@ + + + + + + + + + diff --git a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg index 98866ca..274e10c 100644 --- a/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg +++ b/arc-firefox-theme/chrome/browser/tabbrowser/tab-audio.svg @@ -12,4 +12,7 @@ + + diff --git a/arc-firefox-theme/chrome/browser/usercontext/banking.svg b/arc-firefox-theme/chrome/browser/usercontext/banking.svg deleted file mode 100644 index a1e20d8..0000000 --- a/arc-firefox-theme/chrome/browser/usercontext/banking.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/arc-firefox-theme/chrome/browser/usercontext/personal.svg b/arc-firefox-theme/chrome/browser/usercontext/personal.svg deleted file mode 100644 index 861b40b..0000000 --- a/arc-firefox-theme/chrome/browser/usercontext/personal.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/arc-firefox-theme/chrome/browser/usercontext/shopping.svg b/arc-firefox-theme/chrome/browser/usercontext/shopping.svg deleted file mode 100644 index e74e16d..0000000 --- a/arc-firefox-theme/chrome/browser/usercontext/shopping.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/arc-firefox-theme/chrome/browser/usercontext/work.svg b/arc-firefox-theme/chrome/browser/usercontext/work.svg deleted file mode 100644 index 782ad00..0000000 --- a/arc-firefox-theme/chrome/browser/usercontext/work.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/arc-firefox-theme/chrome/browser/warning-white.svg b/arc-firefox-theme/chrome/browser/warning-white.svg new file mode 100644 index 0000000..942c23c --- /dev/null +++ b/arc-firefox-theme/chrome/browser/warning-white.svg @@ -0,0 +1,6 @@ + + + + diff --git a/arc-firefox-theme/chrome/browser/wifi.svg b/arc-firefox-theme/chrome/browser/wifi.svg new file mode 100644 index 0000000..39fd936 --- /dev/null +++ b/arc-firefox-theme/chrome/browser/wifi.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/arc-firefox-theme/chrome/global/aboutReaderControls.css b/arc-firefox-theme/chrome/global/aboutReaderControls.css index 09f8bdc..a624901 100644 --- a/arc-firefox-theme/chrome/global/aboutReaderControls.css +++ b/arc-firefox-theme/chrome/global/aboutReaderControls.css @@ -82,6 +82,7 @@ background-color: #fbfbfb; -moz-user-select: none; border-right: 1px solid #b5b5b5; + z-index: 1; } .button { diff --git a/arc-firefox-theme/chrome/global/button.css b/arc-firefox-theme/chrome/global/button.css index 8b5f331..6202475 100644 --- a/arc-firefox-theme/chrome/global/button.css +++ b/arc-firefox-theme/chrome/global/button.css @@ -150,199 +150,3 @@ button[type="disclosure"] { button[type="disclosure"][open="true"] { list-style-image: url("chrome://global/skin/tree/twisty-open.png"); } - -/* - * GNOME Stock Icon Styles - */ - -button[icon="accept"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-ok?size=button"); -} - -button[icon="accept"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-ok?size=button&state=disabled"); -} - -button[icon="cancel"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-cancel?size=button"); -} - -button[icon="cancel"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-cancel?size=button&state=disabled"); -} - -button[icon="help"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-help?size=button"); -} - -button[icon="help"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-help?size=button&state=disabled"); -} - -button[icon="open"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-open?size=button"); -} - -button[icon="open"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-open?size=button&state=disabled"); -} - -button[icon="save"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-save?size=button"); -} - -button[icon="save"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-save?size=button&state=disabled"); -} - -button[icon="find"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-find?size=button"); -} - -button[icon="find"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-find?size=button&state=disabled"); -} - -button[icon="clear"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-clear?size=button"); -} - -button[icon="clear"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-clear?size=button&state=disabled"); -} - -button[icon="yes"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-yes?size=button"); -} - -button[icon="yes"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-yes?size=button&state=disabled"); -} - -button[icon="no"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-no?size=button"); -} - -button[icon="no"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-no?size=button&state=disabled"); -} - -button[icon="apply"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-apply?size=button"); -} - -button[icon="apply"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-apply?size=button&state=disabled"); -} - -button[icon="close"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-close?size=button"); -} - -button[icon="close"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-close?size=button&state=disabled"); -} - -button[icon="print"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-print?size=button"); -} - -button[icon="print"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-print?size=button&state=disabled"); -} - -button[icon="add"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-add?size=button"); -} - -button[icon="add"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-add?size=button&state=disabled"); -} - -button[icon="remove"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-remove?size=button"); -} - -button[icon="remove"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-remove?size=button&state=disabled"); -} - -button[icon="refresh"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-refresh?size=button"); -} - -button[icon="refresh"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-refresh?size=button&state=disabled"); -} - -button[icon="revert"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-revert-to-saved?size=button"); -} - -button[icon="revert"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-revert-to-saved?size=button&state=disabled"); -} - -button[icon="go-forward"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=button"); -} - -button[icon="go-forward"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-forward-ltr?size=button&state=disabled"); -} - -button[icon="go-forward"]:-moz-locale-dir(rtl) .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=button"); -} - -button[icon="go-forward"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-forward-rtl?size=button&state=disabled"); -} - -button[icon="go-back"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=button"); -} - -button[icon="go-back"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-back-ltr?size=button&state=disabled"); -} - -button[icon="go-back"]:-moz-locale-dir(rtl) .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=button"); -} - -button[icon="go-back"]:-moz-locale-dir(rtl)[disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-go-back-rtl?size=button&state=disabled"); -} - -button[icon="properties"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-properties?size=button"); -} - -button[icon="properties"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-properties?size=button&state=disabled"); -} - -button[icon="select-font"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-select-font?size=button"); -} - -button[icon="select-font"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-select-font?size=button&state=disabled"); -} - -button[icon="select-color"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-color-picker?size=button"); -} - -button[icon="select-color"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-color-picker?size=button&state=disabled"); -} - -button[icon="network"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-network?size=button"); -} - -button[icon="network"][disabled="true"] .button-icon { - list-style-image: url("moz-icon://stock/gtk-network?size=button&state=disabled"); -} diff --git a/arc-firefox-theme/chrome/global/global.css b/arc-firefox-theme/chrome/global/global.css index 709936e..1f9e7e4 100644 --- a/arc-firefox-theme/chrome/global/global.css +++ b/arc-firefox-theme/chrome/global/global.css @@ -35,10 +35,10 @@ toolbar[type="menubar"]:not([autohide="true"]):not(:-moz-lwtheme):-moz-system-me /* ::::: Variables ::::: */ :root { - --panel-arrowcontent-padding: 10px; - --panel-arrowcontent-background: -moz-field; - --panel-arrowcontent-color: -moz-fieldText; - --panel-arrowcontent-border-color: ThreeDShadow; + --arrowpanel-padding: 10px; + --arrowpanel-background: -moz-field; + --arrowpanel-color: -moz-fieldText; + --arrowpanel-border-color: ThreeDShadow; } /* ::::: root elements ::::: */ diff --git a/arc-firefox-theme/chrome/global/icons/input-clear.svg b/arc-firefox-theme/chrome/global/icons/input-clear.svg new file mode 100644 index 0000000..0abaaf9 --- /dev/null +++ b/arc-firefox-theme/chrome/global/icons/input-clear.svg @@ -0,0 +1,16 @@ + + + + + + + diff --git a/arc-firefox-theme/chrome/global/in-content/common.css b/arc-firefox-theme/chrome/global/in-content/common.css index 6a3c188..05c91b4 100644 --- a/arc-firefox-theme/chrome/global/in-content/common.css +++ b/arc-firefox-theme/chrome/global/in-content/common.css @@ -73,11 +73,16 @@ xul|caption { margin: 0; } +html|h2, xul|caption > xul|checkbox, xul|caption > xul|label { font-size: 1.3rem; font-weight: bold; line-height: 22px; +} + +xul|caption > xul|checkbox, +xul|caption > xul|label { margin: 0 !important; } @@ -567,6 +572,11 @@ xul|richlistitem > xul|*.checkbox-check { margin: 3px 6px; } +html|*.toggle-container-with-text { + display: flex; + align-items: center; +} + xul|radio { margin-inline-start: 0; } diff --git a/arc-firefox-theme/chrome/global/menu.css b/arc-firefox-theme/chrome/global/menu.css index ea73d9c..06e3b21 100644 --- a/arc-firefox-theme/chrome/global/menu.css +++ b/arc-firefox-theme/chrome/global/menu.css @@ -36,7 +36,8 @@ menuitem[_moz-menuactive="true"], menu[disabled="true"], menuitem[disabled="true"], -.splitmenu-menuitem[disabled="true"] { +.splitmenu-menuitem[disabled="true"], +menucaption[disabled="true"] { color: GrayText; } @@ -184,14 +185,6 @@ menuitem[type="radio"] { menuseparator { -moz-appearance: menuseparator; - margin: 2px 0; - border-top: 1px solid ThreeDShadow; - border-bottom: 1px solid ThreeDHighlight; -} - -menulist > menupopup > menuseparator { - border-top: 1px solid #000000; - border-bottom: none; } /* ::::: autocomplete ::::: */ @@ -200,11 +193,3 @@ menulist > menupopup > menuseparator { max-width: none !important; font: message-box; } - -/* ::::: tree column picker ::::: */ - -.treecell-popupcell-menu { - margin-inline-start: -2px; - list-style-image: url("chrome://global/skin/columnselect.gif"); - -moz-image-region: auto; -} diff --git a/arc-firefox-theme/chrome/global/narrate.css b/arc-firefox-theme/chrome/global/narrate.css index 3aa8a8a..8a44e78 100644 --- a/arc-firefox-theme/chrome/global/narrate.css +++ b/arc-firefox-theme/chrome/global/narrate.css @@ -1,3 +1,8 @@ +.narrating { + position: relative; + z-index: 1; +} + body.light .narrating { background-color: #ffc; } @@ -9,3 +14,33 @@ body.sepia .narrating { body.dark .narrating { background-color: #242424; } + +.narrate-word-highlight { + position: absolute; + display: none; + transform: translate(-50%, calc(-50% - 2px)); + z-index: -1; + border-bottom-style: solid; + border-bottom-width: 7px; + transition: left 0.1s ease; +} + +.narrating > .narrate-word-highlight { + display: inline-block; +} + +.narrate-word-highlight.newline { + transition: none; +} + +body.light .narrate-word-highlight { + border-bottom-color: #ffe087; +} + +body.sepia .narrate-word-highlight { + border-bottom-color: #bdb5a5; +} + +body.dark .narrate-word-highlight { + border-bottom-color: #6f6f6f; +} diff --git a/arc-firefox-theme/chrome/global/notification.css b/arc-firefox-theme/chrome/global/notification.css index 48613f5..2e57051 100644 --- a/arc-firefox-theme/chrome/global/notification.css +++ b/arc-firefox-theme/chrome/global/notification.css @@ -14,6 +14,16 @@ notification[type="info"] { color: -moz-DialogText; background-color: -moz-Dialog; -moz-appearance: none; + border-top: 1px solid ThreeDShadow; + border-bottom: 1px solid ThreeDShadow; +} + +notificationbox[notificationside="top"] > notification[type="info"] { + border-top-style: none; +} + +notificationbox[notificationside="bottom"] > notification[type="info"] { + border-bottom-style: none; } notification[type="critical"] { diff --git a/arc-firefox-theme/chrome/global/popup.css b/arc-firefox-theme/chrome/global/popup.css index 80256df..d435fca 100644 --- a/arc-firefox-theme/chrome/global/popup.css +++ b/arc-firefox-theme/chrome/global/popup.css @@ -32,10 +32,10 @@ panel[type="arrow"][side="right"] { } .panel-arrowcontent { - padding: var(--panel-arrowcontent-padding); - color: var(--panel-arrowcontent-color); - background: var(--panel-arrowcontent-background); - border: 1px solid var(--panel-arrowcontent-border-color); + padding: var(--arrowpanel-padding); + color: var(--arrowpanel-color); + background: var(--arrowpanel-background); + border: 1px solid var(--arrowpanel-border-color); box-shadow: 0 0 4px hsla(0,0%,0%,.2); margin: 4px; } @@ -80,8 +80,6 @@ panel[type="arrow"][side="right"] { tooltip { -moz-appearance: tooltip; margin-top: 21px; - /* GTK hardcodes this to 4px */ - padding: 4px; max-width: 40em; color: InfoText; font: message-box; diff --git a/arc-firefox-theme/chrome/global/scale/scale-tray-horiz.gif b/arc-firefox-theme/chrome/global/scale/scale-tray-horiz.gif new file mode 100644 index 0000000..b87fe68 Binary files /dev/null and b/arc-firefox-theme/chrome/global/scale/scale-tray-horiz.gif differ diff --git a/arc-firefox-theme/chrome/global/scale/scale-tray-vert.gif b/arc-firefox-theme/chrome/global/scale/scale-tray-vert.gif new file mode 100644 index 0000000..97687b2 Binary files /dev/null and b/arc-firefox-theme/chrome/global/scale/scale-tray-vert.gif differ diff --git a/arc-firefox-theme/chrome/global/textbox.css b/arc-firefox-theme/chrome/global/textbox.css index 5cf4ece..9e75e0c 100644 --- a/arc-firefox-theme/chrome/global/textbox.css +++ b/arc-firefox-theme/chrome/global/textbox.css @@ -90,58 +90,3 @@ textbox.plain html|*.textbox-textarea { toolbarpaletteitem > toolbaritem > textbox > .textbox-input-box > html|*.textbox-input { visibility: hidden; } - -/* ::::: context menu ::::: */ - -menuitem:not([type]) { - -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic"); -} - -menuitem[cmd="cmd_undo"] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu"); -} - -menuitem[cmd="cmd_undo"][disabled] { - list-style-image: url("moz-icon://stock/gtk-undo?size=menu&state=disabled"); -} - -menuitem[cmd="cmd_cut"] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu"); -} - -menuitem[cmd="cmd_cut"][disabled] { - list-style-image: url("moz-icon://stock/gtk-cut?size=menu&state=disabled"); -} - -menuitem[cmd="cmd_copy"] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu"); -} - -menuitem[cmd="cmd_copy"][disabled] { - list-style-image: url("moz-icon://stock/gtk-copy?size=menu&state=disabled"); -} - -menuitem[cmd="cmd_paste"] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu"); -} - -menuitem[cmd="cmd_paste"][disabled] { - list-style-image: url("moz-icon://stock/gtk-paste?size=menu&state=disabled"); -} - -menuitem[cmd="cmd_delete"] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu"); -} - -menuitem[cmd="cmd_delete"][disabled] { - list-style-image: url("moz-icon://stock/gtk-delete?size=menu&state=disabled"); -} - -menuitem[cmd="cmd_selectAll"] { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu"); -} - -menuitem[cmd="cmd_selectAll"][disabled] { - list-style-image: url("moz-icon://stock/gtk-select-all?size=menu&state=disabled"); -} - diff --git a/arc-firefox-theme/chrome/global/timepicker.css b/arc-firefox-theme/chrome/global/timepicker.css new file mode 100644 index 0000000..e8d081b --- /dev/null +++ b/arc-firefox-theme/chrome/global/timepicker.css @@ -0,0 +1,153 @@ +/* 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/global/tree.css b/arc-firefox-theme/chrome/global/tree.css index 1002847..2fb50da 100644 --- a/arc-firefox-theme/chrome/global/tree.css +++ b/arc-firefox-theme/chrome/global/tree.css @@ -193,10 +193,6 @@ treechildren::-moz-tree-progressmeter { color: ThreeDShadow; } -treechildren::-moz-tree-progressmeter(progressUndetermined) { - list-style-image: url("chrome://global/skin/progressmeter/progressmeter-busy.gif"); -} - treechildren::-moz-tree-cell-text(progressmeter) { margin: 2px 4px; } @@ -345,6 +341,17 @@ treechildren::-moz-tree-cell-text(selected, editing) { color: inherit; } +treechildren::-moz-tree-cell(active, selected, focus, editing), +tree[seltype="cell"] > treechildren::-moz-tree-cell(active, selected, focus, editing), +tree[seltype="text"] > treechildren::-moz-tree-cell(active, selected, focus, editing) { + background-color: transparent; + border: none; +} + +treechildren::-moz-tree-cell-text(active, selected, editing) { + opacity: 0; +} + .tree-input { -moz-appearance: none; border: 1px solid Highlight; diff --git a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css index 2b4a8df..981c04a 100644 --- a/arc-firefox-theme/chrome/mozapps/aboutNetworking.css +++ b/arc-firefox-theme/chrome/mozapps/aboutNetworking.css @@ -19,12 +19,12 @@ body { } #refreshDiv { - text-align: end; + justify-content: flex-end; margin-bottom: 0.5em; } #refreshButton { - vertical-align: middle; + margin-top: 0; } /** Categories **/ @@ -103,7 +103,6 @@ body { } .tab table { - border: 1; width: 100%; } diff --git a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css index c0f14a1..f33684f 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/extensions.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/extensions.css @@ -1111,11 +1111,6 @@ button.button-link:not([disabled="true"]):active:hover { padding: 0 1px; } -.meta-rating[showrating="user"] > .star { - list-style-image: url("chrome://mozapps/skin/extensions/rating-unrated.png"); - padding: 2px 3px; -} - .meta-rating > .star[on="true"], .meta-rating[showrating="user"] > .star[hover] { list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png"); diff --git a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css index e28c89d..8fbfc7e 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/newaddon.css @@ -91,7 +91,6 @@ #buttonDeck { margin-top: 25px; -moz-box-align: stretch; - -moz-box-pack: stretch; } #continuePanel { diff --git a/arc-firefox-theme/chrome/mozapps/extensions/update.css b/arc-firefox-theme/chrome/mozapps/extensions/update.css index f872b43..0db1793 100644 --- a/arc-firefox-theme/chrome/mozapps/extensions/update.css +++ b/arc-firefox-theme/chrome/mozapps/extensions/update.css @@ -2,10 +2,6 @@ * 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/. */ -#alert { - list-style-image: url("chrome://mozapps/skin/update/update.png"); -} - .throbber { list-style-image: url("chrome://global/skin/icons/loading.png"); width: 16px; diff --git a/arc-firefox-theme/chrome/mozapps/plugins/contentPluginDisabled.png b/arc-firefox-theme/chrome/mozapps/plugins/contentPluginDisabled.png deleted file mode 100644 index b8b6a10..0000000 Binary files a/arc-firefox-theme/chrome/mozapps/plugins/contentPluginDisabled.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/mozapps/plugins/contentPluginDownload.png b/arc-firefox-theme/chrome/mozapps/plugins/contentPluginDownload.png deleted file mode 100644 index 714302d..0000000 Binary files a/arc-firefox-theme/chrome/mozapps/plugins/contentPluginDownload.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/mozapps/plugins/contentPluginMissing.png b/arc-firefox-theme/chrome/mozapps/plugins/contentPluginMissing.png deleted file mode 100644 index 9fb2eac..0000000 Binary files a/arc-firefox-theme/chrome/mozapps/plugins/contentPluginMissing.png and /dev/null differ diff --git a/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css b/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css index 6dc8f0a..9929bd9 100644 --- a/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css +++ b/arc-firefox-theme/chrome/mozapps/plugins/pluginProblem.css @@ -63,13 +63,6 @@ html|a { margin-bottom: 6px; } -:-moz-type-unsupported .icon, -:-moz-type-unsupported-platform .icon { - background-image: url(chrome://mozapps/skin/plugins/contentPluginMissing.png); -} -:-moz-type-unsupported .icon[installable] { - background-image: url(chrome://mozapps/skin/plugins/contentPluginDownload.png); -} :-moz-handler-vulnerable-updatable .icon, :-moz-handler-vulnerable-no-update .icon { background-image: url(chrome://mozapps/skin/plugins/contentPluginBlocked.png); @@ -78,13 +71,11 @@ html|a { :-moz-handler-blocked .icon { background-image: url(chrome://mozapps/skin/plugins/contentPluginBlocked.png); } +a .icon, :-moz-handler-clicktoplay .icon { background-image: url(chrome://mozapps/skin/plugins/contentPluginActivate.png); -moz-user-focus: normal; } -:-moz-handler-disabled .icon { - background-image: url(chrome://mozapps/skin/plugins/contentPluginDisabled.png); -} :-moz-handler-crashed .icon { background-image: url(chrome://mozapps/skin/plugins/contentPluginCrashed.png); } @@ -108,13 +99,15 @@ html|a { } @media not all and (-moz-touch-enabled) { - :-moz-handler-clicktoplay .msgTapToPlay { + :-moz-handler-clicktoplay .msgTapToPlay, + a .msgTapToPlay { display: none; } } @media (-moz-touch-enabled) { - :-moz-handler-clicktoplay .msgClickToPlay { + :-moz-handler-clicktoplay .msgClickToPlay, + a .msgClickToPlay { display: none; } } -- cgit v1.2.3