diff --git a/browser/base/content/test/general/browser_addCertException.js b/browser/base/content/test/general/browser_addCertException.js index 16c27ab72659..958901be870a 100644 --- a/browser/base/content/test/general/browser_addCertException.js +++ b/browser/base/content/test/general/browser_addCertException.js @@ -53,17 +53,17 @@ add_task(async function() { .getPropertyValue("background-image"); is( identityIconImage, - 'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")', + 'url("chrome://global/skin/icons/security-warning.svg")', "Using expected icon image in the identity block" ); is( securityViewBG, - 'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")', + 'url("chrome://global/skin/icons/security-warning.svg")', "Using expected icon image in the Control Center main view" ); is( securityContentBG, - 'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")', + 'url("chrome://global/skin/icons/security-warning.svg")', "Using expected icon image in the Control Center subview" ); diff --git a/browser/base/content/test/siteIdentity/browser_check_identity_state.js b/browser/base/content/test/siteIdentity/browser_check_identity_state.js index 39c8614608c2..78c733e313d9 100644 --- a/browser/base/content/test/siteIdentity/browser_check_identity_state.js +++ b/browser/base/content/test/siteIdentity/browser_check_identity_state.js @@ -544,7 +544,7 @@ add_task(async function noCertErrorSecurityConnectionBGTest() { is( getSecurityConnectionBG(), - `url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")`, + `url("chrome://global/skin/icons/security-warning.svg")`, "Security connection should show a warning lock icon." ); diff --git a/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js b/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js index e5eb5fbdc800..e219d0b05df2 100644 --- a/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js +++ b/browser/base/content/test/siteIdentity/browser_identityIcon_img_url.js @@ -20,12 +20,12 @@ const TEST_CASES = [ { type: "http", testURL: "http://example.com", - img_url: `url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")`, + img_url: `url("chrome://global/skin/icons/security-broken.svg")`, }, { type: "https", testURL: "https://example.com", - img_url: `url("chrome://browser/skin/connection-secure.svg")`, + img_url: `url("chrome://global/skin/icons/security.svg")`, }, { type: "non-chrome about page", @@ -54,17 +54,17 @@ const TEST_CASES = [ { type: "mixedPassiveContent", testURL: kBaseURI + "file_mixedPassiveContent.html", - img_url: `url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")`, + img_url: `url("chrome://global/skin/icons/security-warning.svg")`, }, { type: "mixedActiveContent", testURL: kBaseURI + "file_csp_block_all_mixedcontent.html", - img_url: `url("chrome://browser/skin/connection-secure.svg")`, + img_url: `url("chrome://global/skin/icons/security.svg")`, }, { type: "certificateError", testURL: "https://self-signed.example.com", - img_url: `url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")`, + img_url: `url("chrome://global/skin/icons/security-warning.svg")`, }, { type: "localhost", @@ -79,17 +79,17 @@ const TEST_CASES = [ { type: "data URI", testURL: "data:text/html,
", - img_url: `url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")`, + img_url: `url("chrome://global/skin/icons/security-broken.svg")`, }, { type: "view-source HTTP", testURL: "view-source:http://example.com/", - img_url: `url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")`, + img_url: `url("chrome://global/skin/icons/security-broken.svg")`, }, { type: "view-source HTTPS", testURL: "view-source:https://example.com/", - img_url: `url("chrome://browser/skin/connection-secure.svg")`, + img_url: `url("chrome://global/skin/icons/security.svg")`, }, ]; diff --git a/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js b/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js index 6d681b462137..514d7eb45f57 100644 --- a/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js +++ b/browser/base/content/test/siteIdentity/browser_mixed_content_cert_override.js @@ -43,13 +43,13 @@ add_task(async function() { // check that a warning is shown when loading a page with mixed content and an overridden certificate await loadBadCertPage(MIXED_CONTENT_URL); - checkIdentityPopup("connection-mixed-passive-loaded.svg"); + checkIdentityPopup("security-warning.svg"); // check that the crossed out icon is shown when disabling mixed content protection gIdentityHandler.disableMixedContentProtection(); await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser); - checkIdentityPopup("connection-mixed-active-loaded.svg"); + checkIdentityPopup("security-broken.svg"); // check that a warning is shown even without mixed content BrowserTestUtils.loadURI( @@ -57,7 +57,7 @@ add_task(async function() { "https://self-signed.example.com" ); await BrowserTestUtils.browserLoaded(gBrowser.selectedBrowser); - checkIdentityPopup("connection-mixed-passive-loaded.svg"); + checkIdentityPopup("security-warning.svg"); // remove cert exception let certOverrideService = Cc[ diff --git a/browser/base/content/test/siteIdentity/head.js b/browser/base/content/test/siteIdentity/head.js index 636ae63b8a2c..616e7ca6fa1d 100644 --- a/browser/base/content/test/siteIdentity/head.js +++ b/browser/base/content/test/siteIdentity/head.js @@ -221,28 +221,28 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) { if (activeLoaded) { is( identityIconImage, - 'url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")', + 'url("chrome://global/skin/icons/security-broken.svg")', "Using active loaded icon" ); } if (activeBlocked && !passiveLoaded) { is( identityIconImage, - 'url("chrome://browser/skin/connection-secure.svg")', + 'url("chrome://global/skin/icons/security.svg")', "Using active blocked icon" ); } if (passiveLoaded && !(activeLoaded || activeBlocked)) { is( identityIconImage, - 'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")', + 'url("chrome://global/skin/icons/security-warning.svg")', "Using passive loaded icon" ); } if (passiveLoaded && activeBlocked) { is( identityIconImage, - 'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")', + 'url("chrome://global/skin/icons/security-warning.svg")', "Using active blocked and passive loaded icon" ); } @@ -317,12 +317,12 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) { if (stateInsecure) { is( securityViewBG, - 'url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")', + 'url("chrome://global/skin/icons/security-broken.svg")', "CC using 'not secure' icon" ); is( securityContentBG, - 'url("chrome://global/skin/icons/connection-mixed-active-loaded.svg")', + 'url("chrome://global/skin/icons/security-broken.svg")', "CC using 'not secure' icon" ); } @@ -330,12 +330,12 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) { if (stateSecure) { is( securityViewBG, - 'url("chrome://browser/skin/connection-secure.svg")', + 'url("chrome://global/skin/icons/security.svg")', "CC using secure icon" ); is( securityContentBG, - 'url("chrome://browser/skin/connection-secure.svg")', + 'url("chrome://global/skin/icons/security.svg")', "CC using secure icon" ); } @@ -355,24 +355,24 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) { } else if (activeBlocked || passiveLoaded) { is( securityViewBG, - 'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")', + 'url("chrome://global/skin/icons/security-warning.svg")', "CC using degraded icon" ); is( securityContentBG, - 'url("chrome://global/skin/icons/connection-mixed-passive-loaded.svg")', + 'url("chrome://global/skin/icons/security-warning.svg")', "CC using degraded icon" ); } else { // There is a case here with weak ciphers, but no bc tests are handling this yet. is( securityViewBG, - 'url("chrome://browser/skin/connection-secure.svg")', + 'url("chrome://global/skin/icons/security.svg")', "CC using degraded icon" ); is( securityContentBG, - 'url("chrome://browser/skin/connection-secure.svg")', + 'url("chrome://global/skin/icons/security.svg")', "CC using degraded icon" ); } diff --git a/browser/components/newtab/lib/CFRMessageProvider.jsm b/browser/components/newtab/lib/CFRMessageProvider.jsm index fca36adbf9fa..8668ff2e2ee3 100644 --- a/browser/components/newtab/lib/CFRMessageProvider.jsm +++ b/browser/components/newtab/lib/CFRMessageProvider.jsm @@ -557,7 +557,7 @@ const CFR_MESSAGES = [ anchor_id: "PanelUI-menu-button", layout: "icon_and_message", text: { string_id: "cfr-doorhanger-doh-body" }, - icon: "chrome://browser/skin/connection-secure.svg", + icon: "chrome://global/skin/icons/security.svg", buttons: { secondary: [ { diff --git a/browser/components/payments/res/paymentRequest.css b/browser/components/payments/res/paymentRequest.css index ef03c745ae97..3a7eea63dd92 100644 --- a/browser/components/payments/res/paymentRequest.css +++ b/browser/components/payments/res/paymentRequest.css @@ -152,7 +152,7 @@ payment-dialog[complete-status="processing"] #pay { payment-dialog #pay::before { -moz-context-properties: fill; - content: url(chrome://browser/skin/connection-secure.svg); + content: url(chrome://global/skin/icons/security.svg); fill: currentColor; height: 16px; margin-inline-end: 0.5em; diff --git a/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css b/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css index babc974bea5a..a9acfe7fb2c4 100644 --- a/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css +++ b/browser/extensions/formautofill/skin/shared/autocomplete-item-shared.css @@ -182,7 +182,7 @@ xul|richlistitem[originaltype="autofill-insecureWarning"] { content: ""; width: 16px; height: 16px; - background-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg); + background-image: url(chrome://global/skin/icons/security-broken.svg); -moz-context-properties: fill; fill: GrayText; } diff --git a/browser/themes/shared/autocomplete.inc.css b/browser/themes/shared/autocomplete.inc.css index 1b487d90ce80..89d6cf4cda46 100644 --- a/browser/themes/shared/autocomplete.inc.css +++ b/browser/themes/shared/autocomplete.inc.css @@ -164,7 +164,7 @@ } #PopupAutoComplete > richlistbox > richlistitem[originaltype="insecureWarning"] > .ac-site-icon { - list-style-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg); + list-style-image: url(chrome://global/skin/icons/security-broken.svg); -moz-context-properties: fill; fill: var(--grey-60); } diff --git a/browser/themes/shared/controlcenter/panel.inc.css b/browser/themes/shared/controlcenter/panel.inc.css index e69c549b336e..77d26cf6c43d 100644 --- a/browser/themes/shared/controlcenter/panel.inc.css +++ b/browser/themes/shared/controlcenter/panel.inc.css @@ -370,7 +370,7 @@ } .identity-popup-security-connection { - background-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg); + background-image: url(chrome://global/skin/icons/security-broken.svg); } #identity-popup[connection=chrome] .identity-popup-security-connection { @@ -382,7 +382,7 @@ } #identity-popup[connection^=secure] .identity-popup-security-connection { - background-image: url(chrome://browser/skin/connection-secure.svg); + background-image: url(chrome://global/skin/icons/security.svg); -moz-context-properties: fill; } @@ -398,13 +398,13 @@ /* Use [isbroken] to make sure we don't show a warning lock on an http page. See Bug 1192162. */ #identity-popup[ciphers=weak] .identity-popup-security-connection, #identity-popup[mixedcontent~=passive-loaded][isbroken] .identity-popup-security-connection { - background-image: url(chrome://global/skin/icons/connection-mixed-passive-loaded.svg); + background-image: url(chrome://global/skin/icons/security-warning.svg); -moz-context-properties: fill, fill-opacity; } #identity-popup[connection=secure-cert-user-overridden] .identity-popup-security-connection, #identity-popup[connection=cert-error-page] .identity-popup-security-connection { - background-image: url(chrome://global/skin/icons/connection-mixed-passive-loaded.svg); + background-image: url(chrome://global/skin/icons/security-warning.svg); fill: unset; -moz-context-properties: fill; } diff --git a/browser/themes/shared/fullscreen/warning.inc.css b/browser/themes/shared/fullscreen/warning.inc.css index 5f5940e70e81..f21818852563 100644 --- a/browser/themes/shared/fullscreen/warning.inc.css +++ b/browser/themes/shared/fullscreen/warning.inc.css @@ -7,31 +7,36 @@ html|*.pointerlockfswarning { align-items: center; background: rgba(45, 62, 72, 0.9); - border: 2px solid #fafafa; + border: 2px solid currentColor; box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.5); border-radius: 8px; + color: #fafafa; padding: 24px 16px; font: message-box; } -html|*.pointerlockfswarning::before { +html|*.pointerlockfswarning:is([data-identity="verifiedDomain"], [data-identity="unknownIdentity"])::before { + content: ""; + background-size: cover; margin: 0; - width: 24px; height: 24px; + width: 24px; + height: 24px; + -moz-context-properties: fill; + fill: currentColor; } html|*.pointerlockfswarning[data-identity="verifiedDomain"]::before { - content: url("chrome://browser/skin/fullscreen/secure.svg"); + background-image: url("chrome://global/skin/icons/security.svg"); } html|*.pointerlockfswarning[data-identity="unknownIdentity"]::before { - content: url("chrome://browser/skin/fullscreen/insecure.svg"); + background-image: url("chrome://global/skin/icons/security-broken.svg"); } html|*.pointerlockfswarning-domain-text, html|*.pointerlockfswarning-generic-text { font-size: 21px; font-weight: lighter; - color: #fafafa; margin: 0 16px; } diff --git a/browser/themes/shared/identity-block/identity-block.inc.css b/browser/themes/shared/identity-block/identity-block.inc.css index a7633e52f40c..1f0b4222492c 100644 --- a/browser/themes/shared/identity-block/identity-block.inc.css +++ b/browser/themes/shared/identity-block/identity-block.inc.css @@ -238,7 +238,7 @@ #identity-box[pageproxystate="valid"].verifiedDomain #identity-icon, #identity-box[pageproxystate="valid"].mixedActiveBlocked #identity-icon { - list-style-image: url(chrome://browser/skin/connection-secure.svg); + list-style-image: url(chrome://global/skin/icons/security.svg); } #identity-box[pageproxystate="valid"].verifiedDomain #identity-icon:not([lock-icon-gray]), @@ -252,7 +252,7 @@ #identity-box[pageproxystate="valid"].mixedDisplayContentLoadedActiveBlocked #identity-icon, #identity-box[pageproxystate="valid"].certUserOverridden #identity-icon, #identity-box[pageproxystate="valid"].certErrorPage #identity-icon { - list-style-image: url(chrome://global/skin/icons/connection-mixed-passive-loaded.svg); + list-style-image: url(chrome://global/skin/icons/security-warning.svg); fill: unset; } @@ -260,7 +260,7 @@ #identity-box[pageproxystate="valid"].notSecure #identity-icon, #identity-box[pageproxystate="valid"].mixedActiveContent #identity-icon, #identity-box[pageproxystate="valid"].httpsOnlyErrorPage #identity-icon { - list-style-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg); + list-style-image: url(chrome://global/skin/icons/security-broken.svg); } #permissions-granted-icon { diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn index 3679b1f553a4..8868f817f043 100644 --- a/browser/themes/shared/jar.inc.mn +++ b/browser/themes/shared/jar.inc.mn @@ -51,10 +51,7 @@ skin/classic/browser/downloads/download-icons.svg (../shared/downloads/download-icons.svg) skin/classic/browser/downloads/notification-start-animation.svg (../shared/downloads/notification-start-animation.svg) skin/classic/browser/drm-icon.svg (../shared/drm-icon.svg) - skin/classic/browser/fullscreen/insecure.svg (../shared/fullscreen/insecure.svg) - skin/classic/browser/fullscreen/secure.svg (../shared/fullscreen/secure.svg) skin/classic/browser/permissions.svg (../shared/identity-block/permissions.svg) - skin/classic/browser/connection-secure.svg (../shared/identity-block/connection-secure.svg) skin/classic/browser/newInstall.css (../shared/newInstall.css) skin/classic/browser/newInstallPage.css (../shared/newInstallPage.css) skin/classic/browser/illustrations/blue-berror.svg (../shared/illustrations/blue-berror.svg) @@ -111,6 +108,7 @@ skin/classic/browser/preferences/android-menu.svg (../shared/preferences/android-menu.svg) skin/classic/browser/preferences/category-experiments.svg (../shared/preferences/category-experiments.svg) skin/classic/browser/preferences/category-general.svg (../shared/preferences/category-general.svg) + skin/classic/browser/preferences/category-privacy-security.svg (../shared/preferences/category-privacy-security.svg) skin/classic/browser/preferences/category-search.svg (../shared/preferences/category-search.svg) skin/classic/browser/preferences/category-sync.svg (../shared/preferences/category-sync.svg) skin/classic/browser/preferences/critters-postcard.jpg (../shared/preferences/critters-postcard.jpg) diff --git a/browser/themes/shared/places/places-tooltip.inc.css b/browser/themes/shared/places/places-tooltip.inc.css index dd2f7f1ae02a..29a19c703319 100644 --- a/browser/themes/shared/places/places-tooltip.inc.css +++ b/browser/themes/shared/places/places-tooltip.inc.css @@ -43,7 +43,7 @@ #places-tooltip-insecure-icon { /* Using the same broken-lock icon as the main identity-block styles. */ - list-style-image: url(chrome://global/skin/icons/connection-mixed-active-loaded.svg); + list-style-image: url(chrome://global/skin/icons/security-broken.svg); -moz-context-properties: fill; fill: currentColor; width: 1em; diff --git a/toolkit/themes/shared/icons/privacy-security.svg b/browser/themes/shared/preferences/category-privacy-security.svg similarity index 100% rename from toolkit/themes/shared/icons/privacy-security.svg rename to browser/themes/shared/preferences/category-privacy-security.svg diff --git a/browser/themes/shared/preferences/preferences.inc.css b/browser/themes/shared/preferences/preferences.inc.css index e30fc00ac36c..6eb13c8b1881 100644 --- a/browser/themes/shared/preferences/preferences.inc.css +++ b/browser/themes/shared/preferences/preferences.inc.css @@ -199,7 +199,7 @@ button > hbox > label { } #category-privacy > .category-icon { - list-style-image: url("chrome://global/skin/icons/privacy-security.svg"); + list-style-image: url("chrome://browser/skin/preferences/category-privacy-security.svg"); } #category-sync > .category-icon { diff --git a/toolkit/components/aboutconfig/content/aboutconfig.css b/toolkit/components/aboutconfig/content/aboutconfig.css index 0a00c8bbe78f..b2ad688aefa3 100644 --- a/toolkit/components/aboutconfig/content/aboutconfig.css +++ b/toolkit/components/aboutconfig/content/aboutconfig.css @@ -119,7 +119,7 @@ #prefs > tr.locked { opacity: 0.4; - background-image: url("chrome://global/skin/icons/privacy-security.svg"); + background-image: url("chrome://global/skin/icons/security.svg"); background-repeat: no-repeat; background-position: 9px center; background-size: 16px 16px; diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index c6679a2a97a3..858eada057b2 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -1203,8 +1203,7 @@ var snapshotFormatters = { const iconUp = "chrome://global/skin/icons/arrow-up-12.svg"; const iconDown = "chrome://global/skin/icons/arrow-dropdown-12.svg"; const iconFolder = "chrome://global/skin/icons/folder.svg"; - const iconUnsigned = - "chrome://global/skin/icons/connection-mixed-active-loaded.svg"; + const iconUnsigned = "chrome://global/skin/icons/security-broken.svg"; const outerTHead = $("third-party-modules-thead"); const outerTBody = $("third-party-modules-tbody"); diff --git a/toolkit/themes/shared/icons/connection-mixed-active-loaded.svg b/toolkit/themes/shared/icons/security-broken.svg similarity index 100% rename from toolkit/themes/shared/icons/connection-mixed-active-loaded.svg rename to toolkit/themes/shared/icons/security-broken.svg diff --git a/toolkit/themes/shared/icons/connection-mixed-passive-loaded.svg b/toolkit/themes/shared/icons/security-warning.svg similarity index 100% rename from toolkit/themes/shared/icons/connection-mixed-passive-loaded.svg rename to toolkit/themes/shared/icons/security-warning.svg diff --git a/browser/themes/shared/identity-block/connection-secure.svg b/toolkit/themes/shared/icons/security.svg similarity index 100% rename from browser/themes/shared/identity-block/connection-secure.svg rename to toolkit/themes/shared/icons/security.svg diff --git a/toolkit/themes/shared/jar.inc.mn b/toolkit/themes/shared/jar.inc.mn index 8d5073a74505..451e635f0c22 100644 --- a/toolkit/themes/shared/jar.inc.mn +++ b/toolkit/themes/shared/jar.inc.mn @@ -38,8 +38,6 @@ toolkit.jar: skin/classic/global/icons/check-partial.svg (../../shared/icons/check-partial.svg) skin/classic/global/icons/chevron.svg (../../shared/icons/chevron.svg) skin/classic/global/icons/close.svg (../../shared/icons/close.svg) - skin/classic/global/icons/connection-mixed-active-loaded.svg (../../shared/icons/connection-mixed-active-loaded.svg) - skin/classic/global/icons/connection-mixed-passive-loaded.svg (../../shared/icons/connection-mixed-passive-loaded.svg) skin/classic/global/icons/searchfield-cancel.svg (../../shared/icons/searchfield-cancel.svg) skin/classic/global/icons/columnpicker.svg (../../shared/icons/columnpicker.svg) skin/classic/global/icons/critical.svg (../../shared/icons/critical.svg) @@ -63,13 +61,15 @@ toolkit.jar: skin/classic/global/icons/open-in-new.svg (../../shared/icons/open-in-new.svg) skin/classic/global/icons/performance.svg (../../shared/icons/performance.svg) skin/classic/global/icons/print.svg (../../shared/icons/print.svg) - skin/classic/global/icons/privacy-security.svg (../../shared/icons/privacy-security.svg) skin/classic/global/icons/undo.svg (../../shared/icons/undo.svg) skin/classic/global/pictureinpicture/pause.svg (../../shared/pictureinpicture/pause.svg) skin/classic/global/pictureinpicture/play.svg (../../shared/pictureinpicture/play.svg) skin/classic/global/icons/radio.svg (../../shared/icons/radio.svg) skin/classic/global/icons/resizer.svg (../../shared/icons/resizer.svg) skin/classic/global/icons/search-glass.svg (../../shared/icons/search-glass.svg) + skin/classic/global/icons/security.svg (../../shared/icons/security.svg) + skin/classic/global/icons/security-broken.svg (../../shared/icons/security-broken.svg) + skin/classic/global/icons/security-warning.svg (../../shared/icons/security-warning.svg) skin/classic/global/icons/settings.svg (../../shared/icons/settings.svg) skin/classic/global/icons/shortcut.svg (../../shared/icons/shortcut.svg) skin/classic/global/icons/sort-arrow.svg (../../shared/icons/sort-arrow.svg)