1
0
Fork 1
mirror of https://github.com/zen-browser/desktop.git synced 2025-07-08 04:49:59 +02:00

Remove trailing spaces

This commit is contained in:
Vijay A 2024-11-28 07:34:29 +05:30
parent c3ae2467ae
commit 92de4022cb
33 changed files with 110 additions and 110 deletions

View file

@ -1,4 +1,4 @@
blank_issues_enabled: false blank_issues_enabled: false
contact_links: contact_links:
- name: Feature Request - name: Feature Request
url: https://github.com/zen-browser/desktop/discussions url: https://github.com/zen-browser/desktop/discussions

View file

@ -206,7 +206,7 @@ jobs:
contents: write contents: write
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: [build-data, check-release] needs: [build-data, check-release]
steps: steps:
- name: Install Node.js - name: Install Node.js
uses: actions/setup-node@v3 uses: actions/setup-node@v3
@ -341,7 +341,7 @@ jobs:
run: | run: |
npm install -g pnpm npm install -g pnpm
sudo apt-get update 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 - name: Download linux build
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
@ -431,7 +431,7 @@ jobs:
mkdir -p updates mkdir -p updates
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 ../linux_update_manifest_aarch64/. updates/ cp -a ../linux_update_manifest_aarch64/. updates/
if [[ $RELEASE_BRANCH == 'alpha' ]]; then if [[ $RELEASE_BRANCH == 'alpha' ]]; then
cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/ cp -a ../.github/workflows/object/windows-x64-signed-generic/update_manifest/. updates/

View file

@ -13,7 +13,7 @@ on:
jobs: jobs:
build-linux: build-linux:
permissions: permissions:
contents: write contents: write
runs-on: ubuntu-latest runs-on: ubuntu-latest

View file

@ -14,7 +14,7 @@ on:
jobs: jobs:
mac-build: mac-build:
name: Build macOS - ${{ matrix.arch }} name: Build macOS - ${{ matrix.arch }}
runs-on: macos-14 runs-on: macos-14
strategy: strategy:
fail-fast: false fail-fast: false
@ -98,7 +98,7 @@ jobs:
- name: Install dependencies - name: Install dependencies
run: | run: |
pnpm install pnpm install
- name: Load surfer CI setup - name: Load surfer CI setup
run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }} run: pnpm surfer ci --brand ${{ inputs.release-branch }} --display-version ${{ inputs.build-version }}

View file

@ -5,7 +5,7 @@ on:
pull_request: pull_request:
branches: branches:
- dev - dev
jobs: jobs:
pr-test: pr-test:
runs-on: ubuntu-latest runs-on: ubuntu-latest

View file

@ -61,13 +61,13 @@ jobs:
C:\MozillaBuildSetup-Latest.exe /S | out-null C:\MozillaBuildSetup-Latest.exe /S | out-null
- name: Download firefox - name: Download firefox
run: | run: |
git config --global core.safecrlf false git config --global core.safecrlf false
pnpm surfer download pnpm surfer download
- name: Import patches - name: Import patches
env: env:
SURFER_NO_BRANDING_PATCH: true SURFER_NO_BRANDING_PATCH: true
run: pnpm surfer import run: pnpm surfer import
- name: Generate - name: Generate
run: | run: |

View file

@ -26,7 +26,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
arch: [x86_64, x86_64-v3, aarch64] arch: [x86_64, x86_64-v3, aarch64]
steps: steps:
- name: Free Disk Space (Ubuntu) - name: Free Disk Space (Ubuntu)
uses: jlumbroso/free-disk-space@main 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 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 {} \; find engine/obj-x86_64-pc-windows-msvc/ -mindepth 1 -maxdepth 1 -type f -not -name 'dist' -exec rm -f {} \;
fi fi
- name: Upload dist object - name: Upload dist object
if: ${{ !inputs.generate-gpo }} if: ${{ !inputs.generate-gpo }}
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4

View file

@ -34,7 +34,7 @@ export var ZenCustomizableUI = new (class {
_addSidebarButtons(window) { _addSidebarButtons(window) {
const sidebarBox = window.MozXULElement.parseXULToFragment(` const sidebarBox = window.MozXULElement.parseXULToFragment(`
<toolbar id="zen-sidebar-top-buttons" <toolbar id="zen-sidebar-top-buttons"
fullscreentoolbar="true" fullscreentoolbar="true"
class="browser-toolbar customization-target zen-dont-hide-on-fullscreen" class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
brighttext="true" brighttext="true"
data-l10n-id="tabs-toolbar" data-l10n-id="tabs-toolbar"

View file

@ -12,7 +12,7 @@ var gZenUIManager = {
'zen.theme.content-element-separation', 'zen.theme.content-element-separation',
0 0
); );
function throttle(f, delay) { function throttle(f, delay) {
let timer = 0; let timer = 0;
return function (...args) { return function (...args) {

View file

@ -35,7 +35,7 @@
role="document" role="document"
mainview-with-header="true" mainview-with-header="true"
has-custom-header="true"> has-custom-header="true">
<box id="zenSplitViewModifierHeader" <box id="zenSplitViewModifierHeader"
class="panel-header panel-header-with-additional-element panel-header-with-info-button"> class="panel-header panel-header-with-additional-element panel-header-with-info-button">
<html:h1> <html:h1>
<html:span data-l10n-id="zen-split-view-modifier-header"></html:span> <html:span data-l10n-id="zen-split-view-modifier-header"></html:span>
@ -96,7 +96,7 @@
<toolbarbutton id="PanelUI-zen-profiles-privateWin" command="Tools:PrivateBrowsing" data-l10n-id="appmenuitem-new-private-window" class="subviewbutton"></toolbarbutton> <toolbarbutton id="PanelUI-zen-profiles-privateWin" command="Tools:PrivateBrowsing" data-l10n-id="appmenuitem-new-private-window" class="subviewbutton"></toolbarbutton>
<toolbarbutton id="PanelUI-zen-profiles-newProfile" oncommand="ZenProfileDialogUI.createProfileWizard();" data-l10n-id="appmenu-create-profile" class="subviewbutton"></toolbarbutton> <toolbarbutton id="PanelUI-zen-profiles-newProfile" oncommand="ZenProfileDialogUI.createProfileWizard();" data-l10n-id="appmenu-create-profile" class="subviewbutton"></toolbarbutton>
</hbox> </hbox>
<vbox id="PanelUI-zen-profiles-list"> <vbox id="PanelUI-zen-profiles-list">
</vbox> </vbox>
</vbox> </vbox>
</panelview> </panelview>

View file

@ -1,13 +1,13 @@
<toolbar brighttext="true" <toolbar brighttext="true"
id="zen-sidebar-icons-wrapper" id="zen-sidebar-icons-wrapper"
fullscreentoolbar="true" fullscreentoolbar="true"
class="browser-toolbar customization-target zen-dont-hide-on-fullscreen" class="browser-toolbar customization-target zen-dont-hide-on-fullscreen"
data-l10n-id="tabs-toolbar" data-l10n-id="tabs-toolbar"
customizable="true" customizable="true"
skipintoolbarset="true" skipintoolbarset="true"
context="toolbar-context-menu" context="toolbar-context-menu"
mode="icons"> mode="icons">
<toolbarbutton id="zen-profile-button" <toolbarbutton id="zen-profile-button"
class="zen-sidebar-action-button toolbarbutton-1 chromeclass-toolbar-additional" class="zen-sidebar-action-button toolbarbutton-1 chromeclass-toolbar-additional"
delegatesanchor="true" delegatesanchor="true"
onmousedown="ZenProfileDialogUI.showSubView(this, event)" onmousedown="ZenProfileDialogUI.showSubView(this, event)"

View file

@ -22,7 +22,7 @@
</vbox> </vbox>
<toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" fullscreentoolbar="true"> <toolbar mode="icons" flex="1" id="zen-sidebar-panels-wrapper" fullscreentoolbar="true">
<toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" fullscreentoolbar="true"> <toolbar mode="icons" flex="1" id="zen-sidebar-panels-sites" fullscreentoolbar="true">
</toolbar> </toolbar>
<toolbarbutton id="zen-sidebar-add-panel-button" class="zen-sidebar-panel-button toolbarbutton-1 chromeclass-toolbar-additional" onclick="gZenBrowserManagerSidebar._openAddPanelDialog();"/> <toolbarbutton id="zen-sidebar-add-panel-button" class="zen-sidebar-panel-button toolbarbutton-1 chromeclass-toolbar-additional" onclick="gZenBrowserManagerSidebar._openAddPanelDialog();"/>
</toolbar> </toolbar>

View file

@ -307,7 +307,7 @@
} }
90% { 90% {
width: 100%; width: 100%;
} }
100% { 100% {

View file

@ -8,7 +8,7 @@
border-radius: var(--zen-border-radius); border-radius: var(--zen-border-radius);
overflow: hidden; overflow: hidden;
margin: 1px; margin: 1px;
:root[zen-right-side='true'] & { :root[zen-right-side='true'] & {
margin-right: 0; margin-right: 0;
margin-left: var(--zen-element-separation); margin-left: var(--zen-element-separation);

View file

@ -51,7 +51,7 @@
#zen-main-app-wrapper { #zen-main-app-wrapper {
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
& > * { & > * {
z-index: 1; z-index: 1;
} }

View file

@ -70,7 +70,7 @@
z-index: 1; z-index: 1;
width: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3); width: calc(100% - var(--zen-sidebar-web-panel-spacing) * 3);
margin: var(--zen-sidebar-web-panel-spacing); margin: var(--zen-sidebar-web-panel-spacing);
/* Why times 3? /* Why times 3?
* + 1 for the top margin, making the element overflow the view. * + 1 for the top margin, making the element overflow the view.
* + 1 for the margin we want to add at the bottom * + 1 for the margin we want to add at the bottom
* + 1 so that the panel can be correctly spaced from the border of the webview * + 1 so that the panel can be correctly spaced from the border of the webview

View file

@ -1,6 +1,6 @@
height: var(--zen-toolbar-height); height: var(--zen-toolbar-height);
@media (-moz-bool-pref: 'zen.view.hide-window-controls') { @media (-moz-bool-pref: 'zen.view.hide-window-controls') {
& { & {
transition: height 0.2s ease-out, opacity 0.2s ease-out; transition: height 0.2s ease-out, opacity 0.2s ease-out;
transition-delay: 0.05s; transition-delay: 0.05s;

View file

@ -12,8 +12,8 @@
& #zen-sidebar-top-buttons { & #zen-sidebar-top-buttons {
--zen-toolbar-height: 32px; --zen-toolbar-height: 32px;
height: var(--zen-toolbar-height); height: var(--zen-toolbar-height);
} }
& #zen-sidebar-top-buttons .toolbarbutton-1 { & #zen-sidebar-top-buttons .toolbarbutton-1 {
& > .toolbarbutton-icon { & > .toolbarbutton-icon {
padding: 5px; padding: 5px;
@ -139,8 +139,8 @@
& #PersonalToolbar { & #PersonalToolbar {
width: -moz-available; width: -moz-available;
} }
/* We enable this trick IF we follow any of theses conditions: /* We enable this trick IF we follow any of theses conditions:
* - We are on a Mac * - We are on a Mac
* - We are on a Linux with reversed CSD * - We are on a Linux with reversed CSD
* - If we are not in any of the above, we can still enable it if the user has bookmarks toolbar enabled * - If we are not in any of the above, we can still enable it if the user has bookmarks toolbar enabled
@ -256,8 +256,8 @@
} }
& label { display: none !important; } & label { display: none !important; }
& .tab-close-button, & .tab-close-button,
& .tab-reset-button { & .tab-reset-button {
display: none !important; display: none !important;
} }
& .tab-icon-image { & .tab-icon-image {
@ -346,11 +346,11 @@
& .urlbar-input-container { & .urlbar-input-container {
padding-left: 2px; padding-left: 2px;
} }
:root[zen-right-side='true'] & { :root[zen-right-side='true'] & {
margin-left: 0; margin-left: 0;
margin-right: var(--zen-toolbox-padding); margin-right: var(--zen-toolbox-padding);
& .urlbar-input-container { & .urlbar-input-container {
padding-right: 2px; padding-right: 2px;
} }

View file

@ -53,7 +53,7 @@
outline-color: none !important; outline-color: none !important;
} }
#identity-box.chromeUI:not([pageproxystate="invalid"]) { #identity-box.chromeUI:not([pageproxystate="invalid"]) {
& #identity-icon-box { & #identity-icon-box {
background: light-dark(rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1)) !important; background: light-dark(rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.1)) !important;
} }
@ -65,7 +65,7 @@
#identity-permission-box:not(:hover):not(:focus-within) { #identity-permission-box:not(:hover):not(:focus-within) {
background: transparent !important; background: transparent !important;
} }
#urlbar:is([focused], [open]) > #urlbar-background, #urlbar:is([focused], [open]) > #urlbar-background,
#searchbar:focus-within { #searchbar:focus-within {
@ -161,7 +161,7 @@
padding: 0; padding: 0;
margin-top: auto; margin-top: auto;
margin-bottom: auto; margin-bottom: auto;
} }
} }
} }
@ -279,7 +279,7 @@ button.popup-notification-dropmarker {
align-items: center; align-items: center;
} }
:root:not([zen-single-toolbar='true']) #nav-bar { :root:not([zen-single-toolbar='true']) #nav-bar {
margin-bottom: -1px; margin-bottom: -1px;
} }

View file

@ -60,7 +60,7 @@
filter: grayscale(1); filter: grayscale(1);
transition: opacity 0.2s; transition: opacity 0.2s;
} }
&[active='true'] { &[active='true'] {
filter: none; filter: none;
opacity: 1; opacity: 1;
@ -401,7 +401,7 @@
font-weight: 600; font-weight: 600;
align-items: center; align-items: center;
position: relative; position: relative;
& #zen-current-workspace-indicator-icon { & #zen-current-workspace-indicator-icon {
font-size: 14px; font-size: 14px;
} }

View file

@ -192,7 +192,7 @@
this.lastCurrentTab.removeAttribute("zen-glance-tab"); this.lastCurrentTab.removeAttribute("zen-glance-tab");
this.lastCurrentTab._closingGlance = true; this.lastCurrentTab._closingGlance = true;
gBrowser.tabContainer._invalidateCachedTabs(); gBrowser.tabContainer._invalidateCachedTabs();
gBrowser.removeTab(this.lastCurrentTab, { animate: true }); gBrowser.removeTab(this.lastCurrentTab, { animate: true });
@ -200,10 +200,10 @@
this.#currentBrowser = null; this.#currentBrowser = null;
this.lastCurrentTab = null; this.lastCurrentTab = null;
this._duringOpening = false; this._duringOpening = false;
}, 400); }, 400);
}); });
}); });
} }
quickOpenGlance() { quickOpenGlance() {
@ -231,7 +231,7 @@
quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false } = {}) { quickCloseGlance({ closeCurrentTab = true, closeParentTab = true, justAnimateParent = false } = {}) {
const parentHasBrowser = !!(this.currentParentTab.linkedBrowser); const parentHasBrowser = !!(this.currentParentTab.linkedBrowser);
if (!justAnimateParent) { if (!justAnimateParent) {
if (parentHasBrowser) { if (parentHasBrowser) {
if (closeParentTab) { if (closeParentTab) {
this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.remove("deck-selected"); this.currentParentTab.linkedBrowser.closest(".browserSidebarContainer").classList.remove("deck-selected");
@ -277,7 +277,7 @@
} }
} }
fullyOpenGlance() { fullyOpenGlance() {
gBrowser._insertTabAtIndex(this.#currentTab, { gBrowser._insertTabAtIndex(this.#currentTab, {
index: this.#currentTab._tPos + 1, index: this.#currentTab._tPos + 1,
}); });

View file

@ -19,7 +19,7 @@
ChromeUtils.defineLazyGetter(this, 'panel', () => document.getElementById('PanelUI-zen-gradient-generator')); ChromeUtils.defineLazyGetter(this, 'panel', () => document.getElementById('PanelUI-zen-gradient-generator'));
ChromeUtils.defineLazyGetter(this, 'toolbox', () => document.getElementById('TabsToolbar')); ChromeUtils.defineLazyGetter(this, 'toolbox', () => document.getElementById('TabsToolbar'));
ChromeUtils.defineLazyGetter(this, 'customColorInput', () => document.getElementById('PanelUI-zen-gradient-generator-custom-input')); ChromeUtils.defineLazyGetter(this, 'customColorInput', () => document.getElementById('PanelUI-zen-gradient-generator-custom-input'));
ChromeUtils.defineLazyGetter(this, 'customColorList', () => document.getElementById('PanelUI-zen-gradient-generator-custom-list')); ChromeUtils.defineLazyGetter(this, 'customColorList', () => document.getElementById('PanelUI-zen-gradient-generator-custom-list'));
XPCOMUtils.defineLazyPreferenceGetter( XPCOMUtils.defineLazyPreferenceGetter(
this, this,
@ -74,7 +74,7 @@
this.image.onload = this.onImageLoad.bind(this); this.image.onload = this.onImageLoad.bind(this);
} }
onImageLoad() { onImageLoad() {
// resize the image to fit the panel // resize the image to fit the panel
const imageSize = 300 - 20; // 20 is the padding (10px) const imageSize = 300 - 20; // 20 is the padding (10px)
@ -164,11 +164,11 @@
this.rotationInputDot.style.transform = `rotate(${degrees - 20}deg)`; this.rotationInputDot.style.transform = `rotate(${degrees - 20}deg)`;
this.rotationInputText.textContent = `${fixedRotation}°`; this.rotationInputText.textContent = `${fixedRotation}°`;
} }
initCustomColorInput() { initCustomColorInput() {
this.customColorInput.addEventListener('keydown', this.onCustomColorKeydown.bind(this)); this.customColorInput.addEventListener('keydown', this.onCustomColorKeydown.bind(this));
} }
onCustomColorKeydown(event) { onCustomColorKeydown(event) {
//checks for enter key for custom colors //checks for enter key for custom colors
if (event.key === 'Enter') { if (event.key === 'Enter') {
@ -246,19 +246,19 @@
onThemePickerClick(event) { onThemePickerClick(event) {
event.preventDefault(); event.preventDefault();
if (event.button !== 0 || this.dragging ) return; if (event.button !== 0 || this.dragging ) return;
const gradient = this.panel.querySelector('.zen-theme-picker-gradient'); const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
const rect = gradient.getBoundingClientRect(); const rect = gradient.getBoundingClientRect();
const padding = 90; // each side const padding = 90; // each side
const centerX = rect.left + rect.width / 2; const centerX = rect.left + rect.width / 2;
const centerY = rect.top + rect.height / 2; const centerY = rect.top + rect.height / 2;
const radius = (rect.width - padding) / 2; const radius = (rect.width - padding) / 2;
let pixelX = event.clientX; let pixelX = event.clientX;
let pixelY = event.clientY; let pixelY = event.clientY;
// Check if the click is within the circle // Check if the click is within the circle
const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2); const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
if (distance > radius) { if (distance > radius) {
@ -268,33 +268,33 @@
// Check if we clicked on an existing dot // Check if we clicked on an existing dot
const clickedElement = event.target; const clickedElement = event.target;
const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot'); const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot');
// Only proceed if not clicking on an existing dot // Only proceed if not clicking on an existing dot
if (!isExistingDot) { if (!isExistingDot) {
const relativeX = event.clientX - rect.left; const relativeX = event.clientX - rect.left;
const relativeY = event.clientY - rect.top; const relativeY = event.clientY - rect.top;
const color = this.getColorFromPosition(relativeX, relativeY); const color = this.getColorFromPosition(relativeX, relativeY);
// Create new dot // Create new dot
const dot = document.createElement('div'); const dot = document.createElement('div');
dot.classList.add('zen-theme-picker-dot'); dot.classList.add('zen-theme-picker-dot');
dot.addEventListener('mousedown', this.onDotMouseDown.bind(this)); dot.addEventListener('mousedown', this.onDotMouseDown.bind(this));
dot.style.left = `${relativeX}px`; dot.style.left = `${relativeX}px`;
dot.style.top = `${relativeY}px`; dot.style.top = `${relativeY}px`;
dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`); dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`);
gradient.appendChild(dot); gradient.appendChild(dot);
this.updateCurrentWorkspace(true); this.updateCurrentWorkspace(true);
} }
} }
onDotMouseDown(event) { onDotMouseDown(event) {
event.preventDefault(); event.preventDefault();
@ -305,7 +305,7 @@
this.draggedDot = event.target; this.draggedDot = event.target;
this.draggedDot.style.zIndex = 1; this.draggedDot.style.zIndex = 1;
this.draggedDot.classList.add('dragging'); this.draggedDot.classList.add('dragging');
// Store the starting position of the drag // Store the starting position of the drag
this.dragStartPosition = { this.dragStartPosition = {
x: event.clientX, x: event.clientX,
@ -320,9 +320,9 @@
const rect = this.panel.querySelector('.zen-theme-picker-gradient').getBoundingClientRect(); const rect = this.panel.querySelector('.zen-theme-picker-gradient').getBoundingClientRect();
const padding = 90; // each side const padding = 90; // each side
// do NOT let the ball be draged outside of an imaginary circle. You can drag it anywhere inside the circle // do NOT let the ball be draged outside of an imaginary circle. You can drag it anywhere inside the circle
// if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball // if the distance between the center of the circle and the dragged ball is bigger than the radius, then the ball
// should be placed on the edge of the circle. If it's inside the circle, then the ball just follows the mouse // should be placed on the edge of the circle. If it's inside the circle, then the ball just follows the mouse
const centerX = rect.left + rect.width / 2; const centerX = rect.left + rect.width / 2;
const centerY = rect.top + rect.height / 2; const centerY = rect.top + rect.height / 2;
const radius = (rect.width - padding) / 2; const radius = (rect.width - padding) / 2;
@ -358,18 +358,18 @@
listItems.querySelector('.zen-theme-picker-dot-custom').style.setProperty('--zen-theme-picker-dot-color', color); listItems.querySelector('.zen-theme-picker-dot-custom').style.setProperty('--zen-theme-picker-dot-color', color);
listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color; listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color;
this.customColorList.appendChild(listItems); this.customColorList.appendChild(listItems);
} }
async addCustomColor() { async addCustomColor() {
const color = this.customColorInput.value; const color = this.customColorInput.value;
if (!color) { if (!color) {
return; return;
} }
// can be any color format, we just add it to the list as a dot, but hidden // can be any color format, we just add it to the list as a dot, but hidden
const dot = document.createElement('div'); const dot = document.createElement('div');
@ -385,46 +385,46 @@
onThemePickerClick(event) { onThemePickerClick(event) {
event.preventDefault(); event.preventDefault();
if (event.button !== 0 || this.dragging) return; if (event.button !== 0 || this.dragging) return;
const gradient = this.panel.querySelector('.zen-theme-picker-gradient'); const gradient = this.panel.querySelector('.zen-theme-picker-gradient');
const rect = gradient.getBoundingClientRect(); const rect = gradient.getBoundingClientRect();
const padding = 90; // each side const padding = 90; // each side
const centerX = rect.left + rect.width / 2; const centerX = rect.left + rect.width / 2;
const centerY = rect.top + rect.height / 2; const centerY = rect.top + rect.height / 2;
const radius = (rect.width - padding) / 2; const radius = (rect.width - padding) / 2;
let pixelX = event.clientX; let pixelX = event.clientX;
let pixelY = event.clientY; let pixelY = event.clientY;
// Check if the click is within the circle // Check if the click is within the circle
const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2); const distance = Math.sqrt((pixelX - centerX) ** 2 + (pixelY - centerY) ** 2);
if (distance > radius) { if (distance > radius) {
return; return;
} }
const clickedElement = event.target; const clickedElement = event.target;
const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot'); const isExistingDot = clickedElement.classList.contains('zen-theme-picker-dot');
if (!isExistingDot && this.numberOfDots < ZenThemePicker.MAX_DOTS) { if (!isExistingDot && this.numberOfDots < ZenThemePicker.MAX_DOTS) {
const relativeX = event.clientX - rect.left; const relativeX = event.clientX - rect.left;
const relativeY = event.clientY - rect.top; const relativeY = event.clientY - rect.top;
const color = this.getColorFromPosition(relativeX, relativeY); const color = this.getColorFromPosition(relativeX, relativeY);
const dot = document.createElement('div'); const dot = document.createElement('div');
dot.classList.add('zen-theme-picker-dot'); dot.classList.add('zen-theme-picker-dot');
dot.addEventListener('mousedown', this.onDotMouseDown.bind(this)); dot.addEventListener('mousedown', this.onDotMouseDown.bind(this));
dot.style.left = `${relativeX}px`; dot.style.left = `${relativeX}px`;
dot.style.top = `${relativeY}px`; dot.style.top = `${relativeY}px`;
dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`); dot.style.setProperty('--zen-theme-picker-dot-color', `rgb(${color[0]}, ${color[1]}, ${color[2]})`);
gradient.appendChild(dot); gradient.appendChild(dot);
this.updateCurrentWorkspace(true); this.updateCurrentWorkspace(true);
} }
} }
@ -438,7 +438,7 @@
this.draggedDot = event.target; this.draggedDot = event.target;
this.draggedDot.style.zIndex = 1; this.draggedDot.style.zIndex = 1;
this.draggedDot.classList.add('dragging'); this.draggedDot.classList.add('dragging');
// Store the starting position of the drag // Store the starting position of the drag
this.dragStartPosition = { this.dragStartPosition = {
x: event.clientX, x: event.clientX,
@ -459,7 +459,7 @@
if (this.dragging) { if (this.dragging) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
this.dragging = false; this.dragging = false;
this.draggedDot.style.zIndex = 1; this.draggedDot.style.zIndex = 1;
this.draggedDot.classList.remove('dragging'); this.draggedDot.classList.remove('dragging');
@ -586,13 +586,13 @@
} }
} }
const result = this.pSBC( const result = this.pSBC(
this.isDarkMode ? 0.2 : -0.5, this.isDarkMode ? 0.2 : -0.5,
`rgb(${dominantColor[0]}, ${dominantColor[1]}, ${dominantColor[2]})`); `rgb(${dominantColor[0]}, ${dominantColor[1]}, ${dominantColor[2]})`);
return result?.match(/\d+/g).map(Number); return result?.match(/\d+/g).map(Number);
} }
async onWorkspaceChange(workspace, skipUpdate = false, theme = null) { async onWorkspaceChange(workspace, skipUpdate = false, theme = null) {
const uuid = workspace.uuid; const uuid = workspace.uuid;
// Use theme from workspace object or passed theme // Use theme from workspace object or passed theme
let workspaceTheme = theme || workspace.theme; let workspaceTheme = theme || workspace.theme;
@ -615,7 +615,7 @@
dot.remove(); dot.remove();
} }
} }
const appWrapper = browser.document.getElementById('zen-main-app-wrapper'); const appWrapper = browser.document.getElementById('zen-main-app-wrapper');
if (!skipUpdate) { if (!skipUpdate) {
@ -655,7 +655,7 @@
const gradient = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors); const gradient = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors);
const gradientToolbar = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors, true); const gradientToolbar = browser.gZenThemePicker.getGradient(workspaceTheme.gradientColors, true);
browser.gZenThemePicker.updateNoise(workspaceTheme.texture); browser.gZenThemePicker.updateNoise(workspaceTheme.texture);
for (const dot of workspaceTheme.gradientColors) { for (const dot of workspaceTheme.gradientColors) {
if (dot.isCustom) { if (dot.isCustom) {
browser.gZenThemePicker.addColorToCustomList(dot.c); browser.gZenThemePicker.addColorToCustomList(dot.c);

View file

@ -874,7 +874,7 @@ var gZenKeyboardShortcutsManager = {
browser.gZenKeyboardShortcutsManager._zenKeyset = browser.document.createXULElement('keyset'); browser.gZenKeyboardShortcutsManager._zenKeyset = browser.document.createXULElement('keyset');
browser.gZenKeyboardShortcutsManager._zenKeyset.id = ZEN_KEYSET_ID; browser.gZenKeyboardShortcutsManager._zenKeyset.id = ZEN_KEYSET_ID;
const mainKeyset = browser.document.getElementById(ZEN_MAIN_KEYSET_ID); const mainKeyset = browser.document.getElementById(ZEN_MAIN_KEYSET_ID);
mainKeyset.after(browser.gZenKeyboardShortcutsManager._zenKeyset); mainKeyset.after(browser.gZenKeyboardShortcutsManager._zenKeyset);
} }

View file

@ -149,8 +149,8 @@ var ZenPinnedTabsStorage = {
async getGroupChildren(groupUuid) { async getGroupChildren(groupUuid) {
const db = await PlacesUtils.promiseDBConnection(); const db = await PlacesUtils.promiseDBConnection();
const rows = await db.executeCached(` const rows = await db.executeCached(`
SELECT * FROM zen_pins SELECT * FROM zen_pins
WHERE parent_uuid = :groupUuid WHERE parent_uuid = :groupUuid
ORDER BY position ASC ORDER BY position ASC
`, { groupUuid }); `, { groupUuid });

View file

@ -17,7 +17,7 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature {
DEFAULT_MOBILE_USER_AGENT = `Mozilla/5.0 (Android 12; Mobile; rv:129.0) Gecko/20100101 Firefox/${AppConstants.ZEN_FIREFOX_VERSION}`; DEFAULT_MOBILE_USER_AGENT = `Mozilla/5.0 (Android 12; Mobile; rv:129.0) Gecko/20100101 Firefox/${AppConstants.ZEN_FIREFOX_VERSION}`;
MAX_SIDEBAR_PANELS = Services.prefs.getIntPref('zen.sidebar.max-webpanels'); MAX_SIDEBAR_PANELS = Services.prefs.getIntPref('zen.sidebar.max-webpanels');
init() { init() {
ChromeUtils.defineLazyGetter(this, 'sidebar', () => document.getElementById('zen-sidebar-web-panel')); ChromeUtils.defineLazyGetter(this, 'sidebar', () => document.getElementById('zen-sidebar-web-panel'));
ChromeUtils.defineLazyGetter(this, 'forwardButton', () => document.getElementById('zen-sidebar-web-panel-forward')); ChromeUtils.defineLazyGetter(this, 'forwardButton', () => document.getElementById('zen-sidebar-web-panel-forward'));
@ -615,7 +615,7 @@ class ZenBrowserManagerSidebar extends ZenDOMOperatedFeature {
this._setPinnedToElements(); this._setPinnedToElements();
this.moveToTabBox(); this.moveToTabBox();
} }
this.update(); this.update();
} }
get sidebarElement() { get sidebarElement() {

View file

@ -658,7 +658,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
<div class="zen-workspace-container" ${containerGroup ? '' : 'hidden="true"'}> <div class="zen-workspace-container" ${containerGroup ? '' : 'hidden="true"'}>
</div> </div>
</vbox> </vbox>
<image class="toolbarbutton-icon zen-workspace-actions-reorder-icon" ></image> <image class="toolbarbutton-icon zen-workspace-actions-reorder-icon" ></image>
<toolbarbutton closemenu="none" class="toolbarbutton-1 zen-workspace-actions"> <toolbarbutton closemenu="none" class="toolbarbutton-1 zen-workspace-actions">
<image class="toolbarbutton-icon" id="zen-workspace-actions-menu-icon"></image> <image class="toolbarbutton-icon" id="zen-workspace-actions-menu-icon"></image>
</toolbarbutton> </toolbarbutton>

View file

@ -128,7 +128,7 @@ var ZenWorkspacesStorage = {
uuid, name, icon, is_default, container_id, created_at, updated_at, "position", uuid, name, icon, is_default, container_id, created_at, updated_at, "position",
theme_type, theme_colors, theme_opacity, theme_rotation, theme_texture theme_type, theme_colors, theme_opacity, theme_rotation, theme_texture
) VALUES ( ) VALUES (
:uuid, :name, :icon, :is_default, :container_id, :uuid, :name, :icon, :is_default, :container_id,
COALESCE((SELECT created_at FROM zen_workspaces WHERE uuid = :uuid), :now), COALESCE((SELECT created_at FROM zen_workspaces WHERE uuid = :uuid), :now),
:now, :now,
:position, :position,

View file

@ -62,7 +62,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
url = this.contentWindow.location.origin + url; url = this.contentWindow.location.origin + url;
} }
const rect = target.getBoundingClientRect(); const rect = target.getBoundingClientRect();
this.sendAsyncMessage('ZenGlance:OpenGlance', { this.sendAsyncMessage('ZenGlance:OpenGlance', {
url, url,
x: rect.left, x: rect.left,
y: rect.top, y: rect.top,
@ -117,7 +117,7 @@ export class ZenGlanceChild extends JSWindowActorChild {
if (target) { if (target) {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
this.openGlance(target); this.openGlance(target);
} }
} }

View file

@ -1024,7 +1024,7 @@ Preferences.addAll([
{ {
id: "zen.glance.activation-method", id: "zen.glance.activation-method",
type: "string", type: "string",
default: "ctrl", default: "ctrl",
}, },
{ {
id: "zen.glance.enabled", id: "zen.glance.enabled",

View file

@ -11,7 +11,7 @@
<label><html:h2 data-l10n-id="zen-settings-CKS-header"/></label> <label><html:h2 data-l10n-id="zen-settings-CKS-header"/></label>
<description class="description-deemphasized" data-l10n-id="zen-settings-CKS-description" /> <description class="description-deemphasized" data-l10n-id="zen-settings-CKS-description" />
<hbox> <hbox>
<button id="zenCKSResetButton" data-l10n-id="zen-settings-CKS-reset-shortcuts" class="reset-button"/> <button id="zenCKSResetButton" data-l10n-id="zen-settings-CKS-reset-shortcuts" class="reset-button"/>
</hbox> </hbox>
<vbox id="zenCKSOption-wrapper"></vbox> <vbox id="zenCKSOption-wrapper"></vbox>
</groupbox> </groupbox>

View file

@ -67,7 +67,7 @@
</g> </g>
</g> </g>
</g> </g>
</svg> </svg>
</div> </div>
<div class="web-appearance-choice-footer"> <div class="web-appearance-choice-footer">
<input type="radio" name="web-appearance" value="amoled" data-l10n-id="preferences-web-appearance-choice-input-auto" <input type="radio" name="web-appearance" value="amoled" data-l10n-id="preferences-web-appearance-choice-input-auto"
@ -112,7 +112,7 @@
</g> </g>
</g> </g>
</g> </g>
</svg> </svg>
</div> </div>
<div class="web-appearance-choice-footer"> <div class="web-appearance-choice-footer">
<input type="radio" name="web-appearance" value="default" data-l10n-id="preferences-web-appearance-choice-input-light" <input type="radio" name="web-appearance" value="default" data-l10n-id="preferences-web-appearance-choice-input-light"
@ -157,7 +157,7 @@
</g> </g>
</g> </g>
</g> </g>
</svg> </svg>
</div> </div>
<div class="web-appearance-choice-footer"> <div class="web-appearance-choice-footer">
<input type="radio" name="web-appearance" value="colorful" data-l10n-id="preferences-web-appearance-choice-input-dark" <input type="radio" name="web-appearance" value="colorful" data-l10n-id="preferences-web-appearance-choice-input-dark"

View file

@ -36,7 +36,7 @@
<checkbox id="zenWorkspaceHideDeactivatedWorkspaces" <checkbox id="zenWorkspaceHideDeactivatedWorkspaces"
data-l10n-id="zen-settings-workspaces-hide-deactivated-workspaces" data-l10n-id="zen-settings-workspaces-hide-deactivated-workspaces"
preference="zen.workspaces.hide-deactivated-workspaces"/> preference="zen.workspaces.hide-deactivated-workspaces"/>
</vbox> </vbox>
</groupbox> </groupbox>

View file

@ -31,11 +31,11 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
<div class="page" id="welcome"> <div class="page" id="welcome">
<img class="icon" src="chrome://branding/content/about-logo.png" /> <img class="icon" src="chrome://branding/content/about-logo.png" />
<h1 data-l10n-id="welcome-dialog-welcome"></h1> <h1 data-l10n-id="welcome-dialog-welcome"></h1>
<p data-l10n-id="welcome-dialog-welcome-subtext"></p> <p data-l10n-id="welcome-dialog-welcome-subtext"></p>
</div> </div>
<div class="page page-split" id="import"> <div class="page page-split" id="import">
<div> <div>
<h1 data-l10n-id="welcome-dialog-import"></h1> <h1 data-l10n-id="welcome-dialog-import"></h1>
@ -51,7 +51,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
</hbox> </hbox>
</div> </div>
</div> </div>
<div class="page page-split" id="theme"> <div class="page page-split" id="theme">
<div> <div>
<h1 data-l10n-id="welcome-dialog-theme"></h1> <h1 data-l10n-id="welcome-dialog-theme"></h1>
@ -120,11 +120,11 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
<rect width="700" height="700" fill="white"/> <rect width="700" height="700" fill="white"/>
</clipPath> </clipPath>
</defs> </defs>
</svg> </svg>
</div> </div>
</div> </div>
</div> </div>
<div class="page page-split" id="search"> <div class="page page-split" id="search">
<div> <div>
<h1 data-l10n-id="welcome-dialog-search"></h1> <h1 data-l10n-id="welcome-dialog-search"></h1>
@ -134,7 +134,7 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
<div id="searchList" class="cardGroup"></div> <div id="searchList" class="cardGroup"></div>
</div> </div>
</div> </div>
<div class="page" id="thanks"> <div class="page" id="thanks">
<h1 data-l10n-id="welcome-dialog-thanks"></h1> <h1 data-l10n-id="welcome-dialog-thanks"></h1>
<p data-l10n-id="welcome-dialog-thanks-subtext"></p> <p data-l10n-id="welcome-dialog-thanks-subtext"></p>