Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 11 insertions, 12 deletions

diff --git a/browser/components/aboutlogins/content/aboutLogins.html b/browser/components/aboutlogins/content/aboutLogins.html
index 67712c8f29..a0c04149e7 100644
--- a/browser/components/aboutlogins/content/aboutLogins.html
+++ b/browser/components/aboutlogins/content/aboutLogins.html
@@ -11,7 +11,6 @@
     <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">
     <link rel="localization" href="toolkit/branding/brandings.ftl">
     <script type="module" src="chrome://browser/content/aboutlogins/components/confirmation-dialog.mjs"></script>
     <script type="module" src="chrome://browser/content/aboutlogins/components/remove-logins-dialog.mjs"></script>
diff --git a/browser/components/aboutlogins/content/aboutLoginsImportReport.html b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
index 9ab2641ca2..c9956e2cca 100644
--- a/browser/components/aboutlogins/content/aboutLoginsImportReport.html
+++ b/browser/components/aboutlogins/content/aboutLoginsImportReport.html
@@ -14,7 +14,6 @@
     <title data-l10n-id="about-logins-import-report-page-title"></title>
     <link rel="localization" href="branding/brand.ftl" />
     <link rel="localization" href="browser/aboutLogins.ftl" />
-    <link rel="localization" href="toolkit/branding/accounts.ftl" />
     <link rel="localization" href="toolkit/branding/brandings.ftl" />
     <script
       type="module"
diff --git a/browser/components/aboutlogins/content/components/login-item.css b/browser/components/aboutlogins/content/components/login-item.css
index 4a3d85d859..e9e91f78ed 100644
--- a/browser/components/aboutlogins/content/components/login-item.css
+++ b/browser/components/aboutlogins/content/components/login-item.css
@@ -64,11 +64,6 @@ form {
   display: none;
 }
 
-input[type="password"],
-input[type="text"],
-input[type="url"] {
-  text-align: match-parent !important; /* override `all: unset` in the rule below */
-}
 
 :host(:not([data-editing])) input[type="password"]:read-only,
 input[type="text"]:read-only,
@@ -82,6 +77,17 @@ input[type="url"]:read-only {
   width: 100%;
 }
 
+input:is([type="password"], [type="text"], [type="url"]) {
+  /* Override all: unset above */
+  appearance: textfield !important;
+  text-align: match-parent !important;
+}
+
+input.password-display,
+input[name="password"] {
+  font-family: monospace !important; /* Override all: unset above */
+}
+
 /* We can't use `margin-inline-start` here because we force
  * the input to have dir="ltr", so we set the margin manually
  * using the parent element's directionality. */
@@ -197,11 +203,6 @@ moz-button-group,
   box-shadow: none;
 }
 
-input.password-display,
-input[name="password"] {
-  font-family: monospace !important; /* override `all: unset` in the rule above */
-}
-
 .reveal-password-checkbox {
   appearance: none;
   background-image: url("resource://gre-resources/password.svg");