mirror of
https://github.com/zen-browser/desktop.git
synced 2025-09-08 12:28:22 +00:00
Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
fafde6562a | ||
![]() |
843a383078 | ||
![]() |
379b1ca292 | ||
![]() |
36063ebdcd | ||
![]() |
05969ffeb6 | ||
![]() |
7ade6ec0e0 | ||
![]() |
f355828240 | ||
![]() |
3159536fb5 | ||
![]() |
2e3aa4865e | ||
![]() |
630d1a89c8 | ||
![]() |
9f3a14a673 | ||
![]() |
fbc088225c | ||
![]() |
dcd9e0b94f | ||
![]() |
617a2c89cd | ||
![]() |
de8a049e93 | ||
![]() |
4f6e6e0e39 | ||
![]() |
f790e13f14 | ||
![]() |
f1a18bb112 | ||
![]() |
4725b936c0 | ||
![]() |
b7db0edf41 | ||
![]() |
c49769a678 | ||
![]() |
d9a95b9a8f |
1
.gitattributes
vendored
1
.gitattributes
vendored
@@ -1,2 +1 @@
|
|||||||
*.patch linguist-language=C++
|
*.patch linguist-language=C++
|
||||||
.github/workflows/object/*.tar.gz filter=lfs diff=lfs merge=lfs -text
|
|
||||||
|
25
.github/workflows/alpha.yml
vendored
25
.github/workflows/alpha.yml
vendored
@@ -53,7 +53,7 @@ jobs:
|
|||||||
- name: Bump version
|
- name: Bump version
|
||||||
if: ${{ github.event.inputs.update_version == 'true' }}
|
if: ${{ github.event.inputs.update_version == 'true' }}
|
||||||
run: |
|
run: |
|
||||||
pnpm surfer ci --brand alpha --bump prepatch
|
pnpm surfer ci --brand alpha --bump prerelease
|
||||||
|
|
||||||
- name: Bump version without new version
|
- name: Bump version without new version
|
||||||
if: ${{ github.event.inputs.update_version == 'false' }}
|
if: ${{ github.event.inputs.update_version == 'false' }}
|
||||||
@@ -317,23 +317,16 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
submodules: recursive
|
submodules: recursive
|
||||||
token: ${{ secrets.DEPLOY_KEY }}
|
token: ${{ secrets.DEPLOY_KEY }}
|
||||||
lfs: true
|
|
||||||
|
|
||||||
- name: Git Pull
|
- name: Git Pull
|
||||||
run: |
|
run: |
|
||||||
git pull
|
git pull
|
||||||
git lfs pull
|
|
||||||
|
|
||||||
- uses: actions/download-artifact@v4
|
- uses: actions/download-artifact@v4
|
||||||
|
|
||||||
- name: List
|
- name: List
|
||||||
run: find .
|
run: find .
|
||||||
|
|
||||||
- name: Unpack windows build (.tar.gz)
|
|
||||||
run: |
|
|
||||||
tar -xvf .github/workflows/object/windows-x64-signed-generic.tar.gz -C .
|
|
||||||
tar -xvf .github/workflows/object/windows-x64-signed-specific.tar.gz -C .
|
|
||||||
|
|
||||||
- name: Clone updates repo
|
- name: Clone updates repo
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
with:
|
with:
|
||||||
@@ -348,8 +341,8 @@ jobs:
|
|||||||
cp -a ../linux_update_manifest_generic/. updates/
|
cp -a ../linux_update_manifest_generic/. updates/
|
||||||
cp -a ../linux_update_manifest_specific/. updates/
|
cp -a ../linux_update_manifest_specific/. updates/
|
||||||
|
|
||||||
cp -a ../windows-x64-signed-generic/update_manifest/. updates/
|
cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/
|
||||||
cp -a ../windows-x64-signed-specific/update_manifest/. updates/
|
cp -a ../.github/workflows/object/windows-x64-signed-specific/update_manifest/. updates/
|
||||||
|
|
||||||
cp -a ../macos_update_manifest_aarch64/. updates/
|
cp -a ../macos_update_manifest_aarch64/. updates/
|
||||||
cp -a ../macos_update_manifest_x64/. updates/
|
cp -a ../macos_update_manifest_x64/. updates/
|
||||||
@@ -376,16 +369,16 @@ jobs:
|
|||||||
zen-generic.AppImage.zsync
|
zen-generic.AppImage.zsync
|
||||||
zen-specific.AppImage
|
zen-specific.AppImage
|
||||||
zen-specific.AppImage.zsync
|
zen-specific.AppImage.zsync
|
||||||
windows-x64-signed-generic/zen.win-generic.zip
|
.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
|
||||||
windows-x64-signed-specific/zen.win-specific.zip
|
.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
|
||||||
linux.mar
|
linux.mar
|
||||||
linux-generic.mar
|
linux-generic.mar
|
||||||
windows-x64-signed-generic/windows-generic.mar
|
.github/workflows/object/windows-x64-signed-generic/windows-generic.mar
|
||||||
windows-x64-signed-specific/windows.mar
|
.github/workflows/object/windows-x64-signed-specific/windows.mar
|
||||||
macos-x64.mar
|
macos-x64.mar
|
||||||
macos-aarch64.mar
|
macos-aarch64.mar
|
||||||
windows-x64-signed-specific/zen.installer.exe
|
.github/workflows/object/windows-x64-signed-specific/zen.installer.exe
|
||||||
windows-x64-signed-generic/zen.installer-generic.exe
|
.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
|
||||||
zen.macos-x64.dmg
|
zen.macos-x64.dmg
|
||||||
zen.macos-aarch64.dmg
|
zen.macos-aarch64.dmg
|
||||||
|
|
||||||
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:805f5d9f727596007dc64057d456e87a2648dff596230ca12af6cf48860843fa
|
|
||||||
size 237797081
|
|
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<updates>
|
||||||
|
<update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093302">
|
||||||
|
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="1d57da64dfe08f84093cb58ee28037880740541757a2cab73e5ac2adcc5ea67b33783e2947c955bca50e74d8b7203ba54f71e61395d95fa2c43f2a9ce2c7b1c6" size="72337408"/>
|
||||||
|
</update>
|
||||||
|
</updates>
|
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<updates>
|
||||||
|
<update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093302">
|
||||||
|
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="1d57da64dfe08f84093cb58ee28037880740541757a2cab73e5ac2adcc5ea67b33783e2947c955bca50e74d8b7203ba54f71e61395d95fa2c43f2a9ce2c7b1c6" size="72337408"/>
|
||||||
|
</update>
|
||||||
|
</updates>
|
BIN
.github/workflows/object/windows-x64-signed-generic/windows-generic.mar
vendored
Normal file
BIN
.github/workflows/object/windows-x64-signed-generic/windows-generic.mar
vendored
Normal file
Binary file not shown.
BIN
.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
vendored
Normal file
BIN
.github/workflows/object/windows-x64-signed-generic/zen.installer-generic.exe
vendored
Normal file
Binary file not shown.
BIN
.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
vendored
Normal file
BIN
.github/workflows/object/windows-x64-signed-generic/zen.win-generic.zip
vendored
Normal file
Binary file not shown.
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:51d3bb5508804e438755658157f0f18331675b418bdb11db485f938a4fc5fd8a
|
|
||||||
size 237484305
|
|
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<updates>
|
||||||
|
<update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093142">
|
||||||
|
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="ed11d2af249f3c6290943c9a8bc7a4eab7a2bfc24268b927a4ea003e168cf509760782d01e974492b4af477ec649d627c6c69290f1e0c91849f44b09cc85febe" size="72214812"/>
|
||||||
|
</update>
|
||||||
|
</updates>
|
@@ -0,0 +1,6 @@
|
|||||||
|
<?xml version="1.0"?>
|
||||||
|
<updates>
|
||||||
|
<update type="minor" displayVersion="1.0.1-a" appVersion="1.0.1-a" platformVersion="130.0" buildID="20240916093142">
|
||||||
|
<patch type="complete" URL="https://github.com/zen-browser/desktop/releases/download/1.0.1-a/windows-generic.mar" hashFunction="sha512" hashValue="ed11d2af249f3c6290943c9a8bc7a4eab7a2bfc24268b927a4ea003e168cf509760782d01e974492b4af477ec649d627c6c69290f1e0c91849f44b09cc85febe" size="72214812"/>
|
||||||
|
</update>
|
||||||
|
</updates>
|
BIN
.github/workflows/object/windows-x64-signed-specific/windows.mar
vendored
Normal file
BIN
.github/workflows/object/windows-x64-signed-specific/windows.mar
vendored
Normal file
Binary file not shown.
BIN
.github/workflows/object/windows-x64-signed-specific/zen.installer.exe
vendored
Normal file
BIN
.github/workflows/object/windows-x64-signed-specific/zen.installer.exe
vendored
Normal file
Binary file not shown.
BIN
.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
vendored
Normal file
BIN
.github/workflows/object/windows-x64-signed-specific/zen.win-specific.zip
vendored
Normal file
Binary file not shown.
18
README.md
18
README.md
@@ -40,6 +40,24 @@ Zen is built with performance in mind, and we have optimized the browser to be a
|
|||||||
|
|
||||||
Zen is available for Linux, macOS, and Windows. You can download the latest version from the official website at [zen-browser.app](https://zen-browser.app/download), or from the [GitHub Releases](https://github.com/zen-browser/desktop/releases) page.
|
Zen is available for Linux, macOS, and Windows. You can download the latest version from the official website at [zen-browser.app](https://zen-browser.app/download), or from the [GitHub Releases](https://github.com/zen-browser/desktop/releases) page.
|
||||||
|
|
||||||
|
### Windows
|
||||||
|
|
||||||
|
#### Winget
|
||||||
|
|
||||||
|
- Generic
|
||||||
|
|
||||||
|
```
|
||||||
|
winget install --id Zen-Team.Zen-Browser
|
||||||
|
```
|
||||||
|
|
||||||
|
- Optimized
|
||||||
|
|
||||||
|
```
|
||||||
|
winget install --id Zen-Team.Zen-Browser.Optimized
|
||||||
|
```
|
||||||
|
|
||||||
|
####
|
||||||
|
|
||||||
### macOS
|
### macOS
|
||||||
|
|
||||||
- Requires macOS 10.15 or later
|
- Requires macOS 10.15 or later
|
||||||
|
@@ -34,8 +34,11 @@ function SignAndPackage($name) {
|
|||||||
$env:MAR="$PWD\\build\\winsign\\mar.exe"
|
$env:MAR="$PWD\\build\\winsign\\mar.exe"
|
||||||
if ($name -eq "generic") {
|
if ($name -eq "generic") {
|
||||||
$env:SURFER_COMPAT="true"
|
$env:SURFER_COMPAT="true"
|
||||||
|
} else {
|
||||||
|
rm env:SURFER_COMPAT -ErrorAction SilentlyContinue
|
||||||
}
|
}
|
||||||
|
|
||||||
|
echo "Compat Mode? $env:SURFER_COMPAT"
|
||||||
pnpm surfer package --verbose
|
pnpm surfer package --verbose
|
||||||
|
|
||||||
# In the release script, we do the following:
|
# In the release script, we do the following:
|
||||||
@@ -67,13 +70,22 @@ function SignAndPackage($name) {
|
|||||||
# Move the zip
|
# Move the zip
|
||||||
mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
|
mv (Get-Item .\dist\*.en-US.win64.zip) windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
|
||||||
|
|
||||||
|
# Extract the zip, sign everything inside, and repackage it
|
||||||
|
Expand-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name.zip -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name
|
||||||
|
rm windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
|
||||||
|
$files = Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.exe
|
||||||
|
$files += Get-ChildItem windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -Include *.dll
|
||||||
|
signtool.exe sign /n "$SignIdentity" /t http://time.certum.pl/ /fd sha1 /v $files
|
||||||
|
Compress-Archive -Path windsign-temp\windows-x64-signed-$name\zen.win-$name -DestinationPath windsign-temp\windows-x64-signed-$name\zen.win-$name.zip
|
||||||
|
rmdir windsign-temp\windows-x64-signed-$name\zen.win-$name -Recurse -ErrorAction SilentlyContinue
|
||||||
|
|
||||||
# Move the manifest
|
# Move the manifest
|
||||||
foreach ($file in Get-ChildItem .\dist\update\) {
|
mv .\dist\update\. windsign-temp\windows-x64-signed-$name\update_manifest
|
||||||
mv ".\\dist\\update\\$file" windsign-temp\windows-x64-signed-$name\update_manifest
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "Invoking tar for $name"
|
echo "Invoking tar for $name"
|
||||||
tar -czvf .\.github\workflows\object\windows-x64-signed-$name.tar.gz -C .\windsign-temp\windows-x64-signed-$name .
|
# note: We need to sign it into a parent folder, called windows-x64-signed-$name
|
||||||
|
rmdir .\.github\workflows\object\windows-x64-signed-$name -Recurse -ErrorAction SilentlyContinue
|
||||||
|
mv .\windsign-temp\windows-x64-signed-$name .\.github\workflows\object\windows-x64-signed-$name -Force
|
||||||
|
|
||||||
echo "Finished $name"
|
echo "Finished $name"
|
||||||
}
|
}
|
||||||
|
@@ -33,7 +33,7 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/zen-browser/core#readme",
|
"homepage": "https://github.com/zen-browser/core#readme",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@zen-browser/surfer": "^1.4.18"
|
"@zen-browser/surfer": "^1.4.20"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"husky": "^9.1.5",
|
"husky": "^9.1.5",
|
||||||
|
10
pnpm-lock.yaml
generated
10
pnpm-lock.yaml
generated
@@ -9,8 +9,8 @@ importers:
|
|||||||
.:
|
.:
|
||||||
dependencies:
|
dependencies:
|
||||||
'@zen-browser/surfer':
|
'@zen-browser/surfer':
|
||||||
specifier: ^1.4.18
|
specifier: ^1.4.20
|
||||||
version: 1.4.18
|
version: 1.4.20
|
||||||
devDependencies:
|
devDependencies:
|
||||||
husky:
|
husky:
|
||||||
specifier: ^9.1.5
|
specifier: ^9.1.5
|
||||||
@@ -119,8 +119,8 @@ packages:
|
|||||||
'@types/node@17.0.45':
|
'@types/node@17.0.45':
|
||||||
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
|
resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
|
||||||
|
|
||||||
'@zen-browser/surfer@1.4.18':
|
'@zen-browser/surfer@1.4.20':
|
||||||
resolution: {integrity: sha512-NFqF5amqa4TuGFk+uVQNY4FngIvyhXvtZdpHUbU8Oeq3nfKE+bsLUHbFz8j9I5sFLQkuHmCsfTtR5gKA5el4YA==}
|
resolution: {integrity: sha512-M9+Jax/B+UQsebJ0K3BaNEKUi/EelKufvG2frWQ4uVAQF9LzFwyyliS5wbcUTs3Ufit4b8xQK7ddt02DmK/Lng==}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
ansi-escapes@7.0.0:
|
ansi-escapes@7.0.0:
|
||||||
@@ -1003,7 +1003,7 @@ snapshots:
|
|||||||
|
|
||||||
'@types/node@17.0.45': {}
|
'@types/node@17.0.45': {}
|
||||||
|
|
||||||
'@zen-browser/surfer@1.4.18':
|
'@zen-browser/surfer@1.4.20':
|
||||||
dependencies:
|
dependencies:
|
||||||
'@resvg/resvg-js': 1.4.0
|
'@resvg/resvg-js': 1.4.0
|
||||||
async-icns: 1.0.2
|
async-icns: 1.0.2
|
||||||
|
Submodule src/browser/base/content/zen-components updated: 95af4ba082...5f61c3b5af
@@ -32,7 +32,7 @@
|
|||||||
* same shadow from the browser window on top. */
|
* same shadow from the browser window on top. */
|
||||||
box-shadow:
|
box-shadow:
|
||||||
var(--uc-tweak-rounded-corners-shadow, 0 0 transparent),
|
var(--uc-tweak-rounded-corners-shadow, 0 0 transparent),
|
||||||
0 0 0 16px var(--zen-themed-toolbar-bg) !important;
|
0 0 0 16px var(--zen-main-browser-background) !important;
|
||||||
clip-path: inset(0);
|
clip-path: inset(0);
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
@@ -30,6 +30,8 @@
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
padding: var(--zen-compact-toolbox-margin) !important;
|
padding: var(--zen-compact-toolbox-margin) !important;
|
||||||
|
|
||||||
|
min-width: 500px !important;
|
||||||
|
|
||||||
& #titlebar {
|
& #titlebar {
|
||||||
border: 1px solid var(--zen-colors-border);
|
border: 1px solid var(--zen-colors-border);
|
||||||
transition-delay: 200ms;
|
transition-delay: 200ms;
|
||||||
@@ -48,6 +50,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#tabbrowser-tabpanels {
|
||||||
|
padding: var(--zen-element-separation) !important;
|
||||||
|
padding-top: 0 !important;
|
||||||
|
}
|
||||||
|
|
||||||
@media not (-moz-bool-pref: 'zen.view.sidebar-expanded') {
|
@media not (-moz-bool-pref: 'zen.view.sidebar-expanded') {
|
||||||
#navigator-toolbox {
|
#navigator-toolbox {
|
||||||
width: fit-content !important;
|
width: fit-content !important;
|
||||||
@@ -87,11 +94,9 @@
|
|||||||
* 4. Calculate toolbar height, taken from zen-urlbar.css
|
* 4. Calculate toolbar height, taken from zen-urlbar.css
|
||||||
*/
|
*/
|
||||||
--zen-compact-toolbox-margin: calc(
|
--zen-compact-toolbox-margin: calc(
|
||||||
var(--zen-compact-toolbox-margin-single) + 0.15rem + var(--zen-element-separation) +
|
var(--zen-element-separation) + 0.8rem +
|
||||||
(18px + (var(--toolbarbutton-inner-padding) * 2))
|
(18px + (var(--toolbarbutton-inner-padding) * 2))
|
||||||
)
|
) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
|
||||||
var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single)
|
|
||||||
var(--zen-compact-toolbox-margin-single);
|
|
||||||
|
|
||||||
:root[zen-sidebar-legacy='true'] & {
|
:root[zen-sidebar-legacy='true'] & {
|
||||||
--zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2)
|
--zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2)
|
||||||
|
@@ -54,3 +54,8 @@ toolbar {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Menubar */
|
||||||
|
#toolbar-menubar {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
@@ -22,6 +22,8 @@
|
|||||||
|
|
||||||
padding: var(--zen-toolbox-padding);
|
padding: var(--zen-toolbox-padding);
|
||||||
padding-top: var(--zen-toolbox-top-align);
|
padding-top: var(--zen-toolbox-top-align);
|
||||||
|
|
||||||
|
margin-top: 0 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -42,8 +44,14 @@
|
|||||||
max-width: unset !important;
|
max-width: unset !important;
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
|
|
||||||
|
overflow: hidden;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
|
border-radius: var(--border-radius-medium);
|
||||||
|
|
||||||
& .tab-background {
|
& .tab-background {
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
margin: 2px 2px;
|
||||||
|
|
||||||
& .tab-context-line {
|
& .tab-context-line {
|
||||||
margin: 0 0px !important;
|
margin: 0 0px !important;
|
||||||
@@ -72,6 +80,7 @@
|
|||||||
margin-inline-end: 0 !important;
|
margin-inline-end: 0 !important;
|
||||||
padding-top: 0 !important;
|
padding-top: 0 !important;
|
||||||
border-top: solid transparent 0px !important;
|
border-top: solid transparent 0px !important;
|
||||||
|
margin: 0 2px !important;
|
||||||
|
|
||||||
&[showborder] {
|
&[showborder] {
|
||||||
padding-top: 4px !important;
|
padding-top: 4px !important;
|
||||||
@@ -196,6 +205,7 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
padding-top: calc(var(--zen-toolbox-padding) * 2);
|
padding-top: calc(var(--zen-toolbox-padding) * 2);
|
||||||
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
:root:has(&) #zen-sidebar-splitter {
|
:root:has(&) #zen-sidebar-splitter {
|
||||||
@@ -349,4 +359,13 @@
|
|||||||
order: 2;
|
order: 2;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Mark: Override the default tab close button */
|
||||||
|
#tabbrowser-tabs {
|
||||||
|
& .tabbrowser-tab {
|
||||||
|
&[pinned] .tab-close-button {
|
||||||
|
display: none !important;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
@@ -198,6 +198,19 @@ var gZenMarketplaceManager = {
|
|||||||
return this.__browser;
|
return this.__browser;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
__throttle(mainFunction, delay) {
|
||||||
|
let timerFlag = null;
|
||||||
|
|
||||||
|
return (...args) => {
|
||||||
|
if (timerFlag === null) {
|
||||||
|
mainFunction(...args);
|
||||||
|
timerFlag = setTimeout(() => {
|
||||||
|
timerFlag = null;
|
||||||
|
}, delay);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
},
|
||||||
|
|
||||||
async _buildThemesList() {
|
async _buildThemesList() {
|
||||||
if (!this.themesList) return;
|
if (!this.themesList) return;
|
||||||
if (this._doNotRebuildThemesList) {
|
if (this._doNotRebuildThemesList) {
|
||||||
@@ -214,6 +227,8 @@ var gZenMarketplaceManager = {
|
|||||||
const themeList = document.createElement('div');
|
const themeList = document.createElement('div');
|
||||||
|
|
||||||
for (let theme of Object.values(themes)) {
|
for (let theme of Object.values(themes)) {
|
||||||
|
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
|
||||||
|
|
||||||
const fragment = window.MozXULElement.parseXULToFragment(`
|
const fragment = window.MozXULElement.parseXULToFragment(`
|
||||||
<vbox class="zenThemeMarketplaceItem">
|
<vbox class="zenThemeMarketplaceItem">
|
||||||
<vbox class="zenThemeMarketplaceItemContent">
|
<vbox class="zenThemeMarketplaceItemContent">
|
||||||
@@ -223,14 +238,13 @@ var gZenMarketplaceManager = {
|
|||||||
<description class="description-deemphasized zenThemeMarketplaceItemDescription"></description>
|
<description class="description-deemphasized zenThemeMarketplaceItemDescription"></description>
|
||||||
</vbox>
|
</vbox>
|
||||||
<hbox class="zenThemeMarketplaceItemActions">
|
<hbox class="zenThemeMarketplaceItemActions">
|
||||||
<button class="zenThemeMarketplaceItemConfigureButton" hidden="true"></button>
|
<button id="zenThemeMarketplaceItemConfigureButton-${sanitizedName}" class="zenThemeMarketplaceItemConfigureButton" hidden="true"></button>
|
||||||
<button class="zenThemeMarketplaceItemUninstallButton" data-l10n-id="zen-theme-marketplace-remove-button" zen-theme-id="${theme.id}"></button>
|
<button class="zenThemeMarketplaceItemUninstallButton" data-l10n-id="zen-theme-marketplace-remove-button" zen-theme-id="${theme.id}"></button>
|
||||||
</hbox>
|
</hbox>
|
||||||
</vbox>
|
</vbox>
|
||||||
`);
|
`);
|
||||||
|
|
||||||
const themeName = `${theme.name} (v${theme.version || '1.0.0'})`;
|
const themeName = `${theme.name} (v${theme.version || '1.0.0'})`;
|
||||||
const sanitizedName = `theme-${theme.name?.replaceAll(/\s/g, '-')?.replaceAll(/[^A-z_-]+/g, '')}`;
|
|
||||||
|
|
||||||
const base = fragment.querySelector('.zenThemeMarketplaceItem');
|
const base = fragment.querySelector('.zenThemeMarketplaceItem');
|
||||||
const baseHeader = fragment.querySelector('#zenThemeMarketplaceItemContentHeader');
|
const baseHeader = fragment.querySelector('#zenThemeMarketplaceItemContentHeader');
|
||||||
@@ -279,8 +293,10 @@ var gZenMarketplaceManager = {
|
|||||||
|
|
||||||
if (!event.target.hasAttribute('pressed')) {
|
if (!event.target.hasAttribute('pressed')) {
|
||||||
await this.disableTheme(themeId);
|
await this.disableTheme(themeId);
|
||||||
|
document.getElementById(`zenThemeMarketplaceItemConfigureButton-${sanitizedName}`).setAttribute('hidden', true);
|
||||||
} else {
|
} else {
|
||||||
await this.enableTheme(themeId);
|
await this.enableTheme(themeId);
|
||||||
|
document.getElementById(`zenThemeMarketplaceItemConfigureButton-${sanitizedName}`).removeAttribute('hidden');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -307,7 +323,7 @@ var gZenMarketplaceManager = {
|
|||||||
if (preferences.length > 0) {
|
if (preferences.length > 0) {
|
||||||
const preferencesWrapper = document.createXULElement('vbox');
|
const preferencesWrapper = document.createXULElement('vbox');
|
||||||
|
|
||||||
preferencesWrapper.classList.add('zenThemeMarketplaceItemPreferences');
|
preferencesWrapper.setAttribute('flex', '1');
|
||||||
|
|
||||||
for (let entry of preferences) {
|
for (let entry of preferences) {
|
||||||
const { property, label, type } = entry;
|
const { property, label, type } = entry;
|
||||||
@@ -395,7 +411,7 @@ var gZenMarketplaceManager = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
case 'checkbox': {
|
case 'checkbox': {
|
||||||
const fragment = window.MozXULElement.parseXULToFragment(`
|
const checkbox = window.MozXULElement.parseXULToFragment(`
|
||||||
<hbox class="zenThemeMarketplaceItemPreference">
|
<hbox class="zenThemeMarketplaceItemPreference">
|
||||||
<checkbox class="zenThemeMarketplaceItemPreferenceCheckbox" label="${label}" tooltiptext="${property}" zen-pref="${property}"></checkbox>
|
<checkbox class="zenThemeMarketplaceItemPreferenceCheckbox" label="${label}" tooltiptext="${property}" zen-pref="${property}"></checkbox>
|
||||||
</hbox>
|
</hbox>
|
||||||
@@ -403,10 +419,10 @@ var gZenMarketplaceManager = {
|
|||||||
|
|
||||||
// Checkbox only works with "true" and "false" values, it's not like HTML checkboxes.
|
// Checkbox only works with "true" and "false" values, it's not like HTML checkboxes.
|
||||||
if (Services.prefs.getBoolPref(property, false)) {
|
if (Services.prefs.getBoolPref(property, false)) {
|
||||||
fragment.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').setAttribute('checked', 'true');
|
checkbox.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').setAttribute('checked', 'true');
|
||||||
}
|
}
|
||||||
|
|
||||||
fragment.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').addEventListener('click', (event) => {
|
checkbox.querySelector('.zenThemeMarketplaceItemPreferenceCheckbox').addEventListener('click', (event) => {
|
||||||
let target = event.target.closest('.zenThemeMarketplaceItemPreferenceCheckbox');
|
let target = event.target.closest('.zenThemeMarketplaceItemPreferenceCheckbox');
|
||||||
let key = target.getAttribute('zen-pref');
|
let key = target.getAttribute('zen-pref');
|
||||||
let checked = target.hasAttribute('checked');
|
let checked = target.hasAttribute('checked');
|
||||||
@@ -420,7 +436,51 @@ var gZenMarketplaceManager = {
|
|||||||
Services.prefs.setBoolPref(key, !checked);
|
Services.prefs.setBoolPref(key, !checked);
|
||||||
});
|
});
|
||||||
|
|
||||||
preferencesWrapper.appendChild(fragment);
|
preferencesWrapper.appendChild(checkbox);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
case 'string': {
|
||||||
|
const container = document.createXULElement('hbox');
|
||||||
|
container.classList.add('zenThemeMarketplaceItemPreference');
|
||||||
|
container.setAttribute('align', 'center');
|
||||||
|
container.setAttribute('role', 'group');
|
||||||
|
|
||||||
|
const savedValue = Services.prefs.getStringPref(property, '');
|
||||||
|
const sanitizedProperty = property?.replaceAll(/\./g, '-');
|
||||||
|
|
||||||
|
const input = document.createElement('input');
|
||||||
|
input.setAttribute('flex', '1');
|
||||||
|
input.setAttribute('type', 'text');
|
||||||
|
input.id = `${sanitizedProperty}-input`;
|
||||||
|
input.value = savedValue;
|
||||||
|
|
||||||
|
input.addEventListener(
|
||||||
|
'input',
|
||||||
|
this.__throttle((event) => {
|
||||||
|
const value = event.target.value;
|
||||||
|
|
||||||
|
Services.prefs.setStringPref(property, value);
|
||||||
|
|
||||||
|
if (value === '') {
|
||||||
|
browser.document.querySelector(':root').style.removeProperty(`--${sanitizedProperty}`);
|
||||||
|
} else {
|
||||||
|
browser.document.querySelector(':root').style.setProperty(`--${sanitizedProperty}`, value);
|
||||||
|
}
|
||||||
|
}, 500)
|
||||||
|
);
|
||||||
|
|
||||||
|
const nameLabel = document.createXULElement('label');
|
||||||
|
nameLabel.setAttribute('flex', '1');
|
||||||
|
nameLabel.setAttribute('class', 'zenThemeMarketplaceItemPreferenceLabel');
|
||||||
|
nameLabel.setAttribute('value', label);
|
||||||
|
nameLabel.setAttribute('tooltiptext', property);
|
||||||
|
|
||||||
|
container.appendChild(nameLabel);
|
||||||
|
container.appendChild(input);
|
||||||
|
container.setAttribute('aria-labelledby', label);
|
||||||
|
|
||||||
|
preferencesWrapper.appendChild(container);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -1,8 +1,8 @@
|
|||||||
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
|
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df236fcefae7 100644
|
index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..c776348e776c1f9efc9b9f2ca479b1050f0a750b 100644
|
||||||
--- a/browser/components/tabbrowser/content/tabbrowser.js
|
--- a/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
+++ b/browser/components/tabbrowser/content/tabbrowser.js
|
+++ b/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
@@ -453,10 +453,13 @@
|
@@ -453,10 +453,12 @@
|
||||||
},
|
},
|
||||||
|
|
||||||
get _numPinnedTabs() {
|
get _numPinnedTabs() {
|
||||||
@@ -13,12 +13,11 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
|
|||||||
+ if (!tab.pinned) {
|
+ if (!tab.pinned) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
+ if (tab.hidden) continue;
|
|
||||||
+ i++;
|
+ i++;
|
||||||
}
|
}
|
||||||
return i;
|
return i;
|
||||||
},
|
},
|
||||||
@@ -2704,6 +2707,11 @@
|
@@ -2704,6 +2706,11 @@
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,7 +29,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
|
|||||||
if (!UserInteraction.running("browser.tabs.opening", window)) {
|
if (!UserInteraction.running("browser.tabs.opening", window)) {
|
||||||
UserInteraction.start("browser.tabs.opening", "initting", window);
|
UserInteraction.start("browser.tabs.opening", "initting", window);
|
||||||
}
|
}
|
||||||
@@ -2771,6 +2779,9 @@
|
@@ -2771,6 +2778,9 @@
|
||||||
noInitialLabel,
|
noInitialLabel,
|
||||||
skipBackgroundNotify,
|
skipBackgroundNotify,
|
||||||
});
|
});
|
||||||
@@ -40,7 +39,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
|
|||||||
if (insertTab) {
|
if (insertTab) {
|
||||||
// insert the tab into the tab container in the correct position
|
// insert the tab into the tab container in the correct position
|
||||||
this._insertTabAtIndex(t, {
|
this._insertTabAtIndex(t, {
|
||||||
@@ -3248,6 +3259,14 @@
|
@@ -3248,6 +3258,14 @@
|
||||||
) {
|
) {
|
||||||
tabWasReused = true;
|
tabWasReused = true;
|
||||||
tab = this.selectedTab;
|
tab = this.selectedTab;
|
||||||
@@ -55,7 +54,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
|
|||||||
if (!tabData.pinned) {
|
if (!tabData.pinned) {
|
||||||
this.unpinTab(tab);
|
this.unpinTab(tab);
|
||||||
} else {
|
} else {
|
||||||
@@ -3297,6 +3316,13 @@
|
@@ -3297,6 +3315,13 @@
|
||||||
preferredRemoteType,
|
preferredRemoteType,
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -69,7 +68,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
|
|||||||
if (select) {
|
if (select) {
|
||||||
tabToSelect = tab;
|
tabToSelect = tab;
|
||||||
}
|
}
|
||||||
@@ -4184,6 +4210,7 @@
|
@@ -4184,6 +4209,7 @@
|
||||||
isLastTab ||
|
isLastTab ||
|
||||||
aTab.pinned ||
|
aTab.pinned ||
|
||||||
aTab.hidden ||
|
aTab.hidden ||
|
||||||
@@ -77,7 +76,7 @@ index ef857bd81f2cd7c163ecc74ac1cf81a0b63ce838..7774dbf9f963529570b08465d107df23
|
|||||||
this._removingTabs.size >
|
this._removingTabs.size >
|
||||||
3 /* don't want lots of concurrent animations */ ||
|
3 /* don't want lots of concurrent animations */ ||
|
||||||
!aTab.hasAttribute(
|
!aTab.hasAttribute(
|
||||||
@@ -5117,10 +5144,10 @@
|
@@ -5117,10 +5143,10 @@
|
||||||
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
|
SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
|
||||||
},
|
},
|
||||||
|
|
||||||
|
13
src/toolkit/modules/UpdateUtils-sys-mjs.patch
Normal file
13
src/toolkit/modules/UpdateUtils-sys-mjs.patch
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/toolkit/modules/UpdateUtils.sys.mjs b/toolkit/modules/UpdateUtils.sys.mjs
|
||||||
|
index be9ce9d5402c30bf4a9712f1ce9026503c191a53..230882363b3e1bbe7f0977567db61f72494a19ea 100644
|
||||||
|
--- a/toolkit/modules/UpdateUtils.sys.mjs
|
||||||
|
+++ b/toolkit/modules/UpdateUtils.sys.mjs
|
||||||
|
@@ -81,7 +81,7 @@ export var UpdateUtils = {
|
||||||
|
replacement = Services.appinfo.name;
|
||||||
|
break;
|
||||||
|
case "VERSION":
|
||||||
|
- replacement = Services.appinfo.version;
|
||||||
|
+ replacement = AppConstants.ZEN_FIREFOX_VERSION;
|
||||||
|
break;
|
||||||
|
case "BUILD_ID":
|
||||||
|
replacement = Services.appinfo.appBuildID;
|
@@ -18,7 +18,7 @@
|
|||||||
"brandShortName": "Zen Browser",
|
"brandShortName": "Zen Browser",
|
||||||
"brandFullName": "Zen Browser",
|
"brandFullName": "Zen Browser",
|
||||||
"release": {
|
"release": {
|
||||||
"displayVersion": "1.0.1-a",
|
"displayVersion": "1.0.1-a.1",
|
||||||
"github": {
|
"github": {
|
||||||
"repo": "zen-browser/desktop"
|
"repo": "zen-browser/desktop"
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user