1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-08 23:25:30 +02:00

Refactor app name assignment in release build workflow; update welcome screen fade animations and styles

This commit is contained in:
mr. M 2025-02-18 20:05:29 +01:00
parent c0d732da7c
commit 40b5866806
No known key found for this signature in database
GPG key ID: CBD57A2AEDBDA1FB
7 changed files with 42 additions and 11 deletions

View file

@ -132,7 +132,7 @@ jobs:
- name: Find first .app folder name - name: Find first .app folder name
run: | run: |
cd engine/obj-x86_64-apple-darwin/dist 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" >> $GITHUB_ENV
echo "APP_NAME=$APP_NAME" echo "APP_NAME=$APP_NAME"

2
l10n

@ -1 +1 @@
Subproject commit 81172167fe97960d19b4819b2982049d06ea2437 Subproject commit 3df11464bed7fef8c51d091e80a1ef18cfa1c65e

View file

@ -122,7 +122,7 @@
_checkForWelcomePage() { _checkForWelcomePage() {
if (!Services.prefs.getBoolPref('zen.welcome-screen.seen', false)) { 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); Services.scriptloader.loadSubScript('chrome://browser/content/zen-components/ZenWelcome.mjs', window);
} }
}, },

View file

@ -58,7 +58,7 @@
@media (not (-moz-windows-mica)) and (-moz-bool-pref: 'zen.view.grey-out-inactive-windows') { @media (not (-moz-windows-mica)) and (-moz-bool-pref: 'zen.view.grey-out-inactive-windows') {
transition: color var(--inactive-window-transition); transition: color var(--inactive-window-transition);
&:-moz-window-inactive { :root:not([zen-welcome-stage]) &:-moz-window-inactive {
color: var(--toolbox-textcolor-inactive); color: var(--toolbox-textcolor-inactive);
&::after { &::after {
background-color: var(--toolbox-bgcolor-inactive); background-color: var(--toolbox-bgcolor-inactive);

View file

@ -145,6 +145,12 @@
} }
} }
#zen-welcome-workspace-colors-anchor {
width: 1px;
height: 1px;
margin: 10% auto auto 30%;
}
#zen-welcome-initial-essentials-browser { #zen-welcome-initial-essentials-browser {
width: 70%; width: 70%;
height: 80%; height: 80%;
@ -180,8 +186,8 @@
} }
#zen-welcome-initial-essentials-browser-sidebar-essentials { #zen-welcome-initial-essentials-browser-sidebar-essentials {
display: flex; display: grid;
flex-wrap: wrap; grid-template-columns: repeat(3, 1fr);
gap: 0.8rem; gap: 0.8rem;
visibility: visible; visibility: visible;
@ -195,6 +201,7 @@
border-radius: 0.8rem; border-radius: 0.8rem;
margin-top: 0.5rem; margin-top: 0.5rem;
background: var(--zen-toolbar-element-bg); background: var(--zen-toolbar-element-bg);
grid-column: span 3;
} }
& .tabbrowser-tab { & .tabbrowser-tab {

View file

@ -285,8 +285,23 @@
}, },
}, },
], ],
fadeIn() {}, fadeIn() {
fadeOut() {}, 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: [ text: [
@ -381,7 +396,16 @@
tab.toggleAttribute('visuallyselected'); 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: [ text: [

View file

@ -36,7 +36,7 @@
"twilight": { "twilight": {
"backgroundColor": "#282A33", "backgroundColor": "#282A33",
"brandShorterName": "Zen", "brandShorterName": "Zen",
"brandShortName": "Zen", "brandShortName": "Twilight",
"brandFullName": "Zen Twilight", "brandFullName": "Zen Twilight",
"release": { "release": {
"displayVersion": "1.8t", "displayVersion": "1.8t",
@ -53,4 +53,4 @@
"licenseType": "MPL-2.0" "licenseType": "MPL-2.0"
}, },
"updateHostname": "updates.zen-browser.app" "updateHostname": "updates.zen-browser.app"
} }