Skip to content

Commit de0b090

Browse files
committed
Backed out 8 changesets (bug 1838939) for dt failure on browser_styleeditor_fission_switch_target.js . CLOSED TREE
Backed out changeset bfb8bcb267c5 (bug 1838939) Backed out changeset 94174e2d7373 (bug 1838939) Backed out changeset a296d5def7c8 (bug 1838939) Backed out changeset 8e69b0238271 (bug 1838939) Backed out changeset c0ba65d79200 (bug 1838939) Backed out changeset 6fb9170b1bc5 (bug 1838939) Backed out changeset 221a4fc5492e (bug 1838939) Backed out changeset b67f33657dc4 (bug 1838939)
1 parent 7beb9aa commit de0b090

27 files changed

+186
-693
lines changed

browser/components/aboutlogins/content/aboutLogins.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ <h1 class="title" id="title"></h1>
164164
<link rel="stylesheet" href="chrome://browser/content/aboutlogins/common.css">
165165
<link rel="stylesheet" href="chrome://browser/content/aboutlogins/components/fxaccounts-button.css">
166166
<div class="logged-out-view">
167-
<p class="fxaccounts-extra-text text-deemphasized" data-l10n-id="fxaccounts-sign-in-text"></p>
167+
<p class="fxaccounts-extra-text" data-l10n-id="fxaccounts-sign-in-text"></p>
168168
<button class="fxaccounts-enable-button" data-l10n-id="fxaccounts-sign-in-sync-button"></button>
169169
</div>
170170
<div class="logged-in-view">
@@ -186,7 +186,7 @@ <h1 class="title" id="title"></h1>
186186
<login-command-button class="create-login-button" l10nId="create-new-login-button" icon="chrome://global/skin/icons/plus.svg" tooltip="" ></login-command-button>
187187
</div>
188188
</div>
189-
<div class="meta text-deemphasized">
189+
<div class="meta">
190190
<label for="login-sort">
191191
<span data-l10n-id="login-list-sort-label-text"></span>
192192
<select id="login-sort">
@@ -219,8 +219,8 @@ <h1 class="title" id="title"></h1>
219219
<li class="login-list-item" role="option">
220220
<img class="favicon" />
221221
<div class="labels">
222-
<span class="title text-truncated-ellipsis" dir="auto"></span>
223-
<span class="username text-deemphasized text-truncated-ellipsis" dir="ltr"></span>
222+
<span class="title" dir="auto"></span>
223+
<span class="username" dir="ltr"></span>
224224
</div>
225225
<img class="alert-icon" title="" src=""/>
226226
</li>
@@ -275,7 +275,7 @@ <h1 class="heading" data-l10n-id="about-logins-login-intro-heading-logged-out2">
275275
</div>
276276
<div class="header">
277277
<img class="login-item-favicon" />
278-
<h2 class="title text-truncated-ellipsis">
278+
<h2 class="title">
279279
<span class="login-item-title"></span>
280280
<span class="new-login-title" data-l10n-id="login-item-new-login-title"></span>
281281
</h2>
@@ -287,7 +287,7 @@ <h2 class="title text-truncated-ellipsis">
287287
<form>
288288
<div class="detail-row">
289289
<label class="detail-cell">
290-
<span class="origin-label field-label text-deemphasized" data-l10n-id="login-item-origin-label"></span>
290+
<span class="origin-label field-label" data-l10n-id="login-item-origin-label"></span>
291291
<!-- Default text inputs to readonly to reduce jumping of the field
292292
size on page load since it always starts readonly. -->
293293

@@ -308,7 +308,7 @@ <h2 class="title text-truncated-ellipsis">
308308
<div class="detail-grid">
309309
<div class="detail-row">
310310
<label class="detail-cell">
311-
<span class="username-label field-label text-deemphasized" data-l10n-id="login-item-username-label"></span>
311+
<span class="username-label field-label" data-l10n-id="login-item-username-label"></span>
312312
<input type="text"
313313
name="username"
314314
data-l10n-id="login-item-username"
@@ -320,7 +320,7 @@ <h2 class="title text-truncated-ellipsis">
320320
</div>
321321
<div class="detail-row">
322322
<label class="detail-cell">
323-
<span class="password-label field-label text-deemphasized" data-l10n-id="login-item-password-label"></span>
323+
<span class="password-label field-label" data-l10n-id="login-item-password-label"></span>
324324
<div class="reveal-password-wrapper">
325325
<input type="password"
326326
name="password"

browser/components/aboutlogins/content/components/fxaccounts-button.css

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,17 @@
1515
-webkit-box-orient: vertical;
1616
-webkit-line-clamp: 3;
1717
overflow: hidden;
18+
19+
color: var(--text-color-deemphasized);
1820
text-align: end;
1921
}
2022

23+
.fxaccounts-extra-text,
24+
.fxaccount-email,
25+
.fxaccounts-enable-button {
26+
font-size: 13px;
27+
}
28+
2129
@media (max-width: 830px) {
2230
.fxaccounts-extra-text,
2331
.fxaccount-email {
@@ -27,7 +35,6 @@
2735

2836
.fxaccount-avatar,
2937
.fxaccounts-enable-button {
30-
font-size: var(--font-size-small);
3138
margin-inline-start: 9px;
3239
}
3340

@@ -46,7 +53,6 @@
4653
}
4754

4855
.fxaccount-email {
49-
font-size: var(--font-size-small);
5056
vertical-align: middle;
5157
}
5258

browser/components/aboutlogins/content/components/login-command-button.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ button {
66
margin: 0;
77
display: inline-flex;
88
flex-direction: row;
9-
align-items: center;
109
min-width: auto;
1110
}
1211

browser/components/aboutlogins/content/components/login-intro.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
align-items: center;
1010
}
1111

12+
.heading {
13+
font-size: 1.5em;
14+
}
15+
1216
section {
1317
line-height: 2;
1418
}
1519

1620
.description {
17-
font-weight: var(--font-weight-bold);
21+
font-weight: 600;
1822
margin-bottom: 0;
1923
}
2024

browser/components/aboutlogins/content/components/login-item.css

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,9 @@ input[type="url"]:read-only {
106106
.title {
107107
margin-block: 0;
108108
flex-grow: 1;
109+
overflow: hidden;
110+
text-overflow: ellipsis;
111+
white-space: nowrap;
109112
}
110113

111114
input[type = "url"]:focus:not(:-moz-ui-invalid):invalid ~ .tooltip-container {
@@ -213,6 +216,8 @@ input[type = "url"]:focus:-moz-ui-invalid:not(:placeholder-shown) ~ .tooltip-con
213216

214217
.field-label {
215218
display: block;
219+
font-size: smaller;
220+
color: var(--text-color-deemphasized);
216221
margin-bottom: 8px;
217222
}
218223

@@ -292,20 +297,20 @@ login-command-button {
292297
}
293298

294299
.alert-title {
295-
font-size: var(--font-size-xlarge);
296-
font-weight: var(--font-weight-default);
300+
font-size: 22px;
301+
font-weight: normal;
297302
line-height: 1em;
298303
margin-block: 0 12px;
299304
}
300305

301306
.alert-date {
302307
display: block;
303-
font-weight: var(--font-weight-bold);
308+
font-weight: 600;
304309
}
305310

306311
.alert-link:visited,
307312
.alert-link {
308-
font-weight: var(--font-weight-bold);
313+
font-weight: 600;
309314
overflow-wrap: anywhere;
310315
}
311316

@@ -331,7 +336,7 @@ login-command-button {
331336
inset-block-start: 16px;
332337
inset-inline-end: 32px;
333338
color: inherit;
334-
font-size: var(--font-size-small);
339+
font-size: 13px;
335340
}
336341

337342
.vulnerable-alert > .alert-learn-more-link {
@@ -362,5 +367,5 @@ login-command-button {
362367
.error-message-link > a:hover:active {
363368
color: currentColor;
364369
text-decoration: underline;
365-
font-weight: var(--font-weight-bold);
370+
font-weight: 600;
366371
}

browser/components/aboutlogins/content/components/login-list.css

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
padding: 0 16px 16px;
1717
border-bottom: 1px solid var(--in-content-border-color);
1818
background-color: var(--in-content-box-background);
19+
color: var(--text-color-deemphasized);
20+
font-size: 0.8em;
1921
}
2022

2123
.meta > label > span {
@@ -34,7 +36,7 @@
3436
}
3537

3638
#login-sort > option {
37-
font-weight: var(--font-weight-default);
39+
font-weight: normal;
3840
}
3941

4042
.count {
@@ -107,7 +109,7 @@ ol {
107109
position: sticky;
108110
top: 0;
109111
font-size: .85em;
110-
font-weight: var(--font-weight-bold);
112+
font-weight: 600;
111113
padding: 4px 16px;
112114
border-bottom: 1px solid var(--in-content-border-color);
113115
background-color: var(--in-content-box-background);
@@ -136,7 +138,7 @@ ol {
136138
}
137139

138140
.login-list-item.selected .title {
139-
font-weight: var(--font-weight-bold);
141+
font-weight: 600;
140142
}
141143

142144
.labels {
@@ -148,6 +150,14 @@ ol {
148150
justify-content: center;
149151
}
150152

153+
.title,
154+
.username {
155+
display: block;
156+
text-overflow: ellipsis;
157+
overflow: hidden;
158+
white-space: nowrap;
159+
}
160+
151161
.favicon {
152162
height: 16px;
153163
width: 16px;
@@ -157,6 +167,11 @@ ol {
157167
fill-opacity: 0.8;
158168
}
159169

170+
.username {
171+
font-size: 0.85em;
172+
color: var(--text-color-deemphasized);
173+
}
174+
160175
.alert-icon {
161176
min-width: 16px;
162177
width: 16px;

browser/components/enterprisepolicies/content/aboutPolicies.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@
4242
</div>
4343
<div class="main-content">
4444
<div class="header">
45-
<h1
45+
<div
4646
id="sectionTitle"
4747
class="header-name"
4848
data-l10n-id="active-policies-tab"
49-
></h1>
49+
></div>
5050
</div>
5151

5252
<div id="active" class="tab active">

browser/components/protections/content/protections.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,12 @@ body[focuseddatatype=cryptominer] {
6565
}
6666

6767
h2 {
68-
font-weight: var(--font-weight-bold);
68+
font-weight: 700;
6969
}
7070

7171
#report-title {
72+
font-size: 20px;
73+
font-weight: 300;
7274
margin-block-end: 20px;
7375
}
7476

Lines changed: 5 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,8 @@
11
<!-- This Source Code Form is subject to the terms of the Mozilla Public
22
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
33
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
4-
5-
<link
6-
rel="stylesheet"
7-
href="chrome://global/skin/design-system/text-and-typography.css"
8-
/>
9-
<link
10-
rel="stylesheet"
11-
href="chrome://global/skin/design-system/tokens-brand.css"
12-
/>
13-
4+
<link rel="stylesheet" href="chrome://global/skin/design-tokens-brand.css" />
145
<style>
15-
:root {
16-
font-size: var(--font-size-root);
17-
}
186
/* Override the default Storybook padding in favour of styles
197
provided by our WithCommonStyles wrapper */
208
.sb-show-main.sb-main-padded {
@@ -32,54 +20,10 @@
3220
height: unset;
3321
}
3422

35-
/* Typography preview and design tokens table */
36-
table.sb-preview-design-tokens {
37-
-moz-osx-font-smoothing: auto;
38-
border-collapse: separate;
39-
table-layout: fixed;
40-
text-align: left;
41-
width: 100%;
42-
43-
& th {
44-
background: #ebf5fc;
45-
}
46-
47-
& tr td,
48-
& tr th {
49-
padding: 8px;
50-
}
51-
52-
& td {
53-
background: #ffffff;
54-
}
55-
}
56-
57-
td.sb-preview-chrome-typescale {
58-
& .docs-story {
59-
* {
60-
font: message-box;
61-
}
62-
63-
& h1 {
64-
font-weight: var(--font-weight-bold) !important;
65-
}
66-
}
67-
68-
&.sb-preview-chrome-menu .docs-story * {
69-
font: menu;
70-
}
23+
panel-item[action="new"]::part(button) {
24+
background-image: url("chrome://global/skin/icons/plus.svg");
7125
}
72-
73-
h1.sb-preview-chrome-typescale {
74-
font: message-box;
75-
font-weight: var(--font-weight-bold) !important;
76-
77-
&.sb-preview-chrome-menu {
78-
font: menu;
79-
}
80-
}
81-
82-
table .sb-preview-font-size-small {
83-
font-size: var(--font-size-small);
26+
panel-item[action="save"]::part(button) {
27+
background-image: url("chrome://global/skin/icons/page-portrait.svg");
8428
}
8529
</style>

browser/components/storybook/.storybook/preview.mjs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ class WithCommonStyles extends MozLitElement {
4444
:host,
4545
:root {
4646
font: message-box;
47-
font-size: var(--font-size-root);
4847
appearance: none;
49-
background-color: var(--color-canvas);
50-
color: var(--text-color);
48+
background-color: var(--in-content-page-background);
49+
color: var(--in-content-page-color);
5150
-moz-box-layout: flex;
5251
}
5352
54-
:host {
55-
font-size: var(--font-size-root);
53+
:host,
54+
:root:not(.system-font-size) {
55+
font-size: 15px;
5656
}
5757
`;
5858

0 commit comments

Comments
 (0)