Skip to content

Commit adb4077

Browse files
committed
Bug 2050924 - Fix security information component on the trust panel. r=credential-management-reviewers,fluent-reviewers,desktop-theme-reviewers,flod,mtigley,hjones
Specs https://mozilla-hub.atlassian.net/browse/FELTPY-80 Differential Revision: https://phabricator.services.mozilla.com/D309647
1 parent e37d2bd commit adb4077

4 files changed

Lines changed: 29 additions & 11 deletions

File tree

browser/components/controlcenter/content/securityInformation.inc.xhtml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
- file, You can obtain one at https://mozilla.org/MPL/2.0/. -->
44

55
<vbox class="panel-subview-body">
6-
<hbox class="identity-popup-security-connection identity-popup-section" align="center" pack="center">
6+
<hbox class="identity-popup-security-connection identity-popup-section" align="center">
77
<image class="identity-popup-security-connection-icon"/>
88
<description class="identity-popup-connection-not-secure security-view"
99
when-connection="not-secure secure-cert-user-overridden cert-error-page net-error-page https-only-error-page" data-l10n-id="identity-connection-not-secure-security-view"></description>
@@ -22,21 +22,22 @@
2222
</box>
2323
</hbox>
2424

25-
<html:moz-card id="identity-popup-securityView-extended-info">
25+
26+
<vbox id="identity-popup-securityView-extended-info">
2627
<!-- (EV) Certificate Information -->
27-
<hbox>
28+
<hbox id="identity-popup-content-cert-info">
2829
<vbox>
2930
<description id="identity-popup-content-owner-label"
3031
when-connection="secure-ev secure-etsi"
31-
data-l10n-id="identity-ev-owner-label"/>
32+
data-l10n-id="identity-ev-owner-label2"/>
3233
<description id="identity-popup-content-owner"
3334
when-connection="secure-ev secure-etsi"
3435
class="header"/>
3536
<description id="identity-popup-content-supplemental"
3637
when-connection="secure-ev secure-etsi"/>
3738
<description id="identity-popup-content-verifier-label"
3839
when-connection="secure secure-ev secure-etsi"
39-
data-l10n-id="identity-verifier-label"/>
40+
data-l10n-id="identity-verifier-label2"/>
4041
<description id="identity-popup-content-verifier"
4142
when-connection="secure secure-ev secure-etsi"
4243
class="header"/>
@@ -123,5 +124,5 @@
123124
<description when-httpsonlystatus="failed-top" flex="1" data-l10n-id="identity-https-only-info-no-upgrade"></description>
124125
</vbox>
125126
</vbox>
126-
</html:moz-card>
127+
</vbox>
127128
</vbox>

browser/components/controlcenter/content/trustPanel.inc.xhtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@
8484
class="PanelUI-subView"
8585
role="document">
8686
#include securityInformation.inc.xhtml
87-
<html:a id="trustpanel-siteinformation-morelink" data-l10n-id="trustpanel-siteinformation-morelink" role="link" class="trustpanel-section panel-subview-footer-button"></html:a>
87+
<toolbarseparator></toolbarseparator>
88+
<toolbarbutton id="trustpanel-siteinformation-morelink" data-l10n-id="trustpanel-siteinformation-morelink" class="subviewbutton"></toolbarbutton>
8889
</panelview>
8990

9091
<panelview id="trustpanel-blockerView"

browser/locales/en-US/browser/browser.ftl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -469,8 +469,8 @@ identity-clear-site-data =
469469
.label = Clear cookies and site data…
470470
identity-connection-not-secure-security-view = You are not securely connected to this site.
471471
identity-connection-verified = You are securely connected to this site.
472-
identity-ev-owner-label = Certificate issued to:
473-
identity-verifier-label = Verified by:
472+
identity-ev-owner-label2 = Certificate issued to
473+
identity-verifier-label2 = Verified by
474474
# "qualified" here refers to the qualified website authentication certificate presented by the site.
475475
identity-etsi = Qualified as specified in Regulation (EU) 2024/1183.
476476
identity-description-custom-root2 = Mozilla does not recognize this certificate issuer. It may have been added from your operating system or by an administrator.

browser/themes/shared/controlcenter/panel.css

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,17 @@
315315
margin-block: 0.5em;
316316
}
317317

318+
#trustpanel-popup #identity-popup-content-verifier-label {
319+
margin-block-end: var(--space-xsmall);
320+
}
321+
322+
#trustpanel-popup #identity-popup-content-cert-info {
323+
border-block-end: 1px solid var(--trustpanel-card-divider-color);
324+
padding-block-end: var(--space-small);
325+
margin-inline: calc(-1 * var(--panel-menuitem-padding-inline));
326+
padding-inline: var(--panel-menuitem-padding-inline);
327+
}
328+
318329
#identity-popup-content-supplemental {
319330
margin-block-end: 0.5em;
320331
}
@@ -325,9 +336,10 @@
325336

326337
#identity-popup-securityView-extended-info {
327338
margin-inline: var(--panel-menuitem-margin-inline);
339+
padding-inline: var(--panel-menuitem-padding-inline);
328340

329-
@media not (prefers-contrast) {
330-
--card-background-color: color-mix(in srgb, currentColor 2%, transparent);
341+
.header {
342+
font-weight: var(--font-weight-heading);
331343
}
332344

333345
#trustpanel-popup:is([connection="chrome"], [connection="file"], [connection="associated"], [connection="extension"]) & {
@@ -1179,6 +1191,10 @@
11791191
padding-bottom: 0;
11801192
}
11811193

1194+
#trustpanel-securityInformationView {
1195+
padding-block-end: var(--space-small);
1196+
}
1197+
11821198
.moz-button-subviewbutton-nav {
11831199
--button-font-weight: normal;
11841200
--button-content-alignment: inline-start;

0 commit comments

Comments
 (0)