Fixed UI for release!

configs/common/mozconfig

@@ -1,6 +1,7 @@
 # Browser branding
 ac_add_options --enable-update-channel=release
 
+ac_add_options --with-branding=beta
 ac_add_options --with-app-name=${binName}
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_VENDOR="${vendor}"

gluon.json

@@ -29,7 +29,7 @@
       "brandShortName": "Zen Browser",
       "brandFullName": "Zen Browser",
       "release": {
-        "displayVersion": "1.0.0-a.21",
+        "displayVersion": "1.0.0-a.10",
         "github": {
           "repo": "zen-browser/desktop"
         },

src/browser/base/content/ZenSidebarManager.mjs

@@ -108,7 +108,7 @@ var gZenBrowserManagerSidebar = {
   },
 
   _updateArrowScrollMaxHeight(num) {
-    let content = document.querySelector("#tabbrowser-arrowscrollbox::part(scrollbox-clip)");
+    let content = document.querySelector("#tabbrowser-arrowscrollbox");
     let height = (this.MAX_SIDEBAR_PANELS - num) * 81;
     content.style.maxHeight = `${height}px`;
   },

src/browser/components/customizableui/CustomizableUI-sys-mjs.patch

@@ -1,5 +1,5 @@
 diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
-index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..678eceea71a7b0ada429fbbd521c20cfda97a329 100644
+index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..87c8322aad2f174023d1b3a6ce1555ca64e3e026 100644
 --- a/browser/components/customizableui/CustomizableUI.sys.mjs
 +++ b/browser/components/customizableui/CustomizableUI.sys.mjs
 @@ -25,7 +25,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
@@ -11,7 +11,7 @@ index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..678eceea71a7b0ada429fbbd521c20cf
  
  const kSpecialWidgetPfx = "customizableui-special-";
  
-@@ -249,14 +249,12 @@ var CustomizableUIInternal = {
+@@ -249,14 +249,11 @@ var CustomizableUIInternal = {
        Services.policies.isAllowed("removeHomeButtonByDefault")
          ? null
          : "home-button",
@@ -21,13 +21,13 @@ index 5b09402dc1e19e89dcdfc8b5b45a2004c8cec0e6..678eceea71a7b0ada429fbbd521c20cf
 -      "save-to-pocket-button",
        "downloads-button",
        AppConstants.MOZ_DEV_EDITION ? "developer-button" : null,
-       "fxa-toolbar-menu-button",
+-      "fxa-toolbar-menu-button",
        lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
 +      "wrapper-sidebar-button",
      ].filter(name => name);
  
      this.registerArea(
-@@ -287,7 +285,7 @@ var CustomizableUIInternal = {
+@@ -287,7 +284,7 @@ var CustomizableUIInternal = {
        {
          type: CustomizableUI.TYPE_TOOLBAR,
          defaultPlacements: [

src/browser/components/zen-welcome/welcome.css

@@ -65,11 +65,10 @@ body {
   outline: none !important;
   cursor: auto;
   user-select: none;
-  background: var(--color-gray-80) !important;
 }
 
 .cardGroup .card.selected {
-  border: 2px solid var(--in-content-primary-button-background-hover) !important;
+  border: 2px solid var(--zen-colors-primary) !important;
   transform: scale(1.1);
 }
 

src/browser/components/zen-welcome/welcome.html

@@ -37,7 +37,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
       <button
         id="welcomeNext"
-        class="primary ghost-button"
+        class="primary"
         data-l10n-id="welcome-dialog-get-started"
       ></button>
     </div>
@@ -50,7 +50,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
       <hbox>
         <button
-          class="primary ghost-button"
+          class="primary"
           id="importBrowser"
           data-l10n-id="welcome-dialog-import-action"
         ></button>
@@ -68,7 +68,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
       <div id="themeList" class="cardGroup"></div>
       <button
         id="themeNext"
-        class="primary ghost-button"
+        class="primary"
         data-l10n-id="welcome-dialog-theme-action"
       ></button>
     </div>
@@ -79,7 +79,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
       <div id="searchList" class="cardGroup"></div>
       <button
         id="searchNext"
-        class="primary ghost-button"
+        class="primary"
         data-l10n-id="welcome-dialog-search-action"
       ></button>
     </div>
@@ -89,7 +89,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
       <p data-l10n-id="welcome-dialog-thanks-subtext"></p>
       <button
         id="thanksNext"
-        class="primary ghost-button"
+        class="primary"
         data-l10n-id="welcome-dialog-thanks-action"
       ></button>
     </div>

src/browser/themes/shared/preferences/zen-preferences.css

@@ -20,7 +20,9 @@ groupbox {
   position: relative;
 }
 
-.subcategory + groupbox {
+.subcategory + groupbox,
+#noFxaAccount,
+#hasFxaAccount {
   border-top-left-radius: 15px;
   border-top-right-radius: 15px;
   margin-top: 5px;