Skip to content

Commit 0630b65

Browse files
committed
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
2 parents 69f9b05 + 74f6d1a commit 0630b65

File tree

4 files changed

+110
-140
lines changed

4 files changed

+110
-140
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

Lines changed: 70 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,35 +4,76 @@ body:
44
- type: markdown
55
attributes:
66
value: |
7-
Thank you for filing a bug report!
7+
<p align="center">
8+
<a href="https://zen-browser.app">
9+
<picture>
10+
<source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-light.svg">
11+
<source media="(prefers-color-scheme: light)" srcset="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-dark.svg">
12+
<img src="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-light.svg" alt="Zen Logo" width="64" height="64">
13+
</picture>
14+
<img src="https://raw.githubusercontent.com/zen-browser/desktop/dev/docs/assets/zen-browser.svg" alt="Zen Browser Text" width="156" height="64">
15+
</a>
16+
</p>
817
9-
## IMPORTANT READ
10-
- Please provide descriptive titles. Bad titles do more harm than good.
11-
- Please search existing issues to avoid creating duplicates.
12-
- For enhancement requests, please use GitHub Discussions.
13-
- Please fill out the template below to the best of your ability.
14-
- Please describe the issue as much as possible and provide steps to reproduce it along with visual aids if possible.
18+
<p align="center"><em>Thank you for filing a bug report!</em></p>
19+
20+
> [!IMPORTANT]
21+
> - Please provide descriptive titles. Bad titles do more harm than good.
22+
> - Please search existing issues to avoid creating duplicates.
23+
> - For enhancement requests, please use GitHub Discussions.
24+
> - Please fill out the template below to the best of your ability.
25+
> - Please describe the issue as much as possible and provide steps to reproduce it along with visual aids if possible.
1526
- type: checkboxes
1627
id: captchas
1728
attributes:
18-
label: Captchas
19-
description: Just making sure you did actually read the instructions.
29+
label: Preliminary Checks
30+
description: Please confirm the following before submitting a bug report. This helps us triage and resolve issues more efficiently.
2031
options:
21-
- label: I have read the instructions.
32+
- label: I have read and understood the important section above.
33+
required: true
2234
- label: I have searched existing issues and avoided creating duplicates.
35+
required: true
2336
- label: I am not filing an enhancement request.
37+
required: true
2438
- label: I have checked that this issue cannot be reproduced on Mozilla Firefox.
39+
required: true
2540
- label: I have checked that this issue can be reproduced once I removed all my Mods and Custom CSS.
26-
validations:
27-
required: true
41+
required: true
2842
- type: textarea
2943
id: what-happened
3044
attributes:
3145
label: What happened?
32-
description: Also tell us, what did you expect to happen?
46+
description: Describe the bug clearly and concisely.
3347
placeholder: Tell us what you see!
3448
validations:
3549
required: true
50+
- type: input
51+
id: expected-behavior
52+
attributes:
53+
label: Expected behavior
54+
description: Please write a description of what was supposed to happen.
55+
validations:
56+
required: true
57+
- type: input
58+
id: actual-behavior
59+
attributes:
60+
label: Actual behavior
61+
description: Please write a description of what actually happened.
62+
validations:
63+
required: true
64+
- type: textarea
65+
id: how-to-reproduce
66+
attributes:
67+
label: Steps to reproduce
68+
description: Please Provide numbered steps to reproduce this issue so developers can replicate them easily.
69+
validations:
70+
required: true
71+
- type: textarea
72+
id: screenshots
73+
attributes:
74+
label: Screenshots and videos
75+
description: |
76+
If applicable, add screenshots or videos to help explain your problem.
3677
- type: input
3778
id: version
3879
attributes:
@@ -52,8 +93,8 @@ body:
5293
- Linux (Tarball)
5394
- macOS - aarch64
5495
- macOS - Intel
55-
- Windows - x64
5696
- Windows - aarch64
97+
- Windows - x64
5798
- Other
5899
validations:
59100
required: true
@@ -63,26 +104,26 @@ body:
63104
label: What component is this issue related to?
64105
options:
65106
- Other
107+
- Bookmarks
66108
- Compact Mode
67-
- Workspaces
68-
- Mods / Themes
109+
- Customizable UI / Toolbars
110+
- Extensions
69111
- Glance
70-
- URL Bar
71-
- Tabs
72-
- Split View
73-
- Settings
74-
- Privacy
75-
- Performance
76-
- Media Controler
77-
- Tab unloading
78-
- Tab Folders
79112
- Keyboard Shortcuts
80-
- Security
81-
- Extensions
82-
- Customizable UI / Toolbars
83113
- Localization
84-
- Bookmarks
114+
- Media Controler
115+
- Mods / Themes
116+
- Performance
117+
- Privacy
118+
- Security
119+
- Settings
120+
- Split View
85121
- Sync
122+
- Tab Folders
123+
- Tab unloading
124+
- Tabs
125+
- URL Bar
126+
- Workspaces
86127
validations:
87128
required: true
88129

README.md

Lines changed: 6 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
88
[![Zen Release builds](https://github.com/zen-browser/desktop/actions/workflows/build.yml/badge.svg?branch=stable)](https://github.com/zen-browser/desktop/actions/workflows/build.yml)
99

10-
✨ Experience tranquillity while browsing the internet with Zen! Our mission is to give you a balance between speed, privacy and productivity!
10+
Zen is a firefox-based browser with the aim of pushing your productivity to a new level!
1111

1212
<div flex="true">
1313
<a href="https://zen-browser.app/download">
@@ -27,118 +27,13 @@
2727
</a>
2828
</div>
2929

30-
## 🖥️ Compatibility
30+
### Firefox Versions
3131

32-
Zen is currently built using Firefox version `139.0.1`! 🚀
32+
- [`Release`](https://zen-browser.app/download) - Is currently built using Firefox version `139.0.1`! 🚀
33+
- [`Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 139.0.1`!
3334

34-
- [`Zen Twilight`](https://zen-browser.app/download?twilight) - Is currently built using Firefox version `RC 139.0.1`!
35-
- Check out the latest [release notes](https://zen-browser.app/release-notes)!
36-
- Part of our mission is to keep Zen up-to-date with the latest version of Firefox, so you can enjoy the latest features and security updates!
35+
### Contributing
3736

38-
## 🤝 Contribution
37+
If you'd like to report a bug, please do so on our [GitHub Issues page](https://github.com/zen-browser/desktop/issues/) and for feature requests, you can use [Github Discussions](https://github.com/zen-browser/desktop/discussions).
3938

4039
Zen is an open-source project, and we welcome contributions from the community! Please take a look at the [contribution guidelines](./docs/contribute.md) before getting started!
41-
42-
### Issue metrics
43-
44-
We keep track of how many issues are closed at the end of the month in [docs/issue-metrics](./docs/issue-metrics). We use this to keep track of our issues and see our progress! 📈
45-
46-
### Versioning
47-
48-
Zen uses [Semantic Versioning](https://semver.org/), meaning versions are displayed as `a.b.cd` where:
49-
50-
- `a` is the major version
51-
- `b` is the minor version
52-
- `c` is the branch prefix
53-
- `d` is the patch version
54-
55-
### Branches
56-
57-
Zen is divided into 2 main branches. We use `dev` for development and `stable` for stable releases. The `dev` branch is where all the new features are added and where `twilight` builds are generated. The `stable` branch is where the stable releases are generated.
58-
59-
We divide into 2 branches in case there's any really important security update (for example) that needs to be released before the next stable release. This allows us to do patches without releasing unstable versions to the public.
60-
61-
## 📥 Installation
62-
63-
### Supported Operating Systems
64-
65-
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.
66-
67-
If you don't see your OS listed below, that's because we already have it in our [downloads page](https://zen-browser.app/download)! Make sure to check it out!
68-
69-
#### Windows
70-
71-
##### Winget
72-
73-
```ps
74-
winget install --id Zen-Team.Zen-Browser
75-
```
76-
77-
#### macOS
78-
79-
- Requires macOS 10.15 or later
80-
- Available for ARM and Intel architectures
81-
82-
You can also install Zen using Homebrew:
83-
84-
```
85-
brew install zen-browser
86-
```
87-
88-
#### Linux
89-
90-
##### Arch-based distributions
91-
92-
```sh
93-
yay -S zen-browser-bin
94-
```
95-
96-
##### Other Linux distributions (Tarball or AppImage)
97-
98-
- `Tarball` install:
99-
100-
```sh
101-
bash <(curl -s https://updates.zen-browser.app/install.sh)
102-
```
103-
104-
- `AppImage` install:
105-
106-
```sh
107-
bash <(curl https://updates.zen-browser.app/appimage.sh)
108-
```
109-
110-
> AppImage install requires `zsync` for the Update feature
111-
112-
- Again, if you don't see your OS listed above, that's because we already have it in our [downloads page](https://zen-browser.app/download)! 🔄
113-
114-
To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`.
115-
116-
## 👨‍💻 Development and Contributing
117-
118-
Some components used by @zen-browser as an attempt to make Firefox forks a better place, and for other to enjoy the beauty of OSS. You can find them [here](https://github.com/zen-browser/desktop/tree/dev/src/zen).
119-
120-
#### `Run Locally`
121-
122-
In order to download and run Zen locally, please follow [these instructions](https://docs.zen-browser.app/guides/building).
123-
124-
#### `Special Thanks`
125-
126-
Special thanks to... EVERYONE 🎉! Checkout the team and contributors page [here](https://zen-browser.app/about)
127-
128-
#### `Third Party Code`
129-
130-
Zen couldn't be in its current state without the help of these amazing projects! 🙏
131-
132-
- Zen's default preferences are based on [BetterFox](https://github.com/yokoffing/Betterfox)
133-
- Gradient image extracted from [Arc Palette](https://github.com/neurokitti/Arc_Palette)
134-
- `icons.css` has been modified from [Edge Firefox](https://github.com/bmFtZQ/edge-frfox) (MIT licensed file).
135-
136-
### 🖥️ Comparison with other browsers
137-
138-
Thanks everyone for making Zen stand out among these giants!
139-
140-
[![Star History Chart](https://api.star-history.com/svg?repos=zen-browser/desktop,chromium/chromium,brave/brave-browser&type=Date)](https://star-history.com/#zen-browser/desktop&chromium/chromium&brave/brave-browser&Date)
141-
142-
## 📄 License
143-
144-
Zen browser is under the [MPL 2.0 LICENSE](./LICENSE). All the code is open-source and free to use! Attribution is appreciated but not required.

docs/assets/zen-browser.svg

Lines changed: 19 additions & 0 deletions
Loading

src/zen/workspaces/ZenWorkspaces.mjs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2134,6 +2134,21 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
21342134
repeat: 0,
21352135
});
21362136
essentialsContainer.parentNode.appendChild(essentialsClone);
2137+
for (let i = 0; i < essentialsClone.children.length; i++) {
2138+
const child = essentialsClone.children[i];
2139+
const originalChild = essentialsContainer.children[i];
2140+
if (!gBrowser.isTab(child) || !gBrowser.isTab(originalChild)) {
2141+
continue;
2142+
}
2143+
const childBg = child.querySelector('.tab-background');
2144+
const originalChildBg = originalChild.querySelector('.tab-background');
2145+
if (childBg && originalChildBg) {
2146+
childBg.style.setProperty(
2147+
'--zen-tab-icon',
2148+
originalChildBg.style.getPropertyValue('--zen-tab-icon')
2149+
);
2150+
}
2151+
}
21372152
}
21382153
}
21392154
document.documentElement.setAttribute('animating-background', 'true');

0 commit comments

Comments
 (0)