Refactor CSS and JavaScript files for consistency; clean up whitespac…

…e and formatting
zen-browser · Jan 4, 2025 · 7dfa6d5 · 7dfa6d5
1 parent 2251559
commit 7dfa6d5
Show file tree

Hide file tree

Showing 56 changed files with 1,601 additions and 1,509 deletions.
diff --git a/.github/workflows/check-candidate-release.yml b/.github/workflows/check-candidate-release.yml
@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Check out repository
-      uses: actions/checkout@v2
+      - name: Check out repository
+        uses: actions/checkout@v2
 
-    - name: Fetch JSON Response
-      run: |
-        curl -s "https://hg.mozilla.org/releases/mozilla-release/json-tags" > rc-response.json
+      - name: Fetch JSON Response
+        run: |
+          curl -s "https://hg.mozilla.org/releases/mozilla-release/json-tags" > rc-response.json
 
-    - name: Check for any updates
-      env:
-        DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
-        DISCORD_PING_IDS: ${{ secrets.DISCORD_PING_IDS }}
-      run: |
-        python3 scripts/check-rc-response.py || true
+      - name: Check for any updates
+        env:
+          DISCORD_WEBHOOK_URL: ${{ secrets.DISCORD_WEBHOOK_URL }}
+          DISCORD_PING_IDS: ${{ secrets.DISCORD_PING_IDS }}
+        run: |
+          python3 scripts/check-rc-response.py || true
diff --git a/.github/workflows/clear-cache.yml b/.github/workflows/clear-cache.yml
@@ -20,7 +20,7 @@ jobs:
               owner: context.repo.owner,
               repo: context.repo.repo,
             })
-            
+
             for (const cache of caches.data.actions_caches) {
               console.log(cache)
               await github.rest.actions.deleteActionsCacheById({
@@ -29,5 +29,5 @@ jobs:
                 cache_id: cache.id,
               })
             }
-            
+
             console.log("Clear completed")
diff --git a/.github/workflows/issue-metrics.yml b/.github/workflows/issue-metrics.yml
@@ -10,56 +10,55 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.DEPLOY_KEY }}
 
-    - name: Checkout code
-      uses: actions/checkout@v2
-      with:
-        token: ${{ secrets.DEPLOY_KEY }}
+      - name: Get dates for last month
+        shell: bash
+        run: |
+          # Get the current date
+          current_date=$(date +'%Y-%m-%d')
 
-    - name: Get dates for last month
-      shell: bash
-      run: |
-        # Get the current date
-        current_date=$(date +'%Y-%m-%d')
+          # Calculate the previous month
+          previous_date=$(date -d "$current_date -1 month" +'%Y-%m-%d')
 
-        # Calculate the previous month
-        previous_date=$(date -d "$current_date -1 month" +'%Y-%m-%d')
+          # Extract the year and month from the previous date
+          previous_year=$(date -d "$previous_date" +'%Y')
+          previous_month=$(date -d "$previous_date" +'%m')
 
-        # Extract the year and month from the previous date
-        previous_year=$(date -d "$previous_date" +'%Y')
-        previous_month=$(date -d "$previous_date" +'%m')
+          # Calculate the first day of the previous month
+          first_day=$(date -d "$previous_year-$previous_month-01" +'%Y-%m-%d')
 
-        # Calculate the first day of the previous month
-        first_day=$(date -d "$previous_year-$previous_month-01" +'%Y-%m-%d')
+          # Calculate the last day of the previous month
+          last_day=$(date -d "$first_day +1 month -1 day" +'%Y-%m-%d')
 
-        # Calculate the last day of the previous month
-        last_day=$(date -d "$first_day +1 month -1 day" +'%Y-%m-%d')
+          echo "$first_day..$last_day"
+          echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
+          echo "last_month_year=$previous_year" >> "$GITHUB_ENV"
 
-        echo "$first_day..$last_day"
-        echo "last_month=$first_day..$last_day" >> "$GITHUB_ENV"
-        echo "last_month_year=$previous_year" >> "$GITHUB_ENV"
+      - name: Run issue-metrics tool
+        uses: github/issue-metrics@v2
+        env:
+          GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
+          HIDE_AUTHOR: true
+          HIDE_TIME_TO_ANSWER: true
+          SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }}'
 
-    - name: Run issue-metrics tool
-      uses: github/issue-metrics@v2
-      env:
-        GH_TOKEN: ${{ secrets.DEPLOY_KEY }}
-        HIDE_AUTHOR: true
-        HIDE_TIME_TO_ANSWER: true
-        SEARCH_QUERY: 'repo:zen-browser/desktop is:issue created:${{ env.last_month }}'
+      - name: Move metrics to docs folder
+        run: |
+          mkdir -p docs/issue-metrics
+          rm -f docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+          mv issue_metrics.md docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
 
-    - name: Move metrics to docs folder
-      run: |
-        mkdir -p docs/issue-metrics
-        rm -f docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
-        mv issue_metrics.md docs/issue-metrics/${{ env.last_month_year }}_${{ env.last_month }}.md
+      - name: Remove metrisc JSON
+        run: |
+          rm -f issue_metrics.json
 
-    - name: Remove metrisc JSON
-      run: |
-        rm -f issue_metrics.json
-
-    - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v5
-      with:
-        commit_message: 'Update monthly issue metrics'
-        commit_user_name: Zen Browser Robot
-        commit_user_email: [email protected]
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: 'Update monthly issue metrics'
+          commit_user_name: Zen Browser Robot
+          commit_user_email: [email protected]
diff --git a/.github/workflows/twilight-release-schedule.yml b/.github/workflows/twilight-release-schedule.yml
@@ -28,4 +28,3 @@ jobs:
         uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
-
diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
@@ -11,7 +11,7 @@ jobs:
   update-submodules:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]')"
-    
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -26,6 +26,6 @@ jobs:
       - name: Commit
         uses: stefanzweifel/git-auto-commit-action@v5
         with:
-          commit_message: "[skip ci] 📦 Update submodules"
+          commit_message: '[skip ci] 📦 Update submodules'
           commit_user_name: Zen Browser Robot
           commit_user_email: [email protected]
diff --git a/.prettierignore b/.prettierignore
@@ -3,6 +3,7 @@ engine/
 **/*.html
 **/*.xhtml
 **/*.inc.xhtml
+**/*.bundle.min.js
 
 **/*.svg
 
@@ -11,5 +12,9 @@ pnpm-lock.yaml
 
 **/engine/
 
+docs/issue-metrics/*.md
+
 # Some CSS files are preprocessed and prettier doesn't handle them well
+# We also dont want to format the CSS files that are generated by the build
 src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+src/browser/base/zen-components/ZenEmojies.mjs
diff --git 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
@@ -6,7 +6,6 @@
 [![Crowdin](https://badges.crowdin.net/zen-browser/localized.svg)](https://crowdin.com/project/zen-browser)
 [![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)
 
-
 ✨ 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!
 
 <div flex="true">
@@ -53,7 +52,7 @@ Zen uses [Semantic Versioning](https://semver.org/) for versioning. Meaning, ver
 
 ### Branches
 
-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. 
+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.
 
 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.
 
@@ -99,15 +98,15 @@ yay -S zen-browser-bin
 ##### Other Linux distributions (AppImage with automated system integration)
 
 - `native` tarball install:
-```bash <(curl -s https://updates.zen-browser.app/install.sh)```
+  `bash <(curl -s https://updates.zen-browser.app/install.sh)`
 
 - `zsync` is required for the Update feature of the script below
 
 ```sh
 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
@@ -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
-```
+```
diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs
@@ -71,7 +71,7 @@ export var ZenCustomizableUI = new (class {
   _moveWindowButtons(window) {
     const windowControls = window.document.getElementsByClassName('titlebar-buttonbox-container');
     const toolboxIcons = window.document.getElementById('zen-sidebar-top-buttons-customization-target');
-    if (window.AppConstants.platform === 'macosx'|| window.matchMedia('(-moz-gtk-csd-reversed-placement)').matches) {
+    if (window.AppConstants.platform === 'macosx' || window.matchMedia('(-moz-gtk-csd-reversed-placement)').matches) {
       for (let i = 0; i < windowControls.length; i++) {
         if (i === 0) {
           toolboxIcons.prepend(windowControls[i]);

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
@@ -28,13 +28,14 @@
         // Fix notification deck
         const deckTemplate = document.getElementById('tab-notification-deck-template');
         if (deckTemplate) {
-          document
-            .getElementById('zen-appcontent-navbar-container')
-            .appendChild(deckTemplate);
+          document.getElementById('zen-appcontent-navbar-container').appendChild(deckTemplate);
         }
 
         // Disable smooth scroll
-        gBrowser.tabContainer.arrowScrollbox.smoothScroll = Services.prefs.getBoolPref('zen.startup.smooth-scroll-in-tabs', false);
+        gBrowser.tabContainer.arrowScrollbox.smoothScroll = Services.prefs.getBoolPref(
+          'zen.startup.smooth-scroll-in-tabs',
+          false
+        );
 
         ZenWorkspaces.init();
         gZenUIManager.init();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,4 +28,3 @@ jobs:
		uses: actions/setup-node@v4
		with:
		node-version-file: '.nvmrc'