diff --git a/l10n b/l10n index ce5959274..c4bb278c9 160000 --- a/l10n +++ b/l10n @@ -1 +1 @@ -Subproject commit ce5959274243ca00611c4efb4848db1f4ae227dd +Subproject commit c4bb278c97a9ffd9fd7441ff50191fcbdbcb7f51 diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css index 5c5bbe9e1..7bbc53ee5 100644 --- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css +++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css @@ -71,6 +71,10 @@ -moz-window-dragging: no-drag; --zen-sidebar-action-button-width: 38px; padding-bottom: calc(5px + 5px); /* Taking into consideration the padding of the sidebar without being inlined */ + + :root[zen-sidebar-legacy="true"] & { + padding-top: 0 !important; + } } #TabsToolbar-customization-target { @@ -117,7 +121,7 @@ } .tabbrowser-tab { - --zen-browser-tab-icon-size: 18px; + --zen-browser-tab-icon-size: 16px; --tab-min-width: 36px; margin: 0 auto; border-radius: 8px; diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css index b754018a1..5e78aa6d7 100644 --- a/src/browser/base/content/zen-styles/zen-workspaces.css +++ b/src/browser/base/content/zen-styles/zen-workspaces.css @@ -1,6 +1,6 @@ #zen-workspaces-button { - --zen-workspaces-button-vmargin: 0.35rem; + --zen-workspaces-button-vmargin: 0.4rem; border: 1px solid var(--zen-colors-border); border-radius: 50px; width: calc(var(--zen-sidebar-action-button-width) - 5px) !important; @@ -10,6 +10,10 @@ justify-content: center; align-items: center; display: flex; + + :root[zen-sidebar-legacy="true"] & { + margin-top: 0 !important; + } } #zen-workspaces-button .zen-workspace-sidebar-name { diff --git a/src/browser/components/preferences/zen-settings.js b/src/browser/components/preferences/zen-settings.js index d26b772da..3dba852c4 100644 --- a/src/browser/components/preferences/zen-settings.js +++ b/src/browser/components/preferences/zen-settings.js @@ -228,6 +228,26 @@ var gZenLooksAndFeel = { this._initializeTabbarExpandForm(); gZenThemeBuilder.init(); gZenMarketplaceManager.init(); + var onLegacyToolbarChange = this.onLegacyToolbarChange.bind(this); + Services.prefs.addObserver("zen.themes.tabs.legacy-location", onLegacyToolbarChange); + window.addEventListener("unload", () => { + Services.prefs.removeObserver("zen.themes.tabs.legacy-location", onLegacyToolbarChange); + }); + }, + + async onLegacyToolbarChange(event) { + let buttonIndex = await confirmRestartPrompt( + true, + 1, + true, + false + ); + if (buttonIndex == CONFIRM_RESTART_PROMPT_RESTART_NOW) { + Services.startup.quit( + Ci.nsIAppStartup.eAttemptQuit | Ci.nsIAppStartup.eRestart + ); + return; + } }, _initializeTabbarExpandForm() {