From 418d346b571aa18364a2229398e097fd683b7529 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Thu, 28 Nov 2024 03:41:46 +0530 Subject: [PATCH] Run prettier and remove trailing spaces --- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/build.yml | 7 +- .github/workflows/linux-release-build.yml | 1 - .github/workflows/macos-release-build.yml | 4 +- .github/workflows/pr-test.yml | 3 +- .github/workflows/update-submodules.yml | 3 +- .github/workflows/windows-profile-build.yml | 4 +- .github/workflows/windows-release-build.yml | 4 +- CODE_OF_CONDUCT.md | 22 +- README.md | 5 +- docs/contribute.md | 7 +- package-lock.json | 15 +- .../base/content/ZenCustomizableUI.sys.mjs | 4 +- src/browser/base/content/ZenUIManager.mjs | 44 +- .../base/content/zen-popupset.inc.xhtml | 4 +- .../base/content/zen-sidebar-icons.inc.xhtml | 8 +- .../base/content/zen-sidebar-panel.inc.xhtml | 2 +- .../content/zen-styles/zen-animations.css | 4 +- .../zen-styles/zen-browser-container.css | 4 +- .../content/zen-styles/zen-browser-ui.css | 6 +- .../content/zen-styles/zen-compact-mode.css | 4 +- .../base/content/zen-styles/zen-decks.css | 19 +- .../base/content/zen-styles/zen-glance.css | 13 +- .../zen-styles/zen-gradient-generator.css | 9 +- .../content/zen-styles/zen-panels/print.css | 2 - .../content/zen-styles/zen-sidebar-panels.css | 8 +- .../base/content/zen-styles/zen-sidebar.css | 3 +- .../zen-tabs/vertical-tabs-topbar.inc.css | 6 +- .../zen-styles/zen-tabs/vertical-tabs.css | 16 +- .../base/content/zen-styles/zen-theme.css | 12 +- .../base/content/zen-styles/zen-urlbar.css | 10 +- .../content/zen-styles/zen-workspaces.css | 7 +- src/browser/base/content/zenThemeModifier.js | 4 +- .../base/zen-components/ZenActorsManager.mjs | 3 +- .../base/zen-components/ZenGlanceManager.mjs | 138 +++-- .../zen-components/ZenGradientGenerator.mjs | 279 +++++----- .../zen-components/ZenKeyboardShortcuts.mjs | 24 +- .../zen-components/ZenPinnedTabManager.mjs | 222 ++++---- .../zen-components/ZenPinnedTabsStorage.mjs | 150 ++--- .../base/zen-components/ZenSidebarManager.mjs | 4 +- .../base/zen-components/ZenThemesCommon.mjs | 6 +- .../base/zen-components/ZenThemesImporter.mjs | 8 +- .../base/zen-components/ZenViewSplitter.mjs | 201 ++++--- .../base/zen-components/ZenWorkspaces.mjs | 191 ++++--- .../zen-components/ZenWorkspacesStorage.mjs | 184 ++++--- .../base/zen-components/ZenWorkspacesSync.mjs | 518 +++++++++--------- .../actors/ZenGlanceChild.sys.mjs | 6 +- .../actors/ZenThemeMarketplaceChild.sys.mjs | 10 +- .../components/preferences/zen-settings.js | 38 +- .../zenKeyboardShortcuts.inc.xhtml | 2 +- .../preferences/zenLooksAndFeel.inc.xhtml | 6 +- .../preferences/zenTabsManagement.inc.xhtml | 2 +- .../components/zen-welcome/welcome.html | 12 +- .../shared/preferences/zen-preferences.css | 4 +- src/browser/themes/shared/zen-icons/icons.css | 1 - 55 files changed, 1175 insertions(+), 1100 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 3a8365b99..2e6c49487 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,4 +1,4 @@ -blank_issues_enabled: false +blank_issues_enabled: false contact_links: - name: Feature Request url: https://github.com/zen-browser/desktop/discussions diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33ccfa668..60a68b902 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -58,7 +58,6 @@ jobs: runs-on: ubuntu-latest needs: [debug-inputs] steps: - - uses: actions/checkout@v4 with: submodules: recursive @@ -206,7 +205,7 @@ jobs: contents: write runs-on: ubuntu-latest needs: [build-data, check-release] - + steps: - name: Install Node.js uses: actions/setup-node@v3 @@ -341,7 +340,7 @@ jobs: run: | npm install -g pnpm sudo apt-get update - sudo apt-get -y install libfuse2 desktop-file-utils appstream + sudo apt-get -y install libfuse2 desktop-file-utils appstream - name: Download linux build uses: actions/download-artifact@v4 @@ -431,7 +430,7 @@ jobs: mkdir -p updates cp -a ../linux_update_manifest_generic/. updates/ cp -a ../linux_update_manifest_specific/. updates/ - cp -a ../linux_update_manifest_aarch64/. updates/ + cp -a ../linux_update_manifest_aarch64/. updates/ if [[ $RELEASE_BRANCH == 'alpha' ]]; then cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/ diff --git a/.github/workflows/linux-release-build.yml b/.github/workflows/linux-release-build.yml index f311a87e6..206960ca5 100644 --- a/.github/workflows/linux-release-build.yml +++ b/.github/workflows/linux-release-build.yml @@ -13,7 +13,6 @@ on: jobs: build-linux: - permissions: contents: write runs-on: ubuntu-latest diff --git a/.github/workflows/macos-release-build.yml b/.github/workflows/macos-release-build.yml index c72c4679f..55c09ffc4 100644 --- a/.github/workflows/macos-release-build.yml +++ b/.github/workflows/macos-release-build.yml @@ -14,7 +14,7 @@ on: jobs: mac-build: name: Build macOS - ${{ matrix.arch }} - + runs-on: macos-14 strategy: fail-fast: false @@ -98,7 +98,7 @@ jobs: - name: Install dependencies run: | pnpm install - + - name: Load surfer CI setup run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} diff --git a/.github/workflows/pr-test.yml b/.github/workflows/pr-test.yml index 67832d0b7..b4a38764f 100644 --- a/.github/workflows/pr-test.yml +++ b/.github/workflows/pr-test.yml @@ -1,11 +1,10 @@ - name: Pull request test on: pull_request: branches: - dev - + jobs: pr-test: runs-on: ubuntu-latest diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml index baf55228f..1caecb41e 100644 --- a/.github/workflows/update-submodules.yml +++ b/.github/workflows/update-submodules.yml @@ -1,4 +1,3 @@ - name: Update Components Submodules on: @@ -25,6 +24,6 @@ jobs: - uses: stefanzweifel/git-auto-commit-action@v4 with: - commit_message: "[skip ci] 📦 Update Submodules!" + commit_message: '[skip ci] 📦 Update Submodules!' commit_user_name: Zen Browser Robot commit_user_email: zen-browser-auto@users.noreply.github.com diff --git a/.github/workflows/windows-profile-build.yml b/.github/workflows/windows-profile-build.yml index c1e881ee6..fbf3aa5f3 100644 --- a/.github/workflows/windows-profile-build.yml +++ b/.github/workflows/windows-profile-build.yml @@ -61,13 +61,13 @@ jobs: C:\MozillaBuildSetup-Latest.exe /S | out-null - name: Download firefox run: | - git config --global core.safecrlf false + git config --global core.safecrlf false pnpm surfer download - name: Import patches env: SURFER_NO_BRANDING_PATCH: true - run: pnpm surfer import + run: pnpm surfer import - name: Generate run: | diff --git a/.github/workflows/windows-release-build.yml b/.github/workflows/windows-release-build.yml index 681b98a6f..1f5a2541f 100644 --- a/.github/workflows/windows-release-build.yml +++ b/.github/workflows/windows-release-build.yml @@ -26,7 +26,7 @@ jobs: fail-fast: false matrix: arch: [x86_64, x86_64-v3, aarch64] - + steps: - name: Free Disk Space (Ubuntu) uses: jlumbroso/free-disk-space@main @@ -223,7 +223,7 @@ jobs: find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type d -not -name 'dist' -exec rm -rf {} \; find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \; fi - + - name: Upload dist object if: ${{ !inputs.generate-gpo }} uses: actions/upload-artifact@v4 diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 9f67aaa0e..964bd7b40 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -17,23 +17,23 @@ diverse, inclusive, and healthy community. Examples of behavior that contributes to a positive environment for our community include: -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, +- Demonstrating empathy and kindness toward other people +- Being respectful of differing opinions, viewpoints, and experiences +- Giving and gracefully accepting constructive feedback +- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience -* Focusing on what is best not just for us as individuals, but for the +- Focusing on what is best not just for us as individuals, but for the overall community Examples of unacceptable behavior include: -* The use of sexualized language or imagery, and sexual attention or +- The use of sexualized language or imagery, and sexual attention or advances of any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email +- Trolling, insulting or derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or email address, without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a +- Other conduct which could reasonably be considered inappropriate in a professional setting ## Enforcement Responsibilities @@ -106,7 +106,7 @@ Violating these terms may lead to a permanent ban. ### 4. Permanent Ban **Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an +standards, including sustained inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of individuals. **Consequence**: A permanent ban from any sort of public interaction within diff --git a/README.md b/README.md index bd476964b..ebdf296f0 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,6 @@ [![Downloads](https://img.shields.io/github/downloads/zen-browser/desktop/total.svg)](https://github.com/zen-browser/desktop/releases) [![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser) - ✨ Experience tranquillity while browsing the web without people tracking you! Zen is a privacy-focused browser that blocks trackers, ads, and other unwanted content while offering the best browsing experience!
@@ -87,7 +86,7 @@ yay -S zen-browser-avx2-bin ##### Other Linux distributions (AppImage with automated system integration) - `native` tarball install: -```sudo bash <(curl -s https://updates.zen-browser.app/install.sh)``` + `sudo bash <(curl -s https://updates.zen-browser.app/install.sh)` - `zsync` is required for the Update feature of the script below @@ -95,7 +94,7 @@ yay -S zen-browser-avx2-bin bash <(curl https://updates.zen-browser.app/appimage.sh) ``` -* 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)! 🔄 +- 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)! 🔄 To upgrade the browser to a newer version, use the embedded update functionality in `About Zen`. diff --git a/docs/contribute.md b/docs/contribute.md index ecc154a5f..b97056d49 100644 --- a/docs/contribute.md +++ b/docs/contribute.md @@ -1,4 +1,3 @@ - # Branch Structure The repository is structured as follows: @@ -7,14 +6,14 @@ The repository is structured as follows: dev (main branch) | | | \--->-- stable (release branch) - | ^ + | ^ ^ | | \-<- Hotfix (hotfixes directly from stable) | \-<- (features branches) ``` -The `central` branch is the main branch of the repository, and it is the default branch for the repository. The `twilight` branch is the feature branch, and it is branched off from the `central` branch. The `stable` branch is the release branch, and it is branched off from the `central` branch. +The `central` branch is the main branch of the repository, and it is the default branch for the repository. The `twilight` branch is the feature branch, and it is branched off from the `central` branch. The `stable` branch is the release branch, and it is branched off from the `central` branch. The `stable` branch may have hotfixes directly from the `stable` branch, and the `twilight` branch may have feature branches branched off from the `twilight` branch. This is done so that we can apply hotfixes like security patches directly to the `stable` branch without having to merge the changes from the `twilight` branch. @@ -34,4 +33,4 @@ To merge zen stable branch from the twilight branch, you can use the following c ```bash sh ./scripts/merge-to-branch.sh stable -``` \ No newline at end of file +``` diff --git a/package-lock.json b/package-lock.json index 5abbe763f..f841be80d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@zen-browser/surfer": "^1.3.21" + "@zen-browser/surfer": "^1.6.3" }, "devDependencies": { "husky": "^9.1.5", @@ -269,9 +269,10 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "node_modules/@zen-browser/surfer": { - "version": "1.3.21", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz", - "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.3.tgz", + "integrity": "sha512-OpBJu4c6AV4P1o9whtvp2BQjcqxS+fMbXJKtgKWuW7E8cfOLIMbHpuxCbTllO/LGz60T0aszxZRPbToTQuwPog==", + "license": "MPL-2.0", "dependencies": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", @@ -2818,9 +2819,9 @@ "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==" }, "@zen-browser/surfer": { - "version": "1.3.21", - "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.3.21.tgz", - "integrity": "sha512-hFblYgr4/rlfoJ75kcRPY03wG8HA8XT6dRZLEwdD7e5b8YazCWRlXMof0NhFC5a1Z0e1FZ+sRCxMG52ZygoVzw==", + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/@zen-browser/surfer/-/surfer-1.6.3.tgz", + "integrity": "sha512-OpBJu4c6AV4P1o9whtvp2BQjcqxS+fMbXJKtgKWuW7E8cfOLIMbHpuxCbTllO/LGz60T0aszxZRPbToTQuwPog==", "requires": { "@resvg/resvg-js": "^1.4.0", "async-icns": "^1.0.2", diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs index b4a22ae10..72973370b 100644 --- a/src/browser/base/content/ZenCustomizableUI.sys.mjs +++ b/src/browser/base/content/ZenCustomizableUI.sys.mjs @@ -34,7 +34,7 @@ export var ZenCustomizableUI = new (class { _addSidebarButtons(window) { const sidebarBox = window.MozXULElement.parseXULToFragment(`
- +
- +
- + diff --git a/src/browser/components/zen-welcome/welcome.html b/src/browser/components/zen-welcome/welcome.html index a5f65a89a..aa31a24ed 100644 --- a/src/browser/components/zen-welcome/welcome.html +++ b/src/browser/components/zen-welcome/welcome.html @@ -31,11 +31,11 @@

- +

- +

@@ -51,7 +51,7 @@

- +

@@ -120,11 +120,11 @@

- +
- +

@@ -134,7 +134,7 @@

- +

diff --git a/src/browser/themes/shared/preferences/zen-preferences.css b/src/browser/themes/shared/preferences/zen-preferences.css index 5e147c8ec..f023b35b7 100644 --- a/src/browser/themes/shared/preferences/zen-preferences.css +++ b/src/browser/themes/shared/preferences/zen-preferences.css @@ -253,7 +253,7 @@ groupbox h2 { --zen-compact-mode-styles-shadow: 0 0 2px 2px rgba(0, 0, 0, 0.1); @media not (prefers-color-scheme: dark) { - --zen-compact-mode-styles-shadow: 0 0 .5px .5px rgba(0, 0, 0, 0.1); + --zen-compact-mode-styles-shadow: 0 0 0.5px 0.5px rgba(0, 0, 0, 0.1); } box-shadow: var(--zen-compact-mode-styles-shadow); @@ -609,5 +609,5 @@ groupbox h2 { .sync-engine-workspaces .checkbox-icon, .sync-engine-workspaces.sync-engine-image { - list-style-image: url("chrome://devtools/skin/images/tool-storage.svg"); + list-style-image: url('chrome://devtools/skin/images/tool-storage.svg'); } diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css index 55d41a2cf..111a14c17 100644 --- a/src/browser/themes/shared/zen-icons/icons.css +++ b/src/browser/themes/shared/zen-icons/icons.css @@ -581,7 +581,6 @@ fill: white !important; } - /* reload/stop animation */ #stop-reload-button[animate] > #reload-button[displaystop]