From 23e0972901ba426c1f11c0e534128acef1f2bc9d Mon Sep 17 00:00:00 2001
From: bmFtZQ <aaaa2048@outlook.com>
Date: Fri, 3 Dec 2021 07:05:23 +0800
Subject: [PATCH] fix private newtab + account button

---
 chrome/content/common.css |  1 +
 chrome/content/newtab.css | 60 +++++++++++++++++++++++++++++++++++++--
 chrome/toolbar/navbar.css | 17 ++++++++++-
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/chrome/content/common.css b/chrome/content/common.css
index 510184d..307558a 100644
--- a/chrome/content/common.css
+++ b/chrome/content/common.css
@@ -35,6 +35,7 @@
     --in-content-danger-button-background-active: #BB353C !important;
     --in-content-focus-outline-color: color-mix(in srgb, #0055D7 50%, transparent) !important;
     --in-content-table-background: #f7f7f7 !important;
+    --in-content-text-color: var(--in-content-page-color) !important;
     scrollbar-color: rgba(37, 37, 37, 0.4) #f7f7f7 !important;
   }
   
diff --git a/chrome/content/newtab.css b/chrome/content/newtab.css
index e2f1479..2a202ad 100644
--- a/chrome/content/newtab.css
+++ b/chrome/content/newtab.css
@@ -5,7 +5,7 @@
   body:not([lwt-newtab], [lwt-newtab-brighttext]) {
     --newtab-background-color: #F7F7F7 !important;
     --newtab-background-color-secondary: #fff !important;
-    --newtab-text-primary-color: #000 !important;
+    --newtab-text-primary-color: #252525 !important;
     --newtab-primary-action-background: #0078D4 !important;
     --newtab-text-secondary-color: color-mix(in srgb, var(--newtab-text-primary-color) 80%, transparent) !important;
     --newtab-element-hover-color: color-mix(in srgb, var(--newtab-background-color) 95%, #000) !important;
@@ -75,7 +75,6 @@
   
   .search-handoff-button:hover {
     --elevation: 6;
-    box-shadow: 0 0 calc((var(--elevation) * 0.225px) + 2px) rgba(0, 0, 0, 0.11), 0 calc(var(--elevation) * 0.4px) calc((var(--elevation) * 0.9px)) rgba(0, 0, 0, 0.13) !important;
   }
 
   .search-wrapper.fake-focus:not(.search.disabled) .search-handoff-button {
@@ -130,3 +129,60 @@
     border-radius: 4px 4px 0 0 !important
   }
 }
+
+/* private browsing newtab */
+@-moz-document url-prefix(about:privatebrowsing) {
+  :root {
+    --uc-wordmark-color: #737373 !important;
+    --uc-background-color-secondary: #fff !important;
+  }
+
+  @media (prefers-color-scheme: dark) {
+    :root {
+      --uc-wordmark-color: #fff !important;
+      --uc-background-color-secondary: #4a4a4a !important;
+    }
+  }
+
+  .search-inner-wrapper {
+    height: 44px !important;
+  }
+
+  .search-handoff-button,
+  .search-handoff-button:active,
+  .search-handoff-button:enabled:hover:active {
+    background-color: var(--uc-background-color-secondary) !important;
+    background-size: 24px;
+    border: 0 !important;
+    border-radius: 99px !important;
+    padding-inline-start: 48px !important;
+    --elevation: 4;
+    box-shadow: 0 0 calc((var(--elevation) * 0.225px) + 2px) rgba(0, 0, 0, 0.11), 0 calc(var(--elevation) * 0.4px) calc((var(--elevation) * 0.9px)) rgba(0, 0, 0, 0.13) !important;
+  }
+
+  .search-handoff-button:hover {
+    --elevation: 6;
+  }
+
+  .search-handoff-button.focused:not(.disabled) {
+    box-shadow: none !important;
+    outline: 2px solid var(--in-content-focus-outline-color) !important;
+    outline-offset: -1px !important;
+  }
+
+  .search-handoff-button.disabled {
+    opacity: 0 !important;
+  }
+
+  .fake-textbox {
+    color: var(--in-content-page-color) !important;
+  }
+
+  .wordmark {
+    fill: var(--uc-wordmark-color) !important;
+  }
+
+  .info {
+    background-color: var(--uc-background-color-secondary) !important;
+  }
+}
diff --git a/chrome/toolbar/navbar.css b/chrome/toolbar/navbar.css
index 9bdf5d6..6158ba8 100644
--- a/chrome/toolbar/navbar.css
+++ b/chrome/toolbar/navbar.css
@@ -26,4 +26,19 @@
 
 #nav-bar-customization-target :where(#reload-button, #stop-button) > .toolbarbutton-icon {
 	padding:  var(--toolbarbutton-inner-padding) var(--uc-toolbarbutton-inner-inline-padding) !important;
-}
\ No newline at end of file
+}
+
+/* account button */
+#navigator-toolbox > toolbar #fxa-toolbar-menu-button,
+#navigator-toolbox > toolbar #fxa-toolbar-menu-button > .toolbarbutton-badge-stack {
+	border-radius: 99px !important;
+}
+
+#nav-bar #fxa-toolbar-menu-button > .toolbarbutton-badge-stack {
+	padding: var(--toolbarbutton-inner-padding) !important;
+	margin-inline: calc(var(--uc-toolbarbutton-inner-inline-padding) - var(--toolbarbutton-inner-padding)) !important;
+}
+
+:root[fxastatus="signedin"] #fxa-avatar-image {
+	scale: 1.5 !important;
+}