diff --git a/.github/workflows/macos-universal-release-build.yml b/.github/workflows/macos-universal-release-build.yml index a940d2714..2afa50f72 100644 --- a/.github/workflows/macos-universal-release-build.yml +++ b/.github/workflows/macos-universal-release-build.yml @@ -132,7 +132,7 @@ jobs: - name: Find first .app folder name run: | cd engine/obj-x86_64-apple-darwin/dist - export APP_NAME=$(basename "$(find . -maxdepth 1 -name "Zen *.app" -type d | head -n 1)" .app) + export APP_NAME=${{ inputs.release-branch == 'twilight' && 'Twilight' || 'Zen' }} echo "APP_NAME=$APP_NAME" >> $GITHUB_ENV echo "APP_NAME=$APP_NAME" diff --git a/l10n b/l10n index 81172167f..3df11464b 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit 81172167fe97960d19b4819b2982049d06ea2437 +Subproject commit 3df11464bed7fef8c51d091e80a1ef18cfa1c65e diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs index bbbf20b48..b7cc2f845 100644 --- a/src/browser/base/content/ZenStartup.mjs +++ b/src/browser/base/content/ZenStartup.mjs @@ -122,7 +122,7 @@ _checkForWelcomePage() { if (!Services.prefs.getBoolPref('zen.welcome-screen.seen', false)) { - Services.prefs.setBoolPref('zen.welcome-screen.seen', true); + //Services.prefs.setBoolPref('zen.welcome-screen.seen', true); Services.scriptloader.loadSubScript('chrome://browser/content/zen-components/ZenWelcome.mjs', window); } }, diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css index 41256f2d1..f1bf90780 100644 --- a/src/browser/base/content/zen-styles/zen-browser-ui.css +++ b/src/browser/base/content/zen-styles/zen-browser-ui.css @@ -58,7 +58,7 @@ @media (not (-moz-windows-mica)) and (-moz-bool-pref: 'zen.view.grey-out-inactive-windows') { transition: color var(--inactive-window-transition); - &:-moz-window-inactive { + :root:not([zen-welcome-stage]) &:-moz-window-inactive { color: var(--toolbox-textcolor-inactive); &::after { background-color: var(--toolbox-bgcolor-inactive); diff --git a/src/browser/base/content/zen-styles/zen-welcome.css b/src/browser/base/content/zen-styles/zen-welcome.css index 5fef6355b..ec96fc3d9 100644 --- a/src/browser/base/content/zen-styles/zen-welcome.css +++ b/src/browser/base/content/zen-styles/zen-welcome.css @@ -145,6 +145,12 @@ } } + #zen-welcome-workspace-colors-anchor { + width: 1px; + height: 1px; + margin: 10% auto auto 30%; + } + #zen-welcome-initial-essentials-browser { width: 70%; height: 80%; @@ -180,8 +186,8 @@ } #zen-welcome-initial-essentials-browser-sidebar-essentials { - display: flex; - flex-wrap: wrap; + display: grid; + grid-template-columns: repeat(3, 1fr); gap: 0.8rem; visibility: visible; @@ -195,6 +201,7 @@ border-radius: 0.8rem; margin-top: 0.5rem; background: var(--zen-toolbar-element-bg); + grid-column: span 3; } & .tabbrowser-tab { diff --git a/src/browser/base/zen-components/ZenWelcome.mjs b/src/browser/base/zen-components/ZenWelcome.mjs index bbb5b8ed4..191741a41 100644 --- a/src/browser/base/zen-components/ZenWelcome.mjs +++ b/src/browser/base/zen-components/ZenWelcome.mjs @@ -285,8 +285,23 @@ }, }, ], - fadeIn() {}, - fadeOut() {}, + fadeIn() { + const anchor = document.createElement('div'); + anchor.id = 'zen-welcome-workspace-colors-anchor'; + document.getElementById('zen-welcome-page-content').appendChild(anchor); + gZenThemePicker.panel.setAttribute('noautohide', 'true'); + gZenThemePicker.panel.setAttribute('consumeoutsideclicks', 'false'); + PanelMultiView.openPopup(gZenThemePicker.panel, anchor, { + position: 'top', + }); + }, + async fadeOut() { + gZenThemePicker.panel.removeAttribute('noautohide'); + gZenThemePicker.panel.removeAttribute('consumeoutsideclicks'); + await animate(gZenThemePicker.panel, { opacity: [1, 0] }); + gZenThemePicker.panel.hidePopup(); + gZenThemePicker.panel.removeAttribute('style'); + }, }, { text: [ @@ -381,7 +396,16 @@ tab.toggleAttribute('visuallyselected'); }); }, - fadeOut() {}, + fadeOut() { + const selectedTabs = document.getElementById('zen-welcome-initial-essentials-browser-sidebar-essentials').querySelectorAll('.tabbrowser-tab[visuallyselected]'); + for (const tab of selectedTabs) { + const url = tab.getAttribute('data-url'); + const createdTab = window.gBrowser.addTrustedTab(url, { + inBackground: true, + }); + gZenPinnedTabManager.addToEssentials(createdTab); + } + }, }, { text: [ diff --git a/surfer.json b/surfer.json index a41724e2c..acab912b8 100644 --- a/surfer.json +++ b/surfer.json @@ -36,7 +36,7 @@ "twilight": { "backgroundColor": "#282A33", "brandShorterName": "Zen", - "brandShortName": "Zen", + "brandShortName": "Twilight", "brandFullName": "Zen Twilight", "release": { "displayVersion": "1.8t", @@ -53,4 +53,4 @@ "licenseType": "MPL-2.0" }, "updateHostname": "updates.zen-browser.app" -} \ No newline at end of file +}