Skip to content

Commit

Permalink
Update On Sun Dec 3 19:41:38 CET 2023
Browse files Browse the repository at this point in the history
  • Loading branch information
bolucat committed Dec 3, 2023
1 parent 97d9197 commit 6cab3d6
Show file tree
Hide file tree
Showing 60 changed files with 684 additions and 759 deletions.
12 changes: 6 additions & 6 deletions browser/components/aboutlogins/content/aboutLogins.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<meta charset="utf-8">
<meta http-equiv="Content-Security-Policy" content="default-src 'none'; object-src 'none'; script-src resource: chrome:; img-src data: blob: https://firefoxusercontent.com https://profile.accounts.firefox.com;">
<meta name="color-scheme" content="light dark">
<title data-l10n-id="about-logins-page-title"></title>
<title data-l10n-id="about-logins-page-title-name"></title>
<link rel="localization" href="branding/brand.ftl">
<link rel="localization" href="browser/aboutLogins.ftl">
<link rel="localization" href="toolkit/branding/accounts.ftl">
Expand Down Expand Up @@ -183,7 +183,7 @@ <h1 class="title" id="title"></h1>
<div class="listHeader">
<login-filter></login-filter>
<div class="create-login-button-container">
<login-command-button class="create-login-button" data-l10n-id="create-new-login-button" icon="chrome://global/skin/icons/plus.svg" ></login-command-button>
<login-command-button class="create-login-button" data-l10n-id="create-login-button" icon="chrome://global/skin/icons/plus.svg" ></login-command-button>
</div>
</div>
<div class="meta text-deemphasized">
Expand All @@ -199,17 +199,17 @@ <h1 class="title" id="title"></h1>
<option name="alerts" data-l10n-id="about-logins-login-list-alerts-option" value="alerts" hidden>
</select>
</label>
<span class="count" data-l10n-id="login-list-count" data-l10n-args='{"count": 0}'></span>
<span class="count" data-l10n-id="login-list-count2" data-l10n-args='{"count": 0}'></span>
</div>
<!-- This container is to work around bug 1569292 -->
<div class="container">
<ol role="listbox" tabindex="0" data-l10n-id="login-list"></ol>
<div class="intro">
<p data-l10n-id="login-list-intro-title"></p>
<p data-l10n-id="login-list-intro-title2"></p>
<span data-l10n-id="login-list-intro-description"></span>
</div>
<div class="empty-search-message">
<p data-l10n-id="about-logins-login-list-empty-search-title"></p>
<p data-l10n-id="about-logins-login-list-empty-search-title2"></p>
<span data-l10n-id="about-logins-login-list-empty-search-description"></span>
</div>
</div>
Expand Down Expand Up @@ -356,7 +356,7 @@ <h2 class="title">
<link rel="stylesheet" href="chrome://global/skin/in-content/common.css">
<link rel="stylesheet" href="chrome://browser/content/aboutlogins/common.css">
<link rel="stylesheet" href="chrome://browser/content/aboutlogins/components/login-filter.css">
<input data-l10n-id="about-logins-login-filter" class="filter" type="text" dir="auto"/>
<input data-l10n-id="about-logins-login-filter2" class="filter" type="text" dir="auto"/>
</template>

<template id="menu-button-template">
Expand Down
2 changes: 1 addition & 1 deletion browser/components/aboutlogins/content/aboutLogins.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ window.addEventListener("AboutLoginsExportPasswordsDialog", async () => {
async function interceptFocusKey() {
// Intercept Ctrl+F on the page to focus login filter box
const [findKey] = await document.l10n.formatMessages([
{ id: "about-logins-login-filter" },
{ id: "about-logins-login-filter2" },
]);
const focusKey = findKey.attributes
.find(a => a.name == "key")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,9 @@ export class NewListItem extends MozLitElement {
<span
class="title"
dir="auto"
data-l10n-id="login-list-item-title-new-login"
data-l10n-id="login-list-item-title-new-login2"
></span
><span
class="subtitle"
dir="auto"
data-l10n-id="login-list-item-subtitle-new-login"
></span>
><span class="subtitle" dir="auto"></span>
</div>
</list-item>
`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ export default class LoginList extends HTMLElement {
if (count != args.count || total != args.total) {
document.l10n.setAttributes(
this._count,
count == total ? "login-list-count" : "login-list-filtered-count",
count == total ? "login-list-count2" : "login-list-filtered-count2",
{ count, total }
);
}
Expand Down
6 changes: 2 additions & 4 deletions browser/components/aboutwelcome/content-src/aboutwelcome.scss
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,6 @@ html {
--in-content-primary-button-background: rgb(0, 221, 255);
--in-content-primary-button-background-hover: rgb(128, 235, 255);
--in-content-primary-button-background-active: rgb(170, 242, 255);
--checkbox-checked-bgcolor: var(--in-content-primary-button-background);
--in-content-button-text-color: var(--in-content-page-color);
}

Expand All @@ -272,7 +271,6 @@ html {
--in-content-primary-button-background-active: #053E94;
--in-content-primary-button-border-color: transparent;
--in-content-primary-button-border-hover: transparent;
--checkbox-checked-bgcolor: var(--in-content-primary-button-background);
--in-content-button-text-color: var(--in-content-page-color);
}

Expand Down Expand Up @@ -1486,7 +1484,7 @@ html {

&.current {
opacity: 1;
border-color: var(--checkbox-checked-bgcolor);
border-color: var(--in-content-primary-button-background);

// This is the only step shown, so visually hide it to maintain spacing.
&:last-of-type:first-of-type {
Expand All @@ -1508,7 +1506,7 @@ html {
width: 100%;
height: 100%;
margin-inline: -1px;
background-color: var(--checkbox-checked-bgcolor);
background-color: var(--in-content-primary-button-background);
border: 0;
border-radius: 0;
opacity: 1;
Expand Down
6 changes: 2 additions & 4 deletions browser/components/aboutwelcome/content/aboutwelcome.css
Original file line number Diff line number Diff line change
Expand Up @@ -987,7 +987,6 @@ html {
--in-content-primary-button-background: rgb(0, 221, 255);
--in-content-primary-button-background-hover: rgb(128, 235, 255);
--in-content-primary-button-background-active: rgb(170, 242, 255);
--checkbox-checked-bgcolor: var(--in-content-primary-button-background);
--in-content-button-text-color: var(--in-content-page-color);
}
.onboardingContainer .screen.dark-text {
Expand All @@ -999,7 +998,6 @@ html {
--in-content-primary-button-background-active: #053E94;
--in-content-primary-button-border-color: transparent;
--in-content-primary-button-border-hover: transparent;
--checkbox-checked-bgcolor: var(--in-content-primary-button-background);
--in-content-button-text-color: var(--in-content-page-color);
}
.onboardingContainer .screen:dir(rtl) {
Expand Down Expand Up @@ -2116,7 +2114,7 @@ html {
}
.onboardingContainer .steps .indicator.current {
opacity: 1;
border-color: var(--checkbox-checked-bgcolor);
border-color: var(--in-content-primary-button-background);
}
.onboardingContainer .steps .indicator.current:last-of-type:first-of-type {
opacity: 0;
Expand All @@ -2134,7 +2132,7 @@ html {
width: 100%;
height: 100%;
margin-inline: -1px;
background-color: var(--checkbox-checked-bgcolor);
background-color: var(--in-content-primary-button-background);
border: 0;
border-radius: 0;
opacity: 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ add_task(async function test_aboutwelcome_with_progress_bar() {
const indicatorStyles = content.window.getComputedStyle(indicator);
for (let [key, val] of Object.entries({
// The filled "completed" element should have
// `background-color: var(--checkbox-checked-bgcolor);`
// `background-color: var(--in-content-primary-button-background);`
"background-color": "rgb(0, 97, 224)",
// Base progress bar step styles.
height: "6px",
Expand Down
33 changes: 18 additions & 15 deletions browser/locales/en-US/browser/aboutLogins.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
# NOTE: New strings should use the about-logins- prefix.

about-logins-page-title = Logins & Passwords
about-logins-page-title-name = Passwords
about-logins-login-filter =
.placeholder = Search Logins
about-logins-login-filter2 =
.placeholder = Search Passwords
.key = F
create-new-login-button =
.title = Create new login
create-login-button =
.title = Add password
fxaccounts-sign-in-text = Get your passwords on your other devices
fxaccounts-sign-in-sync-button = Sign in to sync
Expand Down Expand Up @@ -39,18 +39,18 @@ login-list =
.aria-label = Logins matching search query
# Variables
# $count (number) - Number of logins
login-list-count =
login-list-count2 =
{ $count ->
[one] { $count } login
*[other] { $count } logins
[one] { $count } password
*[other] { $count } passwords
}
# Variables
# $count (number) - Number of filtered logins
# $total (number) - Total number of logins
login-list-filtered-count =
login-list-filtered-count2 =
{ $total ->
[one] { $count } of { $total } login
*[other] { $count } of { $total } logins
[one] { $count } of { $total } password
*[other] { $count } of { $total } passwords
}
login-list-sort-label-text = Sort by:
login-list-name-option = Name (A-Z)
Expand All @@ -60,12 +60,15 @@ login-list-username-reverse-option = Username (Z-A)
about-logins-login-list-alerts-option = Alerts
login-list-last-changed-option = Last Modified
login-list-last-used-option = Last Used
login-list-intro-title = No logins found
login-list-intro-title2 = No passwords saved
login-list-intro-description = When you save a password in { -brand-product-name }, it will show up here.
about-logins-login-list-empty-search-title = No logins found
about-logins-login-list-empty-search-title2 = No passwords found
about-logins-login-list-empty-search-description = There are no results matching your search.
login-list-item-title-new-login = New Login
login-list-item-subtitle-new-login = Enter your login credentials
login-list-item-title-new-login2 = Add password
login-list-item-subtitle-missing-username = (no username)
about-logins-list-item-breach-icon =
.title = Breached website
Expand Down
Loading

0 comments on commit 6cab3d6

Please sign in to comment.