Bug 1568819 - Update identity popup styles for Skyline. r=johannh

Differential Revision: https://phabricator.services.mozilla.com/D40025

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Paul Zuehlcke 2019-08-05 16:37:35 +00:00
Родитель 533d800d89
Коммит 1a5fdde435
14 изменённых файлов: 200 добавлений и 262 удалений

Просмотреть файл

@ -159,10 +159,10 @@ var gIdentityHandler = {
"identity-popup-mainView-panel-header-span"
));
},
get _identityPopupContentHost() {
delete this._identityPopupContentHost;
return (this._identityPopupContentHost = document.getElementById(
"identity-popup-host"
get _identityPopupSecurityEVContentOwner() {
delete this._identityPopupSecurityEVContentOwner;
return (this._identityPopupSecurityEVContentOwner = document.getElementById(
"identity-popup-security-ev-content-owner"
));
},
get _identityPopupContentOwner() {
@ -999,10 +999,15 @@ var gIdentityHandler = {
// Push the appropriate strings out to the UI.
this._identityPopupMainViewHeaderLabel.textContent = gNavigatorBundle.getFormattedString(
"identity.headerWithHost",
"identity.headerMainWithHost",
[host]
);
this._identityPopupContentHost.textContent = host;
this._identityPopupSecurityEVContentOwner.textContent = gNavigatorBundle.getFormattedString(
"identity.ev.contentOwner",
[owner]
);
this._identityPopupContentOwner.textContent = owner;
this._identityPopupContentSupp.textContent = supplemental;
this._identityPopupContentVerif.textContent = verifier;

Просмотреть файл

@ -39,14 +39,14 @@ add_task(async function() {
.getComputedStyle(
document
.getElementById("identity-popup-securityView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
let securityContentBG = gBrowser.ownerGlobal
.getComputedStyle(
document
.getElementById("identity-popup-mainView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
is(

Просмотреть файл

@ -142,12 +142,4 @@ async function runTest(i, forward) {
.querySelector("#identity-popup-security-expander")
.click();
await promiseViewShown;
displayedHost = currentTest.effectiveHost || currentTest.location;
ok(
gIdentityHandler._identityPopupContentHost.textContent.includes(
displayedHost
),
"security subview header shows the host for test " + testDesc
);
}

Просмотреть файл

@ -87,14 +87,14 @@ add_task(async function test_simple() {
.getComputedStyle(
document
.getElementById("identity-popup-securityView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
let securityContentBG = gBrowser.ownerGlobal
.getComputedStyle(
document
.getElementById("identity-popup-mainView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
is(
@ -255,14 +255,14 @@ add_task(async function test_ignoring_window_opener() {
.getComputedStyle(
document
.getElementById("identity-popup-securityView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
let securityContentBG = gBrowser.ownerGlobal
.getComputedStyle(
document
.getElementById("identity-popup-mainView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
is(
@ -272,12 +272,12 @@ add_task(async function test_ignoring_window_opener() {
);
is(
securityViewBG,
'url("chrome://browser/skin/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-secure.svg")',
"Using expected icon image in the Control Center main view"
);
is(
securityContentBG,
'url("chrome://browser/skin/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-secure.svg")',
"Using expected icon image in the Control Center subview"
);

Просмотреть файл

@ -292,26 +292,26 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) {
.getComputedStyle(
document
.getElementById("identity-popup-securityView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
let securityContentBG = tabbrowser.ownerGlobal
.getComputedStyle(
document
.getElementById("identity-popup-mainView")
.getElementsByClassName("identity-popup-security-content")[0]
.getElementsByClassName("identity-popup-security-connection")[0]
)
.getPropertyValue("background-image");
if (stateInsecure) {
is(
securityViewBG,
'url("chrome://browser/skin/controlcenter/conn-not-secure.svg")',
'url("chrome://browser/skin/connection-mixed-active-loaded.svg")',
"CC using 'not secure' icon"
);
is(
securityContentBG,
'url("chrome://browser/skin/controlcenter/conn-not-secure.svg")',
'url("chrome://browser/skin/connection-mixed-active-loaded.svg")',
"CC using 'not secure' icon"
);
}
@ -319,12 +319,12 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) {
if (stateSecure) {
is(
securityViewBG,
'url("chrome://browser/skin/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-secure.svg")',
"CC using secure icon"
);
is(
securityContentBG,
'url("chrome://browser/skin/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-secure.svg")',
"CC using secure icon"
);
}
@ -344,24 +344,24 @@ async function assertMixedContentBlockingState(tabbrowser, states = {}) {
} else if (activeBlocked || passiveLoaded) {
is(
securityViewBG,
'url("chrome://browser/skin/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-mixed-passive-loaded.svg")',
"CC using degraded icon"
);
is(
securityContentBG,
'url("chrome://browser/skin/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-mixed-passive-loaded.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/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-secure.svg")',
"CC using degraded icon"
);
is(
securityContentBG,
'url("chrome://browser/skin/controlcenter/connection.svg")',
'url("chrome://browser/skin/connection-secure.svg")',
"CC using degraded icon"
);
}

Просмотреть файл

@ -51,41 +51,6 @@ add_task(async function setup() {
});
});
// Tests that pressing the permissions preferences icon in the identity popup
// links to about:preferences
add_task(async function testOpenPreferencesFromPermissionsPrefsButton() {
await BrowserTestUtils.withNewTab("https://example.com", async function() {
await openIdentityPopup();
let preferencesButton = document.getElementById(
"identity-popup-permission-preferences-button"
);
ok(
BrowserTestUtils.is_visible(preferencesButton),
"The preferences button is shown."
);
Services.telemetry.clearEvents();
let shown = waitAndAssertPreferencesShown("permissions", true);
preferencesButton.click();
await shown;
let events = Services.telemetry.snapshotEvents(
Ci.nsITelemetry.DATASET_PRERELEASE_CHANNELS,
true
).parent;
let clickEvents = events.filter(
e =>
e[1] == "security.ui.identitypopup" &&
e[2] == "click" &&
e[3] == "permission_prefs_btn"
);
is(clickEvents.length, 1, "recorded telemetry for the click");
});
});
// Tests that pressing the preferences button in the trackers subview
// links to about:preferences
add_task(async function testOpenPreferencesFromTrackersSubview() {

Просмотреть файл

@ -25,29 +25,33 @@
<!-- Security Section -->
<hbox id="identity-popup-security" class="identity-popup-section">
<vbox class="identity-popup-security-content" flex="1">
<label class="plain">
<label class="identity-popup-headline">&identity.connection;</label>
</label>
<description class="identity-popup-connection-not-secure"
when-connection="not-secure secure-cert-user-overridden secure-custom-root">&identity.connectionNotSecure;</description>
<description class="identity-popup-connection-secure"
when-connection="secure secure-ev">&identity.connectionSecure;</description>
<description when-connection="chrome">&identity.connectionInternal;</description>
<description when-connection="file">&identity.connectionFile;</description>
<description when-connection="extension">&identity.extensionPage;</description>
<vbox id="identity-popup-security-descriptions">
<description class="identity-popup-warning-gray"
<vbox class="identity-popup-security-connection">
<description class="identity-popup-connection-not-secure"
when-connection="not-secure secure-cert-user-overridden secure-custom-root">&identity.connectionNotSecure;</description>
<description class="identity-popup-connection-secure"
when-connection="secure secure-ev">&identity.connectionSecure2;</description>
<description when-connection="chrome">&identity.connectionInternal;</description>
<description when-connection="file">&identity.connectionFile;</description>
<description when-connection="extension">&identity.extensionPage;</description>
</vbox>
<vbox id="identity-popup-security-description">
<description id="identity-popup-security-ev-content-owner"
when-connection="secure-ev"/>
<description class="identity-popup-warning-box identity-popup-warning-gray"
when-mixedcontent="active-blocked">&identity.activeBlocked;</description>
<description id="identity-popup-security-decription-custom-root"
class="identity-popup-warning-gray"
<description id="identity-popup-security-decription-custom-root"
class="identity-popup-warning-box identity-popup-warning-gray"
when-customroot="true">&identity.customRoot;</description>
<description class="identity-popup-warning-yellow"
<description class="identity-popup-warning-box identity-popup-warning-yellow"
when-mixedcontent="passive-loaded">&identity.passiveLoaded;</description>
<description when-mixedcontent="active-loaded">&identity.activeLoaded;</description>
<description class="identity-popup-warning-yellow"
<description class="identity-popup-warning-box identity-popup-warning-yellow"
when-mixedcontent="active-loaded">&identity.activeLoaded;</description>
<description class="identity-popup-warning-box identity-popup-warning-yellow"
when-ciphers="weak">&identity.weakEncryption;</description>
<description when-loginforms="insecure">&identity.insecureLoginForms2;</description>
<description class="identity-popup-warning-box identity-popup-warning-yellow"
when-loginforms="insecure">&identity.insecureLoginForms2;</description>
</vbox>
</vbox>
<button id="identity-popup-security-expander"
@ -63,13 +67,8 @@
aria-labelledby="identity-popup-permissions-headline">
<hbox>
<label id="identity-popup-permissions-headline"
class="identity-popup-headline"
flex="1"
value="&identity.permissions;"/>
<toolbarbutton id="identity-popup-permission-preferences-button"
class="identity-popup-preferences-button subviewbutton"
tooltiptext="&identity.permissionsPreferences.tooltip;"
oncommand="gIdentityHandler.openPermissionPreferences(); gIdentityHandler.recordClick('permission_prefs_btn');" />
value="&identity.permissions2;"/>
</hbox>
<vbox id="identity-popup-permission-list"/>
<description id="identity-popup-permission-reload-hint">&identity.permissionsReloadHint;</description>
@ -89,22 +88,21 @@
<!-- Security SubView -->
<panelview id="identity-popup-securityView"
title="&identity.securityView.label;"
title="&identity.securityView.label2;"
descriptionheightworkaround="true">
<vbox class="identity-popup-security-content">
<label class="plain">
<label class="identity-popup-headline" id="identity-popup-host"></label>
</label>
<description class="identity-popup-connection-not-secure"
when-connection="not-secure secure-cert-user-overridden">&identity.connectionNotSecure;</description>
<description class="identity-popup-connection-secure"
when-connection="secure secure-ev">&identity.connectionSecure;</description>
<vbox class="identity-popup-security-connection">
<description class="identity-popup-connection-not-secure"
when-connection="not-secure secure-cert-user-overridden">&identity.connectionNotSecureSecurityView;</description>
<description class="identity-popup-connection-secure"
when-connection="secure secure-ev">&identity.connectionVerified3;</description>
</vbox>
</vbox>
<vbox id="identity-popup-securityView-body" class="panel-view-body-unscrollable">
<!-- (EV) Certificate Information -->
<description id="identity-popup-content-verified-by"
when-connection="secure-ev">&identity.connectionVerified2;</description>
<description id="identity-popup-content-owner-label"
when-connection="secure-ev">&identity.evOwnerLabel;</description>
<description id="identity-popup-content-owner"
when-connection="secure-ev"
class="header"/>
@ -113,7 +111,7 @@
<description id="identity-popup-content-verifier"
when-connection="secure secure-ev secure-cert-user-overridden"/>
<description id="identity-popup-content-verifier-unknown"
class="identity-popup-warning-gray"
class="identity-popup-warning-box identity-popup-warning-gray"
when-customroot="true">&identity.description.customRoot; <label id="identity-popup-custom-root-learn-more" is="text-link" class="plain" value="&identity.learnMore;"/></description>
<!-- Remove Certificate Exception -->
@ -128,36 +126,41 @@
and-when-loginforms="secure">&identity.description.insecure;</description>
<!-- Insecure login forms -->
<description when-loginforms="insecure">&identity.description.insecureLoginForms; <label id="identity-popup-insecure-login-forms-learn-more" is="text-link" class="plain" value="&identity.learnMore;"/></description>
<description when-loginforms="insecure">&identity.description.insecureLoginForms;</description>
<label when-loginforms="insecure" id="identity-popup-insecure-login-forms-learn-more" is="text-link" value="&identity.learnMore;"/>
<!-- Weak Cipher -->
<description when-ciphers="weak">&identity.description.weakCipher;</description>
<description class="identity-popup-warning-yellow"
<description class="identity-popup-warning-box identity-popup-warning-yellow"
when-ciphers="weak">&identity.description.weakCipher2;</description>
<!-- Active Mixed Content Blocked -->
<description class="identity-popup-warning-gray"
<description class="identity-popup-warning-box identity-popup-warning-gray"
when-mixedcontent="active-blocked">&identity.description.activeBlocked; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
<!-- Passive Mixed Content Loaded -->
<description when-mixedcontent="passive-loaded">&identity.description.passiveLoaded;</description>
<description class="identity-popup-warning-yellow"
<description class="identity-popup-warning-box identity-popup-warning-yellow"
when-mixedcontent="passive-loaded">&identity.description.passiveLoaded2; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
<!-- Passive Mixed Content Loaded, Active Mixed Content Blocked -->
<description when-mixedcontent="passive-loaded active-blocked">&identity.description.passiveLoaded;</description>
<description when-mixedcontent="passive-loaded active-blocked"
class="identity-popup-warning-yellow">&identity.description.passiveLoaded3; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
class="identity-popup-warning-box identity-popup-warning-yellow">&identity.description.passiveLoaded3; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
<!-- Active Mixed Content Blocking Disabled -->
<description when-mixedcontent="active-loaded"
and-when-loginforms="secure">&identity.description.activeLoaded;</description>
<description when-mixedcontent="active-loaded"
and-when-loginforms="secure">&identity.description.activeLoaded2; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
and-when-loginforms="secure">&identity.description.activeLoaded2;</description>
<label when-mixedcontent="active-loaded"
and-when-loginforms="secure" is="text-link" class="identity-popup-mcb-learn-more" value="&identity.learnMore;"/>
<!-- Show only the first message when there are insecure login forms,
and make sure the Learn More link is included. -->
<description when-mixedcontent="active-loaded"
and-when-loginforms="insecure">&identity.description.activeLoaded; <label is="text-link" class="identity-popup-mcb-learn-more plain" value="&identity.learnMore;"/></description>
and-when-loginforms="insecure">&identity.description.activeLoaded;</description>
<label when-mixedcontent="active-loaded"
and-when-loginforms="insecure" is="text-link" class="identity-popup-mcb-learn-more" value="&identity.learnMore;"/>
<!-- Buttons to enable/disable mixed content blocking. -->
<button when-mixedcontent="active-blocked"

Просмотреть файл

@ -684,20 +684,22 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY editBookmark.showForNewBookmarks.label "Show editor when saving">
<!ENTITY editBookmark.showForNewBookmarks.accesskey "S">
<!-- LOCALIZATION NOTE (identity.securityView.label)
<!-- LOCALIZATION NOTE (identity.securityView.label2)
This is the header of the security subview in the Site Identity panel. -->
<!ENTITY identity.securityView.label "Site Security">
<!ENTITY identity.securityView.label2 "Connection Security">
<!ENTITY identity.connection "Connection">
<!ENTITY identity.connectionSecure "Secure Connection">
<!ENTITY identity.connectionSecure2 "Connection Secure">
<!ENTITY identity.connectionNotSecure "Connection Is Not Secure">
<!ENTITY identity.connectionNotSecureSecurityView "You are not securely connected to this site.">
<!ENTITY identity.connectionFile "This page is stored on your computer.">
<!ENTITY identity.connectionVerified2 "You are securely connected to this site, owned by:">
<!ENTITY identity.connectionVerified3 "You are securely connected to this site.">
<!ENTITY identity.connectionInternal "This is a secure &brandShortName; page.">
<!ENTITY identity.extensionPage "This page is loaded from an extension.">
<!ENTITY identity.insecureLoginForms2 "Logins entered on this page could be compromised.">
<!ENTITY identity.customRoot "Connection verified by a certificate issuer that is not recognized by Mozilla.">
<!ENTITY identity.evOwnerLabel "Site owned by:">
<!-- Strings for connection state warnings. -->
<!ENTITY identity.activeBlocked "&brandShortName; has blocked parts of this page that are not secure.">
<!ENTITY identity.passiveLoaded "Parts of this page are not secure (such as images).">
@ -730,10 +732,10 @@ you can use these alternative items. Otherwise, their values should be empty. -
<!ENTITY identity.clearSiteData "Clear Cookies and Site Data…">
<!ENTITY identity.permissions "Permissions">
<!-- LOCALIZATION NOTE (identity.permissions2): "set" as in "configured for this website" -->
<!ENTITY identity.permissions2 "Permissions Set">
<!ENTITY identity.permissionsEmpty "You have not granted this site any special permissions.">
<!ENTITY identity.permissionsReloadHint "You may need to reload the page for changes to apply.">
<!ENTITY identity.permissionsPreferences.tooltip "Open Permissions Preferences">
<!ENTITY protections.etpON.header "Enhanced Tracking Protection is ON for this site">
<!ENTITY protections.etpOFF.header "Enhanced Tracking Protection is OFF for this site">

Просмотреть файл

@ -473,12 +473,13 @@ webauthn.anonymize=Anonymize anyway
# Spoof Accept-Language prompt
privacy.spoof_english=Changing your language setting to English will make you more difficult to identify and enhance your privacy. Do you want to request English language versions of web pages?
# LOCALIZATION NOTE (identity.headerWithHost):
# LOCALIZATION NOTE (identity.headerMainWithHost):
# %S is the hostname of the site that is being displayed.
identity.headerWithHost=Site Information for %S
identity.headerMainWithHost=Site Information for %S
identity.identified.verifier=Verified by: %S
identity.identified.verified_by_you=You have added a security exception for this site.
identity.identified.state_and_country=%S, %S
identity.ev.contentOwner=Site owned by: %S
# LOCALIZATION NOTE (identity.notSecure.label):
# Keep this string as short as possible, this is displayed in the URL bar

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

До

Ширина:  |  Высота:  |  Размер: 62 KiB

Просмотреть файл

@ -1,6 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="context-fill" fill-opacity="context-fill-opacity">
<path d="M19 10h-1V6A6 6 0 0 0 6 6v4H5a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-9a2 2 0 0 0-2-2zM8 5.75A3.75 3.75 0 0 1 11.75 2h.5A3.75 3.75 0 0 1 16 5.75V10H8z"/>
</svg>

До

Ширина:  |  Высота:  |  Размер: 532 B

Просмотреть файл

@ -96,21 +96,59 @@
border-top: 1px solid var(--panel-separator-color);
}
#identity-popup-securityView .identity-popup-security-content {
border-bottom: 1px solid var(--panel-separator-color);
}
.identity-popup-security-connection {
background-repeat: no-repeat;
background-position: 2em 50%;
background-size: 16px auto;
-moz-context-properties: fill, fill-opacity;
}
.identity-popup-security-connection:-moz-locale-dir(rtl) {
background-position-x: right 2em
}
.identity-popup-security-connection > description {
margin-top: 0;
margin-bottom: 0;
}
.identity-popup-security-connection,
#identity-popup-security-description {
/* icon indent + 16px icon width + 6px description margin
(total of 12px margin with the native 6px description margin) */
padding-inline-start: calc(2em + 22px);
padding-inline-end: 1em;
}
#identity-popup-security-description > description {
margin-top: 0.5em;
}
#identity-popup-permissions-content {
padding-inline-start: 2em;
padding-inline-end: 1em;
}
.identity-popup-security-content,
#identity-popup-permissions-content,
#identity-popup-permissions-content {
padding-top: 1em;
padding-bottom: 1em;
}
#protections-popup-content {
background-repeat: no-repeat;
background-position: 1em 1em;
background-size: 24px auto;
-moz-context-properties: fill;
padding: 0.5em 0 1em;
/* .identity-popup-host depends on this width */
padding-inline-start: calc(2em + 24px);
padding-inline-end: 1em;
}
.identity-popup-security-content:-moz-locale-dir(rtl),
#identity-popup-permissions-content:-moz-locale-dir(rtl),
#protections-popup-content:-moz-locale-dir(rtl) {
background-position: calc(100% - 1em) 1em;
}
@ -149,45 +187,20 @@
box-shadow: 0 1px 0 hsla(210,4%,10%,.05) inset;
}
/* PREFERENCES BUTTON */
.identity-popup-preferences-button {
min-width: 32px;
background: url(chrome://browser/skin/settings.svg) center right 8px no-repeat;
padding: 5px 8px !important;
margin-bottom: 2px !important;
}
.identity-popup-preferences-button:-moz-locale-dir(rtl) {
background-position: center left 8px;
}
.identity-popup-preferences-button > .toolbarbutton-text {
display: none;
}
/* CONTENT */
#identity-popup-permissions-headline,
.protections-popup-empty-label,
.tracking-protection-button,
#protections-popup-trackersView-strict-info > label,
.protections-popup-cookiesView-list-header,
.protections-popup-list-item > label,
#identity-popup-mainView-panel-header > label,
#protections-popup-mainView-panel-header > label,
#protections-popup-mainView-panel-header > description,
#protections-popup-trackersView > .panel-header,
#identity-popup-securityView > .panel-header,
#identity-popup-breakageReportView > .panel-header,
#protections-popup-sendReportView > .panel-header,
.protections-popup-category-label,
.protections-popup-category-state-label,
.identity-popup-permission-label,
.identity-popup-permission-state-label,
.identity-popup-security-content > description,
#identity-popup-security-descriptions > description,
#identity-popup-securityView-body > description,
#identity-popup-permissions-content > description,
#protections-popup-content > description,
.protections-popup-footer-button-label,
#protections-popup-trackers-blocked-counter-description {
@ -195,6 +208,20 @@
margin: 0;
}
#identity-popup-mainView-panel-header > label,
.identity-popup-permission-label,
.identity-popup-permission-state-label,
.identity-popup-security-connection > description,
#identity-popup-securityView > .panel-header,
#identity-popup-breakageReportView > .panel-header,
#identity-popup-security-description > description,
#identity-popup-securityView-body > description,
#identity-popup-securityView-body > label,
#identity-popup-permissions-content > description {
font-size: 110%;
}
#identity-popup-mainView-panel-header,
#protections-popup-mainView-panel-header,
#protections-popup-siteNotWorkingView-footer {
@ -258,40 +285,23 @@
white-space: pre-wrap;
}
.identity-popup-headline {
margin: 3px 0 4px;
font-size: 150%;
}
#identity-popup-host {
overflow-wrap: break-word;
/* This is needed for the overflow-wrap to work correctly.
* 1em + 2em + 24px is .identity-popup-security-content padding
* 33em is the panel width */
max-width: calc(var(--popup-width) - 3rem - 24px);
.identity-popup-warning-box {
padding: 0.5em;
}
.identity-popup-warning-gray {
padding-inline-start: 24px;
background: url(chrome://browser/skin/controlcenter/warning.svg) no-repeat 0 50%;
fill: #808080;
stroke: #fff;
-moz-context-properties: fill, stroke;
background-color: var(--arrowpanel-dimmed);
border: 1px solid var(--panel-separator-color);
}
.identity-popup-warning-yellow {
padding-inline-start: 24px;
background: url(chrome://browser/skin/controlcenter/warning.svg) no-repeat 0 50%;
fill: #ffbf00;
stroke: #fff;
-moz-context-properties: fill, stroke;
color: black;
background-color: #FFEEBF;
border: 1px solid #FFE083
}
.identity-popup-warning-gray:-moz-locale-dir(rtl),
.identity-popup-warning-yellow:-moz-locale-dir(rtl) {
background-position: 100% 50%;
}
/* SECURITY */
.identity-popup-connection-secure {
color: #058B00;
}
@ -300,78 +310,73 @@
color: #30e60b;
}
.identity-popup-connection-not-secure {
#identity-popup[mixedcontent~=active-loaded] .identity-popup-connection-not-secure,
#identity-popup:not([mixedcontent]) .identity-popup-connection-not-secure {
color: #d74345;
}
.identity-popup-security-content {
background-image: url(chrome://browser/skin/controlcenter/conn-not-secure.svg);
.identity-popup-security-connection {
background-image: url(chrome://browser/skin/connection-mixed-active-loaded.svg);
}
#identity-popup[connection=chrome] .identity-popup-security-content {
#identity-popup[connection=chrome] .identity-popup-security-connection {
background-image: url(chrome://branding/content/icon48.png);
}
#identity-popup[connection^=secure] .identity-popup-security-content {
background-image: url(chrome://browser/skin/controlcenter/connection.svg);
#identity-popup[connection^=secure] .identity-popup-security-connection {
background-image: url(chrome://browser/skin/connection-secure.svg);
-moz-context-properties: fill;
fill: #12BC00;
}
/* Use [isbroken] to make sure we don't show a lock on an http page. See Bug 1192162. */
#identity-popup[ciphers=weak] .identity-popup-security-content,
#identity-popup[mixedcontent~=passive-loaded][isbroken] .identity-popup-security-content {
background-image: url(chrome://browser/skin/controlcenter/connection.svg);
-moz-context-properties: fill;
/* 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://browser/skin/connection-mixed-passive-loaded.svg);
-moz-context-properties: fill, fill-opacity;
}
#identity-popup[connection=secure-cert-user-overridden] .identity-popup-security-content {
#identity-popup[connection=secure-cert-user-overridden] .identity-popup-security-connection {
background-image: url(chrome://browser/skin/connection-mixed-passive-loaded.svg);
fill: unset;
-moz-context-properties: fill;
}
#identity-popup[loginforms=insecure] .identity-popup-security-content,
#identity-popup[mixedcontent~=active-loaded][isbroken] .identity-popup-security-content {
#identity-popup[loginforms=insecure] .identity-popup-security-connection,
#identity-popup[mixedcontent~=active-loaded][isbroken] .identity-popup-security-connection {
background-image: url(chrome://browser/skin/controlcenter/mcb-disabled.svg);
-moz-context-properties: fill;
}
#identity-popup[connection=extension] .identity-popup-security-content {
#identity-popup[connection=extension] .identity-popup-security-connection {
background-image: url(chrome://browser/skin/controlcenter/extension.svg);
-moz-context-properties: fill;
fill: #60bf4c;
}
#identity-popup-security-descriptions > description {
margin-top: 6px;
color: var(--panel-disabled-color);
}
#identity-popup-securityView-body {
margin-inline-start: calc(2em + 24px);
/* icon indent + 16px icon width + 6px description margin
(total of 12px margin with the native 6px description margin) */
margin-inline-start: calc(2em + 22px);
margin-inline-end: 1em;
border-top: 1px solid var(--panel-separator-color);
padding-inline-end: 1em;
padding-top: 0.5em;
}
#identity-popup-more-info-footer {
margin-top: 1em;
}
#identity-popup-securityView-body > label:not(.plain),
#identity-popup-content-verifier ~ description {
margin-top: 1em;
color: var(--panel-disabled-color);
margin-top: 0.5em;
}
description#identity-popup-content-verified-by,
description#identity-popup-content-owner-label,
description#identity-popup-content-owner,
description#identity-popup-content-verifier,
#identity-popup-securityView-body > button {
margin-top: 1em;
}
#identity-popup-securityView-body > button {
margin-inline-start: 0;
margin-inline-end: 0;
#identity-popup-securityView-body > button {
margin-top: 0.5em;
}
/* CONTENT BLOCKING / TRACKING PROTECTION */
@ -654,7 +659,6 @@ description#identity-popup-content-verifier,
/* PERMISSIONS */
#identity-popup-permissions-content {
background-image: url(chrome://browser/skin/controlcenter/permissions.svg);
padding-bottom: 1.5em;
}
@ -667,13 +671,12 @@ description#identity-popup-content-verifier,
}
#identity-popup-permissions-headline {
/* Make sure the label is as tall as the icon so that the permission list
which is aligned with the icon doesn't cover it up. */
min-height: 24px;
color: var(--panel-disabled-color);
font-weight: 600;
margin-inline-start: 0;
}
#protections-popup-category-list,
#identity-popup-permission-list {
#protections-popup-category-list {
/* Offset the padding set on #identity-popup-permissions-content so that it
shows up just below the section. The permission icons are 16px wide and
should be right aligned with the section icon. */
@ -691,16 +694,26 @@ description#identity-popup-content-verifier,
.identity-popup-permission-item {
padding-inline-end: 8px;
margin-top: 0.25em;
}
#identity-popup-permission-reload-hint,
#identity-popup-permission-empty-hint,
#identity-popup-permission-list:not(:empty) {
margin-top: 5px;
}
.identity-popup-permission-icon {
margin-inline-start: 3px;
}
.protections-popup-category-icon,
.identity-popup-permission-icon {
width: 16px;
height: 16px;
}
.protections-popup-category-icon {
margin-inline-start: 12px;
}
@ -714,20 +727,6 @@ description#identity-popup-content-verifier,
50% { opacity: 0; }
}
.protections-popup-category-label,
.protections-popup-category-state-label,
.identity-popup-permission-label,
.identity-popup-permission-state-label,
.protections-popup-footer-button-label,
#protections-popup-trackers-blocked-counter-description {
/* We need to align the action buttons and permission icons with the text.
This is tricky because the icon height is defined in pixels, while the
font height can vary with platform and system settings, and at least on
Windows the default font metrics reserve more extra space for accents.
This value is a good compromise for different platforms and font sizes. */
margin-top: -0.1em;
}
.protections-popup-category-label {
max-width: 200px;
}
@ -738,12 +737,20 @@ description#identity-popup-content-verifier,
margin-inline-start: 1em;
}
.identity-popup-permission-label {
margin-inline-start: 10px;
}
.protections-popup-category-state-label,
.identity-popup-permission-state-label {
margin-inline-end: 5px;
text-align: end;
}
.identity-popup-permission-state-label {
color: var(--panel-disabled-color);
}
#protections-popup[hasException] .protections-popup-category-state-label {
visibility: hidden;
}

Просмотреть файл

@ -1,15 +0,0 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24">
<defs>
<mask id="mask-permissions">
<path fill="#fff" d="M2,1h20c1.1,0,2,0.9,2,2v18c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2V3 C0,1.9,0.9,1,2,1z"/>
<path fill="#000" d="M12,3h9c0.6,0,1,0.4,1,1v16c0,0.6-0.4,1-1,1h-9V3z"/>
<path fill="#000" d="M5.5,12.5l2.7-3.7C8.4,8.5,8.8,8.5,9,8.7l0.7,0.5 c0.2,0.2,0.2,0.5,0,0.7L5.8,15c-0.2,0.2-0.5,0.3-0.8,0.1l-2.2-2.2c-0.2-0.2-0.2-0.5,0-0.7l0.8-0.8c0.2-0.2,0.5-0.2,0.7,0L5.5,12.5z" />
<rect x="16.3" y="8.5" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -3.5061 15.5355)" fill="#fff" width="1.4" height="7.1"/>
<rect x="16.3" y="8.5" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 20.5355 32.5061)" fill="#fff" width="1.4" height="7.1"/>
</mask>
</defs>
<rect fill="context-fill" fill-opacity="context-fill-opacity" width="24" height="24" mask="url(#mask-permissions)"/>
</svg>

До

Ширина:  |  Высота:  |  Размер: 1.1 KiB

Просмотреть файл

@ -26,8 +26,6 @@
skin/classic/browser/addons/addon-private-browsing.svg (../shared/addons/addon-private-browsing.svg)
skin/classic/browser/controlcenter/3rdpartycookies.svg (../shared/controlcenter/3rdpartycookies.svg)
skin/classic/browser/controlcenter/3rdpartycookies-disabled.svg (../shared/controlcenter/3rdpartycookies-disabled.svg)
skin/classic/browser/controlcenter/conn-not-secure.svg (../shared/controlcenter/conn-not-secure.svg)
skin/classic/browser/controlcenter/connection.svg (../shared/controlcenter/connection.svg)
skin/classic/browser/controlcenter/cryptominers.svg (../shared/controlcenter/cryptominers.svg)
skin/classic/browser/controlcenter/dashboard.svg (../shared/controlcenter/dashboard.svg)
skin/classic/browser/controlcenter/cryptominers-disabled.svg (../shared/controlcenter/cryptominers-disabled.svg)
@ -36,7 +34,6 @@
skin/classic/browser/controlcenter/fingerprinters.svg (../shared/controlcenter/fingerprinters.svg)
skin/classic/browser/controlcenter/fingerprinters-disabled.svg (../shared/controlcenter/fingerprinters-disabled.svg)
skin/classic/browser/controlcenter/info.svg (../shared/controlcenter/info.svg)
skin/classic/browser/controlcenter/permissions.svg (../shared/controlcenter/permissions.svg)
skin/classic/browser/controlcenter/socialblock.svg (../shared/controlcenter/socialblock.svg)
skin/classic/browser/controlcenter/socialblock-disabled.svg (../shared/controlcenter/socialblock-disabled.svg)
skin/classic/browser/controlcenter/tracker-image.svg (../shared/controlcenter/tracker-image.svg)