From acba34967718bd28a4333e2151ba46c18dc20b3b Mon Sep 17 00:00:00 2001 From: Brindusan Cristian Date: Sat, 5 Jun 2021 03:18:11 +0300 Subject: [PATCH] Backed out changeset 03a717a6815e (bug 1714351) for causing bc failures in browser_all_files_referenced.js. CLOSED TREE --- browser/base/content/browser.css | 10 + .../downloads/content/downloads.css | 2 + browser/themes/linux/places/editBookmark.css | 25 ++ browser/themes/osx/browser.css | 74 +++++ browser/themes/osx/downloads/downloads.css | 5 + browser/themes/osx/places/editBookmark.css | 6 + browser/themes/shared/browser.inc.css | 23 ++ .../themes/shared/controlcenter/panel.inc.css | 274 +++++++++++++++++- .../shared/customizableui/panelUI.inc.css | 37 +++ .../themes/shared/downloads/downloads.inc.css | 102 ++++++- .../themes/shared/notification-icons.inc.css | 58 ++++ .../shared/places/editBookmarkPanel.inc.css | 33 ++- .../themes/windows/downloads/downloads.css | 9 + .../themes/windows/places/editBookmark.css | 6 + .../themes/linux/global/popupnotification.css | 6 + .../themes/osx/global/popupnotification.css | 6 + toolkit/themes/shared/global.inc.css | 59 ++++ .../themes/shared/popupnotification.inc.css | 13 + .../windows/global/popupnotification.css | 6 + 19 files changed, 750 insertions(+), 4 deletions(-) diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css index 4bb55431ba9a..8a09b9748a1c 100644 --- a/browser/base/content/browser.css +++ b/browser/base/content/browser.css @@ -153,9 +153,11 @@ panelview[mainview] > .panel-header { transition: height var(--panelui-subview-transition-duration); } +@media (-moz-proton-doorhangers) { :is(panel, menupopup)::part(arrow) { display: none; } +} /** END Proton **/ @supports -moz-bool-pref("layout.css.emulate-moz-box-with-flex") { #tabbrowser-tabs { @@ -1653,3 +1655,11 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop { /** * End Dialogs */ + +@media not (-moz-proton-doorhangers) { +/* Password update/save doorhanger */ +#password-notification-username, +#password-notification-password { + margin-inline-start: 6px; +} +} /** END not Proton **/ diff --git a/browser/components/downloads/content/downloads.css b/browser/components/downloads/content/downloads.css index 9dbe8aed69e4..3e4eb1a276fa 100644 --- a/browser/components/downloads/content/downloads.css +++ b/browser/components/downloads/content/downloads.css @@ -88,6 +88,7 @@ max-width: unset; } +@media (-moz-proton-doorhangers) { #downloadsPanel-blockedSubview, #downloadsPanel-mainView { font: caption; @@ -103,3 +104,4 @@ padding: 0.62em; margin: 0.62em 0 0; } +} /** END Proton **/ diff --git a/browser/themes/linux/places/editBookmark.css b/browser/themes/linux/places/editBookmark.css index 163b7a74e31e..184de68d5e33 100644 --- a/browser/themes/linux/places/editBookmark.css +++ b/browser/themes/linux/places/editBookmark.css @@ -2,6 +2,31 @@ * 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/. */ +@media not (-moz-proton-doorhangers) { +#editBookmarkPanelRows > vbox { + margin-bottom: .5em; +} + +/* Expanders */ + +.expander-up, +.expander-down { + min-width: 0; + padding: 2px 0; + padding-inline-start: 2px; +} + +.expander-up > .button-box { + appearance: auto; + -moz-default-appearance: button-arrow-up; +} + +.expander-down > .button-box { + appearance: auto; + -moz-default-appearance: button-arrow-down; +} +} /** END not Proton **/ + /* Folder menulist */ #editBMPanel_folderMenuList::part(icon) { diff --git a/browser/themes/osx/browser.css b/browser/themes/osx/browser.css index 7d922670d52c..9056af8f0275 100644 --- a/browser/themes/osx/browser.css +++ b/browser/themes/osx/browser.css @@ -366,6 +366,80 @@ moz-input-box > menupopup .context-menu-add-engine > .menu-iconic-left { text-align: start; } +@media not (-moz-proton-doorhangers) { +#editBookmarkPanelRows > vbox > html|input, +#editBookmarkPanelRows > vbox > hbox > html|input { + appearance: none; + background-color: var(--arrowpanel-field-background); + color: inherit; + border-radius: 2px; + border: 1px solid var(--panel-separator-color) !important; + margin: 0; + padding: 3px 6px; +} + +#editBookmarkPanelRows > vbox > html|input:focus, +#editBookmarkPanelRows > vbox > hbox > html|input:focus { + border-color: -moz-mac-focusring !important; + box-shadow: var(--focus-ring-box-shadow); +} + +#editBMPanel_folderMenuList { + margin: 0; + min-height: 22px; + padding-block: 2px 1px; + padding-inline: 8px 4px; +} + +#editBMPanel_folderMenuList:-moz-focusring { + box-shadow: var(--focus-ring-box-shadow); +} + +#editBMPanel_folderMenuList::part(dropmarker) { + appearance: none; + -moz-context-properties: fill, fill-opacity; + fill: currentColor; + fill-opacity: 0.8; + list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg"); + display: -moz-box; + -moz-box-align: center; + padding-inline-end: 4px; + width: 7px; +} + +/**** expanders ****/ + +#editBookmarkPanel .expander-up { + list-style-image: url("chrome://global/skin/icons/arrow-up-12.svg"); +} + +#editBookmarkPanel .expander-down { + list-style-image: url("chrome://global/skin/icons/arrow-dropdown-12.svg"); +} + +#editBookmarkPanel .expander-up, +#editBookmarkPanel .expander-down { + appearance: none; /* override button.css */ + -moz-context-properties: fill, fill-opacity; + fill: currentColor; + fill-opacity: 0.8; + margin: 0; + margin-inline-start: 4px; + min-width: 27px; + min-height: 22px; +} + +#editBookmarkPanel .expander-up > .button-box > .button-icon, +#editBookmarkPanel .expander-down > .button-box > .button-icon { + margin: 1px 0 0; +} + +#editBookmarkPanel .expander-up > .button-box > .button-text, +#editBookmarkPanel .expander-down > .button-box > .button-text { + display: none; +} +} /** END not Proton **/ + /**** folder tree and tag selector ****/ #editBMPanel_folderTree, diff --git a/browser/themes/osx/downloads/downloads.css b/browser/themes/osx/downloads/downloads.css index bbcc031f11e4..dd3c4d5262ac 100644 --- a/browser/themes/osx/downloads/downloads.css +++ b/browser/themes/osx/downloads/downloads.css @@ -24,6 +24,11 @@ outline-offset: -2px; } +@media not (-moz-proton-doorhangers) { +@item@[verdict="Malware"]:not(:hover) { + color: #aa1b08; +} + :root[lwt-popup-brighttext] @item@[verdict="Malware"]:not(:hover) { color: #ff0039; } diff --git a/browser/themes/osx/places/editBookmark.css b/browser/themes/osx/places/editBookmark.css index dd9b1861d654..b11272c9a366 100644 --- a/browser/themes/osx/places/editBookmark.css +++ b/browser/themes/osx/places/editBookmark.css @@ -2,6 +2,12 @@ * 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/. */ +@media not (-moz-proton-doorhangers) { +#editBookmarkPanelRows > vbox { + margin-bottom: .5em; +} +} /** END not Proton **/ + /**** folder menulist ****/ #editBMPanel_folderMenuList::part(icon), .folder-icon > .menu-iconic-left > .menu-iconic-icon { diff --git a/browser/themes/shared/browser.inc.css b/browser/themes/shared/browser.inc.css index 8bf915316e6f..6d3890dad08a 100644 --- a/browser/themes/shared/browser.inc.css +++ b/browser/themes/shared/browser.inc.css @@ -764,6 +764,28 @@ menupopup::part(drop-indicator) { flex: 1; } +@media not (-moz-proton-doorhangers) { +.webRTC-selectDevice-label { + margin-top: 6px; + font-weight: 600; +} + +#webRTC-selectCamera-icon, +#webRTC-selectMicrophone-icon { + display: none; +} + +#webRTC-selectWindow-menulist { + margin-inline: 2px; +} + +.ac-has-end-icon { + /* Password manager's username field icon width + icon end margin */ + padding-inline-end: calc(12px + 8px); +} +} /** END not Proton **/ + +@media (-moz-proton-doorhangers) { popupnotificationcontent { margin-block-start: 8px; } @@ -861,6 +883,7 @@ popupnotificationcontent { font-weight: 600; margin-top: 0; } +} /** END Proton **/ #tab-notification-deck { display: block; diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css index 08d9015ce9c6..dcdf07a93f9e 100644 --- a/browser/themes/shared/controlcenter/panel.inc.css +++ b/browser/themes/shared/controlcenter/panel.inc.css @@ -20,8 +20,25 @@ --horizontal-padding: 1.78em; --vertical-section-padding: 0.9em; --height-offset: 0px; +} + +@media (-moz-proton-doorhangers) { +#identity-popup, +#permission-popup, +#protections-popup { font: menu; } +} + +@media not (-moz-proton-doorhangers) { +#identity-popup, +#permission-popup, +#protections-popup { +%if defined(XP_MACOSX) || defined(XP_WIN) + font-size: 1.18em; +%endif +} +} #protections-popup[toast] { --popup-width: 27.12em; @@ -164,6 +181,83 @@ background-position: calc(100% - 1em) 1em; } +@media not (-moz-proton-doorhangers) { +#identity-popup-securityView .identity-popup-security-content { + border-bottom: 1px solid var(--panel-separator-color); +} + +.identity-popup-security-connection, +#identity-popup-security-description, +#identity-popup-security-httpsonlymode { + /* icon indent + 16px icon width + 6px description margin + (total of 12px margin with the native 6px description margin) */ + padding-inline: calc(2em + 22px) 1em; +} + +.identity-popup-security-connection > hbox { + margin-inline-start: 0; +} + +#identity-popup-security-httpsonlymode-info { + margin-bottom: 0; +} + +.identity-popup-connection-secure.upgraded { + margin-inline: 0; +} + +#identity-popup-security-description > description { + margin-block: 0.5em 0.3em; + font-weight: normal; +} + +/* EXPAND BUTTON */ + +.identity-popup-expander { + margin: 0; + padding: 4px 0; + min-width: auto; + width: 38px; + border-style: none; + appearance: none; + background: url("chrome://global/skin/icons/arrow-left.svg") center no-repeat; + background-size: 16px, auto; + -moz-context-properties: fill, fill-opacity; + fill: currentColor; + fill-opacity: .6; + color: inherit; +} + +.identity-popup-expander:-moz-locale-dir(ltr) { + transform: scaleX(-1); +} + +.identity-popup-expander > .button-box { + border-right: 1px solid var(--panel-separator-color); + padding: 0; +} + +.identity-popup-expander:hover { + background-color: var(--arrowpanel-dimmed); +} + +.identity-popup-expander:hover:active { + background-color: var(--arrowpanel-dimmed-further); + box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset; +} +} /** END not PROTON **/ + +@media not (-moz-proton-doorhangers) { +.identity-popup-security-content, +#permission-popup-permissions-content { + padding-block: 1em; +} + +#permission-popup-permissions-content { + padding-inline: 2em 1em; +} +} /** END not PROTON **/ + /* CONTENT */ .protections-popup-footer-button, @@ -246,6 +340,33 @@ margin-top: 4px; } +@media not (-moz-proton-doorhangers) { +#permission-popup-mainView-panel-header, +#identity-popup-mainView-panel-header { + padding: var(--vertical-section-padding) 2px; +} + +#identity-popup-mainView-panel-header-span, +#permission-popup-mainView-panel-header-span { + margin-top: 0; +} + +.identity-popup-warning-box { + padding: 0.5em; +} + +.identity-popup-warning-gray { + background-color: var(--arrowpanel-dimmed); + border: 1px solid var(--panel-separator-color); +} + +.identity-popup-warning-yellow { + color: black; + background-color: #FFEEBF; + border: 1px solid #FFE083; +} +} /** END not PROTON **/ + #protections-popup[toast] #protections-popup-info-button { display: none; } @@ -270,6 +391,29 @@ /* SECURITY */ +@media not (-moz-proton-doorhangers) { +.identity-popup-connection-secure { + color: #058B00; +} + +:root[lwt-popup-brighttext] .identity-popup-connection-secure { + color: #30e60b; +} + +#identity-popup[connection^=secure] .identity-popup-security-connection { + fill: #12BC00; +} + +#identity-popup[connection=extension] .identity-popup-security-connection { + fill: #60bf4c; +} + +#identity-popup[mixedcontent~=active-loaded] .identity-popup-connection-not-secure, +#identity-popup:not([mixedcontent]) .identity-popup-connection-not-secure { + color: #d74345; +} +} /** END not PROTON **/ + #identity-popup[mixedcontent~=active-loaded] .identity-popup-connection-not-secure, #identity-popup:not([mixedcontent]) .identity-popup-connection-not-secure { color: var(--error-text-color, color-mix(in srgb, currentColor 40%, #C50042)); @@ -333,6 +477,20 @@ padding-top: 4px; } +@media not (-moz-proton-doorhangers) { +#identity-popup-securityView-body { + /* icon indent + 16px icon width + 6px description margin + (total of 12px margin with the native 6px description margin) */ + margin-inline: calc(2em + 22px) 1em; + padding-top: 0.5em; +} + +#identity-popup-more-info-footer { + margin-top: 1em; +} +} /** END not PROTON **/ + +@media (-moz-proton-doorhangers) { #identity-popup-multiView { height: -moz-fit-content; } @@ -395,6 +553,7 @@ padding-inline: 0; font-weight: 600; } +}/** END Proton **/ #identity-popup-securityView-body > label:not(.plain), #identity-popup-content-verifier ~ description { @@ -738,6 +897,30 @@ description#identity-popup-content-verifier, margin-inline-start: 8px; } +@media not (-moz-proton-doorhangers) { +.permission-popup-permission-icon { + margin-inline-start: 3px; +} + +.permission-popup-permission-icon.in-use { + -moz-context-properties: fill; + fill: rgb(224, 41, 29); +} + +.permission-popup-permission-label, +.permission-popup-permission-header-label { + margin-inline-start: 10px; +} + +.permission-popup-permission-item { + padding-inline-end: 8px; +} + +#identity-popup-security { + margin-top: -6px; +} +} /** END not PROTON **/ + .permission-popup-permission-label-subitem { /* Align label with other labels with icon. */ /* icon width + icon inline margin + label inline margin */ @@ -853,7 +1036,7 @@ description#identity-popup-content-verifier, .protections-popup-tp-switch { appearance: none; box-sizing: border-box; - min-width: 30px; + min-width: 26px; border-radius: 10px; background-color: var(--button-bgcolor); border: 1px solid hsla(210,4%,10%,.14); @@ -864,6 +1047,12 @@ description#identity-popup-content-verifier, transition: padding .2s ease; } +@media (-moz-proton-doorhangers) { +.protections-popup-tp-switch { + min-width: 30px; +} +} + .protections-popup-tp-switch::before { position: relative; display: block; @@ -879,8 +1068,14 @@ description#identity-popup-content-verifier, background-color: var(--button-primary-bgcolor); border-color: var(--button-primary-hover-bgcolor); /* Push the toggle to the right. */ + padding-inline-start: 12px; +} + +@media (-moz-proton-doorhangers) { +.protections-popup-tp-switch[enabled] { padding-inline-start: 16px; } +} .protections-popup-tp-switch[enabled]:hover { background-color: var(--button-primary-hover-bgcolor); @@ -1013,6 +1208,81 @@ description#identity-popup-content-verifier, stroke: #ffbd4f; } +@media not (-moz-proton-doorhangers) { +#protections-popup-mainView-panel-header-section { + color: white; + background: radial-gradient(circle farthest-side at top right, #9059FF, #0250BB); + + /* Set custom hover/focus/active states on the info button, + to make them more visible on the header background */ + --arrowpanel-dimmed: rgba(12, 12, 13, 0.2); + --arrowpanel-dimmed-further: rgba(12, 12, 13, 0.3); + --arrowpanel-dimmed-even-further: rgba(12, 12, 13, 0.4); +} + +#protections-popup[hasException] #protections-popup-tp-switch-section { + background: repeating-linear-gradient( + -56deg, + hsla(0,0%,80%,.25), + hsla(0,0%,80%,.25) 10px, + transparent 10px, + transparent 20px + ); +} + +:root[lwt-popup-brighttext] #protections-popup[hasException] #protections-popup-tp-switch-section { + background: repeating-linear-gradient( + -56deg, + rgba(249,249,250,.05), + rgba(249,249,250,.05) 10px, + transparent 10px, + transparent 20px + ); +} + +#protections-popup-mainView-panel-header-section:-moz-locale-dir(rtl) { + background: radial-gradient(circle farthest-side at top left, #9059FF, #0250BB); +} + +#protections-popup-mainView-panel-header-section + toolbarseparator { + display: none; +} + +#protections-popup-tp-switch-breakage-link, +#protections-popup-tp-switch-breakage-fixed-link { + margin-top: calc(0.5 * var(--vertical-section-padding)) !important; +} + +#protections-popup-milestones-content, +#protections-popup-milestones { + border-radius: 0; +} + +#protections-popup-milestones-text { + font-weight: normal; + font-size: 1.23em; +} + +.protections-popup-footer-icon { + -moz-context-properties: fill; + width: 16px; + height: 16px; +} + +.protections-popup-settings-icon { + list-style-image: url(chrome://global/skin/icons/settings.svg); +} + +.protections-popup-show-report-icon { + list-style-image: url(chrome://browser/skin/controlcenter/dashboard.svg); +} + +.protections-popup-footer-button-label { + margin-inline-start: 1em; +} +}/** END not PROTON **/ + +@media (-moz-proton-doorhangers) { #protections-popup-mainView-panel-header { min-height: 43.5px; } @@ -1108,6 +1378,8 @@ description#identity-popup-content-verifier, padding: 5px 16px; } +}/** END Proton **/ + /** Shim-allow warning and indicator icons **/ .protections-popup-shim-allow-hint { diff --git a/browser/themes/shared/customizableui/panelUI.inc.css b/browser/themes/shared/customizableui/panelUI.inc.css index 6b4bee157934..c842999019b5 100644 --- a/browser/themes/shared/customizableui/panelUI.inc.css +++ b/browser/themes/shared/customizableui/panelUI.inc.css @@ -389,6 +389,7 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv max-width: @standaloneSubviewWidth@; } +@media (-moz-proton-doorhangers) { #BMB_bookmarksPopup::part(arrowscrollbox) { border: 0; } @@ -405,6 +406,30 @@ panelmultiview[transitioning] > .panel-viewcontainer > .panel-viewstack > panelv #BMB_bookmarksPopup .subviewbutton { padding: var(--arrowpanel-menuitem-padding); } +} /** END Proton **/ + +@media not (-moz-proton-doorhangers) { +#BMB_bookmarksPopup::part(arrowscrollbox) { + padding: 0; +} + +/* Remove padding on xul:arrowscrollbox to avoid extra padding on footer */ +#BMB_bookmarksPopup menupopup::part(arrowscrollbox) { + padding-bottom: 0; +} + +#BMB_bookmarksPopup menupopup[nofooterpopup=true]::part(arrowscrollbox) { + padding-bottom: 4px; +} + +%ifndef XP_MACOSX +/* Add some space at the top because there are no headers in menupopups of + the bookmarks menu. */ +#BMB_bookmarksPopup menupopup::part(arrowscrollbox-scrollbox) { + padding-top: 4px; +} +%endif +} /** END not Proton **/ #confirmation-hint { --arrowpanel-background: #0060df; @@ -1817,6 +1842,13 @@ menuitem.panel-subview-footer@menuStateActive@, margin-inline-end: 3px; } +@media not (-moz-proton-doorhangers) { +#BMB_bookmarksPopup menupopup > .bookmarks-actions-menuseparator { + /* Hide bottom separator as the styled footer includes a top border serving the same purpose */ + display: none; +} +} /** END not Proton **/ + /* Disabled (empty) item is always alone and never has an icon, so fix its left padding */ #BMB_bookmarksPopup menupopup[emptyplacesresult] .bookmark-item.subviewbutton { padding-left: 6px; @@ -2460,8 +2492,13 @@ panelview:not([mainview]) #PanelUI-whatsNew-title { /* -10px to compensate for the margin on the container. We can't get rid of that because it helps position the background image. */ margin: 0 calc(-10px + var(--horizontal-padding)) var(--vertical-section-padding); +} + +@media (-moz-proton-doorhangers) { +#protections-popup-message .whatsNew-message-body { margin-inline: 6px; } +} #PanelUI-whatsNew .whatsNew-message-body.has-icon { display: grid; diff --git a/browser/themes/shared/downloads/downloads.inc.css b/browser/themes/shared/downloads/downloads.inc.css index 77bc04e6e6ca..c44fa85b076c 100644 --- a/browser/themes/shared/downloads/downloads.inc.css +++ b/browser/themes/shared/downloads/downloads.inc.css @@ -17,15 +17,24 @@ background: transparent; color: inherit; appearance: none; - margin: 0.31em 0 0.93em; + margin: 0; } #emptyDownloads { - padding: 1.5em 0.62em 2.1em; + padding: 16px 16px; margin: 0; pointer-events: none; } +@media (-moz-proton-doorhangers) { +#emptyDownloads { + padding: 1.5em 0.62em 2.1em; +} + +#downloadsListBox { + margin: 0.31em 0 0.93em; +} + @item@ { height: 3.1em; padding: 0.31em; @@ -123,6 +132,90 @@ button.downloadButton { height: 32px; border-radius: 4px; } +}/** END Proton **/ + +@media not (-moz-proton-doorhangers) { +@item@ { + height: var(--downloads-item-height); + border-bottom: 1px solid var(--panel-separator-color); +} + +.downloadTypeIcon { + margin: 8px 13px; +} + +.downloadsPanelFooterButton:hover { + outline: 1px solid var(--arrowpanel-dimmed); +} + +.downloadsPanelFooterButton:hover:active, +.downloadsPanelFooterButton[open="true"] { + outline: 1px solid var(--arrowpanel-dimmed-further); +} + +@itemFinished@[exists] .downloadMainArea:hover, +@item@:not([verdict]) > .downloadButton:hover, +@item@[verdict]:hover { + background-color: var(--arrowpanel-dimmed); +} + +@itemFinished@[exists] > .downloadMainArea:hover:active, +@item@:not([verdict]) > .downloadButton:hover:active, +@item@[verdict]:hover:active { + background-color: var(--arrowpanel-dimmed-further); +} + +@item@[verdict="Malware"]:hover, +@item@[verdict="Malware"]:hover:active { + background-color: #aa1b08; + color: white; +} + +.downloadBlockedBadgeNew { + display: none; +} + +#downloadsPanel-blockedSubview[verdict="Insecure"] >.panel-view-body-unscrollable, +#downloadsPanel-blockedSubview[verdict="Malware"] > .panel-view-body-unscrollable { + background-image: url("chrome://browser/skin/downloads/download-blocked.svg"); +} + +#downloadsPanel-blockedSubview > .panel-view-body-unscrollable { + background-position: 16px 16px; + background-size: 32px 32px; + background-repeat: no-repeat; +} + +#downloadsPanel-blockedSubview:-moz-locale-dir(rtl) { + background-position: calc(100% - 16px) 16px; +} + +#downloadsPanel-blockedSubview-details1, +#downloadsPanel-blockedSubview-details2, +#downloadsPanel-blockedSubview-title { + margin-inline: 64px 16px; +} + +#downloadsPanel-blockedSubview[verdict="PotentiallyUnwanted"] > .panel-view-body-unscrollable { + -moz-context-properties: fill; + fill: #ffbf00; + background-image: url("chrome://global/skin/icons/warning.svg"); +} + +#downloadsPanel-blockedSubview[verdict="Uncommon"] > .panel-view-body-unscrollable { + -moz-context-properties: fill; + fill: #00a1f2; + background-image: url("chrome://global/skin/icons/info-filled.svg"); +} + +.downloadsPanel-blockedSubview-image { + display: none; +} + +.downloadButton { + min-width: 58px; +} +}/** END not Proton **/ @notKeyfocus@ .downloadsPanelFooterButton:-moz-focusring { outline: none; @@ -135,6 +228,11 @@ button.downloadButton { padding-inline-end: 59px; } +@media not (-moz-proton-doorhangers) { +#downloadsHistory { + padding-inline: 14px; +} +} /** END not Proton **/ #downloadsSummary { -moz-user-focus: normal; } diff --git a/browser/themes/shared/notification-icons.inc.css b/browser/themes/shared/notification-icons.inc.css index 63810134df6a..f93db99f22bd 100644 --- a/browser/themes/shared/notification-icons.inc.css +++ b/browser/themes/shared/notification-icons.inc.css @@ -222,6 +222,7 @@ margin-inline-end: 0; } +@media (-moz-proton-doorhangers) { #webRTC-preview:not([hidden]) { min-width: 368px; min-height: 10em; @@ -263,6 +264,7 @@ margin-top: 0 !important; font-size: 0.75em; } +} /** END Proton **/ @media not (-moz-proton) { #notification-popup-box { @@ -272,6 +274,44 @@ } } /** END not Proton **/ +@media not (-moz-proton-doorhangers) { +#webRTC-preview:not([hidden]) { + border-radius: 4px; + border: 1px solid var(--panel-separator-color); + min-width: 300px; + min-height: 10em; + -moz-box-orient: vertical; +} + +#webRTC-previewVideo { + width: 300px; + /* If we don't set the min-width, width is ignored. */ + min-width: 300px; + min-height: 10em; + max-height: 200px; +} + +#webRTC-previewWarningBox { + background: rgba(255,217,99,.8) url("chrome://browser/skin/warning.svg") no-repeat .75em .75em; + color: #000; + -moz-context-properties: fill; + fill: currentColor; + margin: 0; + padding: .5em; + padding-inline-start: calc(1.5em + 16px); + border-top: 1px solid var(--panel-separator-color); +} + +.popup-subitem { + list-style-image: url("chrome://browser/skin/notification-icons/popup-subitem.svg"); + margin-inline-start: 42px; +} + +#permission-popup-menulist { + margin-inline-end: 2px; +} +} /** END not Proton **/ + #webRTC-previewWarningBox:-moz-locale-dir(rtl) { background-position: calc(100% - .75em) .75em; } @@ -460,6 +500,7 @@ %endif /* UPDATE */ +@media (-moz-proton-doorhangers) { .popup-notification-icon[popupid="update-available"], .popup-notification-icon[popupid="update-downloading"], .popup-notification-icon[popupid="update-manual"], @@ -475,3 +516,20 @@ -moz-context-properties: fill; fill: var(--panel-banner-item-warning-icon-bgcolor); } +} /** END Proton **/ + +@media not (-moz-proton-doorhangers) { +.popup-notification-icon[popupid="update-available"], +.popup-notification-icon[popupid="update-downloading"], +.popup-notification-icon[popupid="update-manual"], +.popup-notification-icon[popupid="update-other-instance"], +.popup-notification-icon[popupid="update-restart"] { + background: #74BF43 url(chrome://browser/skin/notification-icons/update.svg) no-repeat center; + border-radius: 50%; +} + +.popup-notification-icon[popupid="update-unsupported"] { + background: #FFE900 url(chrome://browser/skin/notification-icons/update.svg) no-repeat center; + border-radius: 50%; +} +} /** END not Proton **/ diff --git a/browser/themes/shared/places/editBookmarkPanel.inc.css b/browser/themes/shared/places/editBookmarkPanel.inc.css index 9a8200cc504e..337699fcc4f7 100644 --- a/browser/themes/shared/places/editBookmarkPanel.inc.css +++ b/browser/themes/shared/places/editBookmarkPanel.inc.css @@ -15,7 +15,6 @@ #editBookmarkPanelInfoArea { overflow: hidden; position: relative; - padding: 4px var(--arrowpanel-padding) 0; } #editBookmarkPanelRecommendation { @@ -163,10 +162,15 @@ html|img#editBookmarkPanelFavicon[src] { margin-inline: 16px; } +@media (-moz-proton-doorhangers) { #editBookmarkPanel { font: caption; } +#editBookmarkPanelInfoArea { + padding: 4px var(--arrowpanel-padding) 0; +} + #editBookmarkPanelRows > vbox:not(#editBMPanel_nameRow) { padding-block: var(--arrowpanel-padding) 0; } @@ -273,3 +277,30 @@ html|img#editBookmarkPanelFavicon[src] { #editBookmarkPanelRows > vbox > hbox > html|input:focus-visible { outline: 2px solid var(--focus-outline-color); } +} /** END Proton **/ + +@media not (-moz-proton-doorhangers) { +#editBookmarkPanelInfoArea { + margin: 6px 8px 0; +} + +#editBookmarkPanelBottomContent { + padding-top: 0; +} + +.editBookmarkPanelBottomButton { + flex: 1; +} + +.editBookmarkPanelBottomButton:not(:last-child) { + border-inline-end: 1px solid var(--panel-separator-color); +} + +#editBookmarkPanelImage { + margin: 0 2px; +} + +#editBookmarkSeparator { + display: none; +} +} /** END not Proton **/ diff --git a/browser/themes/windows/downloads/downloads.css b/browser/themes/windows/downloads/downloads.css index 870b57b78481..61a1cc83ef12 100644 --- a/browser/themes/windows/downloads/downloads.css +++ b/browser/themes/windows/downloads/downloads.css @@ -27,6 +27,15 @@ } @media (-moz-windows-default-theme) { + @media not (-moz-proton-doorhangers) { + @item@[verdict="Malware"]:not(:hover) { + color: #aa1b08; + } + + :root[lwt-popup-brighttext] @item@[verdict="Malware"]:not(:hover) { + color: #ff0039; + } + } /** END not Proton **/ /* Use unified color for the progressbar on default theme */ .downloadProgress::-moz-progress-bar { diff --git a/browser/themes/windows/places/editBookmark.css b/browser/themes/windows/places/editBookmark.css index 49b75b65e405..17965c7666e8 100644 --- a/browser/themes/windows/places/editBookmark.css +++ b/browser/themes/windows/places/editBookmark.css @@ -2,6 +2,12 @@ * 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/. */ +@media not (-moz-proton-doorhangers) { +#editBookmarkPanelRows > vbox { + margin-bottom: .5em; +} +} /** END not Proton **/ + /* Folder menulist */ #editBMPanel_folderMenuList::part(icon) { diff --git a/toolkit/themes/linux/global/popupnotification.css b/toolkit/themes/linux/global/popupnotification.css index 861300e2eac3..52a718e70055 100644 --- a/toolkit/themes/linux/global/popupnotification.css +++ b/toolkit/themes/linux/global/popupnotification.css @@ -4,3 +4,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ %endif %include ../../shared/popupnotification.inc.css + +@media not (-moz-proton-doorhangers) { +.popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) { + border-inline-start: 1px solid var(--panel-separator-color); +} +} /** END not Proton **/ diff --git a/toolkit/themes/osx/global/popupnotification.css b/toolkit/themes/osx/global/popupnotification.css index 861300e2eac3..52a718e70055 100644 --- a/toolkit/themes/osx/global/popupnotification.css +++ b/toolkit/themes/osx/global/popupnotification.css @@ -4,3 +4,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ %endif %include ../../shared/popupnotification.inc.css + +@media not (-moz-proton-doorhangers) { +.popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) { + border-inline-start: 1px solid var(--panel-separator-color); +} +} /** END not Proton **/ diff --git a/toolkit/themes/shared/global.inc.css b/toolkit/themes/shared/global.inc.css index 682cb2fa4b36..e7864da9598d 100644 --- a/toolkit/themes/shared/global.inc.css +++ b/toolkit/themes/shared/global.inc.css @@ -38,6 +38,12 @@ --panel-padding: var(--arrowpanel-padding); } +@media not (-moz-proton-doorhangers) { +:root { + --popup-notification-body-width: 25em; +} +} /** END not Proton **/ + /* Lightweight theme roots */ :root[lwtheme-image]:-moz-lwtheme-darktext { @@ -156,6 +162,59 @@ xul|label[disabled="true"] { --autoscroll-background-image: url("chrome://global/skin/icons/autoscroll-horizontal.svg"); } +/* Panel footers */ + +@media not (-moz-proton-doorhangers) { +.panel-footer { + background-color: var(--arrowpanel-dimmed); +} + +.panel-footer > xul|button { + appearance: none; + border-top: 1px solid var(--panel-separator-color); + color: inherit; + min-width: 0; + margin: 0; + padding: .9em 2px; +} + +.panel-footer > xul|button[disabled] { + color: var(--panel-disabled-color) !important; +} + +.panel-footer > xul|button:-moz-focusring { + outline: 1px dotted; + outline-offset: -3px; +} + +.panel-footer > xul|button:not([disabled]):hover { + background-color: var(--arrowpanel-dimmed); +} + +.panel-footer > xul|button:not([disabled]):hover:active, +.panel-footer > xul|button:not([disabled])[open] { + background-color: var(--arrowpanel-dimmed-further); + box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset; +} + +.panel-footer > xul|button:not([disabled])[default] { + color: white !important; + background-color: #0060df; +} + +.panel-footer > xul|button:not([disabled])[default]:hover { + background-color: #003eaa; +} + +.panel-footer > xul|button:not([disabled])[default]:hover:active { + background-color: #002275; +} + +.panel-footer > xul|button > .button-box { + padding: 0; +} +} /** END not Proton **/ + /* Combobox dropdown renderer */ #ContentSelectDropdown > menupopup { /* The menupopup itself should always be rendered LTR to ensure the scrollbar aligns with diff --git a/toolkit/themes/shared/popupnotification.inc.css b/toolkit/themes/shared/popupnotification.inc.css index e2f7ff92b3e7..2d5cf5d88dd0 100644 --- a/toolkit/themes/shared/popupnotification.inc.css +++ b/toolkit/themes/shared/popupnotification.inc.css @@ -77,6 +77,17 @@ flex: 1; } +@media not (-moz-proton-doorhangers) { +.popup-notification-dropmarker { + flex: none; + padding: 0 15px !important; +} + +.popup-notification-learnmore-link { + margin-top: .5em !important; +} +} /** END not Proton **/ + .popup-notification-dropmarker > .button-box > hbox { display: none; } @@ -102,6 +113,7 @@ } /** PopupNotifications **/ +@media (-moz-proton-doorhangers) { popupnotification { font: caption; } @@ -251,3 +263,4 @@ popupnotification { text-decoration: underline; margin-block: 0 8px; } +} /*** END proton ***/ diff --git a/toolkit/themes/windows/global/popupnotification.css b/toolkit/themes/windows/global/popupnotification.css index e75feaa33bdf..2855401fd56f 100644 --- a/toolkit/themes/windows/global/popupnotification.css +++ b/toolkit/themes/windows/global/popupnotification.css @@ -16,3 +16,9 @@ .popup-notification-primary-button { order: -1; } + +@media not (-moz-proton-doorhangers) { +.popup-notification-secondary-button:not([hidden="true"]) ~ .popup-notification-primary-button:not([default]) { + border-inline-end: 1px solid var(--panel-separator-color); +} +} /** END not Proton **/