From 7364062e8c3b5e29a965290c518563b4c3fd3503 Mon Sep 17 00:00:00 2001 From: "mr. M" Date: Tue, 18 Feb 2025 13:49:56 +0100 Subject: [PATCH 1/2] Enhance styling for URL bar and popups; update icon sizes and SVG dimensions --- src/browser/base/content/zen-styles/zen-popup.css | 4 ---- src/browser/base/content/zen-styles/zen-theme.css | 3 +++ src/browser/base/content/zen-styles/zen-urlbar.css | 4 ++++ src/browser/themes/shared/zen-icons/icons.css | 2 +- src/browser/themes/shared/zen-icons/lin/icons.css | 7 ++++++- .../themes/shared/zen-icons/win/drag-indicator.svg | 12 ++++++------ .../themes/shared/zen-icons/win/edit-theme.svg | 4 ++-- src/browser/themes/shared/zen-icons/win/move-tab.svg | 4 ++-- .../themes/shared/zen-icons/win/new-tab-image.svg | 4 ++-- 9 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/browser/base/content/zen-styles/zen-popup.css b/src/browser/base/content/zen-styles/zen-popup.css index fb2a2e5ac..39d269389 100644 --- a/src/browser/base/content/zen-styles/zen-popup.css +++ b/src/browser/base/content/zen-styles/zen-popup.css @@ -88,10 +88,6 @@ panel { padding-inline-start: calc(16px + var(--uc-arrowpanel-menuicon-margin-inline)); } -.subviewbutton > .toolbarbutton-icon { - width: 15px; -} - /* firefox profile avatar in appmenu */ #appMenu-fxa-label2::before { content: ''; diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css index fb90fcaaa..520f6ce27 100644 --- a/src/browser/base/content/zen-styles/zen-theme.css +++ b/src/browser/base/content/zen-styles/zen-theme.css @@ -138,6 +138,9 @@ --fp-contextmenu-menuitem-border-radius: calc(4px + var(--fp-contextmenu-menuitem-border-width)); --fp-contextmenu-menuitem-padding-block: 6px; --fp-contextmenu-menuitem-padding-inline: 10px; + @media (-moz-platform: windows) { + --fp-contextmenu-menuitem-padding-inline: 8px; + } --fp-contextmenu-menuitem-border-width: 2px; --fp-contextmenu-menuicon-margin-inline: 12px; --fp-contextmenu-menuitem-margin-inline: calc(4px - var(--fp-contextmenu-menuitem-border-width)); diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css index 042c4d400..ac09c662c 100644 --- a/src/browser/base/content/zen-styles/zen-urlbar.css +++ b/src/browser/base/content/zen-styles/zen-urlbar.css @@ -126,6 +126,10 @@ backdrop-filter: none !important; } +#urlbar-go-button { + margin: auto 0; +} + :root[zen-single-toolbar='true'] { .urlbar-page-action:not([open]), #tracking-protection-icon-container { diff --git a/src/browser/themes/shared/zen-icons/icons.css b/src/browser/themes/shared/zen-icons/icons.css index a44d27339..b275ed333 100644 --- a/src/browser/themes/shared/zen-icons/icons.css +++ b/src/browser/themes/shared/zen-icons/icons.css @@ -637,7 +637,7 @@ #PanelUI-history toolbarbutton, #unified-extensions-context-menu menuitem { background-image: var(--menu-image) !important; - background-size: 16px !important; + background-size: 20px !important; background-position: var(--fp-contextmenu-menuitem-padding-inline) center !important; background-repeat: no-repeat !important; -moz-context-properties: fill, fill-opacity !important; diff --git a/src/browser/themes/shared/zen-icons/lin/icons.css b/src/browser/themes/shared/zen-icons/lin/icons.css index a44d27339..e492aa771 100644 --- a/src/browser/themes/shared/zen-icons/lin/icons.css +++ b/src/browser/themes/shared/zen-icons/lin/icons.css @@ -382,11 +382,16 @@ #protections-popup-mainView .subviewbutton-nav:not(.notFound)::after, #identity-popup-mainView .subviewbutton-nav::after, .widget-overflow-list .subviewbutton-nav::after, -.PanelUI-subView .subviewbutton-nav::after, .menu-right { content: url('arrow-right.svg') !important; } +@media not (-moz-platform: windows) { + #PanelUI-subView .subviewbutton-nav::after { + content: url('arrow-right.svg') !important; + } +} + #PlacesChevron, #urlbar-go-button { list-style-image: url('arrow-right.svg') !important; diff --git a/src/browser/themes/shared/zen-icons/win/drag-indicator.svg b/src/browser/themes/shared/zen-icons/win/drag-indicator.svg index 2a105bb92..01edf38a6 100644 --- a/src/browser/themes/shared/zen-icons/win/drag-indicator.svg +++ b/src/browser/themes/shared/zen-icons/win/drag-indicator.svg @@ -1,8 +1,8 @@ - - - - - - + + + + + + diff --git a/src/browser/themes/shared/zen-icons/win/edit-theme.svg b/src/browser/themes/shared/zen-icons/win/edit-theme.svg index 8a565f13d..ef696cb1c 100644 --- a/src/browser/themes/shared/zen-icons/win/edit-theme.svg +++ b/src/browser/themes/shared/zen-icons/win/edit-theme.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/browser/themes/shared/zen-icons/win/move-tab.svg b/src/browser/themes/shared/zen-icons/win/move-tab.svg index a31995e06..84ffa51f0 100644 --- a/src/browser/themes/shared/zen-icons/win/move-tab.svg +++ b/src/browser/themes/shared/zen-icons/win/move-tab.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/browser/themes/shared/zen-icons/win/new-tab-image.svg b/src/browser/themes/shared/zen-icons/win/new-tab-image.svg index 44ff4be77..17eb3b054 100644 --- a/src/browser/themes/shared/zen-icons/win/new-tab-image.svg +++ b/src/browser/themes/shared/zen-icons/win/new-tab-image.svg @@ -1,3 +1,3 @@ - - + + From c0d732da7c1482d84009ae6ed48da4624ecaecc2 Mon Sep 17 00:00:00 2001 From: "mr. M" Date: Tue, 18 Feb 2025 16:41:46 +0100 Subject: [PATCH 2/2] Fixed pinned tabs initialization when restoring 2 windows --- src/browser/base/zen-components/ZenPinnedTabManager.mjs | 5 +++-- src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs index 27718fdc1..e28c8c608 100644 --- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs +++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs @@ -99,6 +99,7 @@ } async _refreshPinnedTabs({ init = false } = {}) { + await ZenWorkspaces.promiseSectionsInitialized; await this._initializePinsCache(); await this._initializePinnedTabs(init); } @@ -249,10 +250,10 @@ this.log(`Created new pinned tab for pin ${pin.uuid} (isEssential: ${pin.isEssential})`); gBrowser.pinTab(newTab); if (!pin.isEssential) { - const contaienr = document.querySelector( + const container = document.querySelector( `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${pin.workspaceUuid}"]` ); - contaienr.insertBefore(newTab, contaienr.lastChild); + container.insertBefore(newTab, container.lastChild); } gBrowser.tabContainer._invalidateCachedTabs(); diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs index 2a488401e..d4b073917 100644 --- a/src/browser/base/zen-components/ZenWorkspaces.mjs +++ b/src/browser/base/zen-components/ZenWorkspaces.mjs @@ -171,7 +171,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature { const tabs = gBrowser.tabContainer.allTabs; const workspaces = await this._workspaces(); for (const workspace of workspaces.workspaces) { - this._createWorkspaceTabsSection(workspace, tabs, perifery); + await this._createWorkspaceTabsSection(workspace, tabs, perifery); } if (tabs.length) { const defaultSelectedContainer = document.querySelector(