diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 0a4eeb9d2..360044265 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -75,12 +75,15 @@ pref('zen.welcomeScreen.enabled', true); pref('zen.welcomeScreen.seen', false); pref('zen.tabs.vertical', true); pref('zen.tabs.vertical.right-side', false); -pref('zen.tabs.show-newtab-under', true); pref('zen.theme.accent-color', "#aac7ff"); pref('zen.theme.content-element-separation', 6); // In pixels pref('zen.theme.pill-button', false); pref('zen.theme.gradient', true); +pref('zen.tabs.show-newtab-vertical', true); +pref('zen.view.show-newtab-button-border-top', false); +pref('zen.view.show-newtab-button-top', true); + #ifdef XP_MACOSX // Disable for macos in the meantime until @HarryHeres finds a solution for hight DPI screens pref('zen.view.experimental-rounded-view', false); 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 10794e474..dd245966d 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 @@ -730,9 +730,13 @@ display: none; } - @media (-moz-bool-pref: 'zen.tabs.show-newtab-under') { + @media (-moz-bool-pref: 'zen.tabs.show-newtab-vertical') { #tabs-newtab-button { display: flex !important; + + @media (-moz-bool-pref: 'zen.view.show-newtab-button-top') { + order: -1; + } } #tabbrowser-arrowscrollbox-periphery { @@ -740,19 +744,20 @@ --zen-colors-border: var(--zen-colors-tertiary); } - margin-top: 15px; - position: relative; - - &::before { - content: ''; - display: block; - height: 1px; - background: light-dark(rgba(1, 1, 1, 0.075), rgba(255, 255, 255, 0.1)); - width: 98%; - position: absolute; - top: -8px; - left: 50%; - transform: translateX(-50%); + @media (-moz-bool-pref: 'zen.view.show-newtab-button-border-top') and (not (-moz-bool-pref: 'zen.view.show-newtab-button-top')) { + margin-top: 15px; + position: relative; + &::before { + content: ''; + display: block; + height: 1px; + background: light-dark(rgba(1, 1, 1, 0.075), rgba(255, 255, 255, 0.1)); + width: 98%; + position: absolute; + top: -8px; + left: 50%; + transform: translateX(-50%); + } } } } diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css index 1ab6f7569..69e25175e 100644 --- a/src/browser/base/content/zen-styles/zen-workspaces.css +++ b/src/browser/base/content/zen-styles/zen-workspaces.css @@ -410,7 +410,7 @@ /* Mark workspaces indicator */ #zen-current-workspace-indicator { - margin: calc(var(--zen-toolbox-padding) * 4) calc(4px + var(--tab-inline-padding)) calc(var(--zen-toolbox-padding) * 3); + margin: 20px calc(4px + var(--tab-inline-padding)) 15px; font-weight: 600; align-items: center; position: relative; @@ -433,7 +433,7 @@ } & #zen-current-workspace-indicator-icon:not([hidden]) + #zen-current-workspace-indicator-name { - margin-left: 23px; + margin-left: 27px; } }