mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update subproject commit references

Browse Source
This commit is contained in:
mauro-balades
2024-09-18 22:05:35 +02:00
parent 7eaa083c61
commit 7bf77d1d57
16 changed files with 107 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
l10n

Submodule l10n updated: 39b011023d...6934ff4f19

6
src/browser/app/profile/zen-browser.js
View File

@@ -100,12 +100,6 @@ pref('zen.keyboard.shortcuts.disable-firefox', false);
pref('zen.tabs.dim-pending', true);
pref('zen.themes.updated-value-observer', false);
#ifdef XP_MACOSX
pref('zen.themes.tabs.legacy-location', true);
#else
pref('zen.themes.tabs.legacy-location', false);
#endif
// Pref to enable the new profiles (TODO: Check this out!)
//pref("browser.profiles.enabled", true);

44
src/browser/base/content/ZenStartup.mjs
View File

@@ -76,14 +76,6 @@
}
tabs.style.maxHeight = totalHeight + 'px';
//console.info('ZenThemeModifier: set tabs max-height to', totalHeight + 'px');
const allTabs = document.getElementById('alltabs-button');
allTabs.removeAttribute('hidden');
allTabs.removeAttribute('badged');
allTabs.setAttribute('class', 'toolbarbutton-1 zen-sidebar-action-button');
document.getElementById('zen-sidebar-icons-wrapper').prepend(
allTabs
);
},
openWatermark() {
@@ -108,10 +100,6 @@
_changeSidebarLocation() {
const legacyLocation = Services.prefs.getBoolPref('zen.themes.tabs.legacy-location', false);
const kElementsToAppend = ['sidebar-splitter', 'sidebar-box'];
if (legacyLocation) {
kElementsToAppend.push('navigator-toolbox');
window.document.documentElement.setAttribute('zen-sidebar-legacy', 'true');
}
const wrapper = document.getElementById('zen-tabbox-wrapper');
const appWrapepr = document.getElementById('zen-sidebar-box-container');
for (let id of kElementsToAppend) {
@@ -124,9 +112,7 @@
const browser = document.getElementById('browser');
const toolbox = document.getElementById('navigator-toolbox');
if (!legacyLocation) {
browser.prepend(toolbox);
}
browser.prepend(toolbox);
// remove all styles except for the width, since we are xulstoring the complet style list
const width = toolbox.style.width;
@@ -140,6 +126,34 @@
splitter.setAttribute('resizebefore', 'sibling');
splitter.setAttribute('resizeafter', 'none');
toolbox.insertAdjacentElement('afterend', splitter);
this._moveWindowButtons();
this._addSidebarButtons();
},
_moveWindowButtons() {
const windowControls = document.getElementById('titlebar-buttonbox-container');
const toolboxIcons = document.getElementById('zen-sidebar-top-buttons');
if (AppConstants.platform == "macosx") {
toolboxIcons.prepend(windowControls);
}
},
_addSidebarButtons() {
const sidebarBox = window.MozXULElement.parseXULToFragment(`
<toolbar id="zen-sidebar-top-buttons" fullscreentoolbar="true" brighttext="true">
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" data-l10n-id="sidebar-zen-expand" oncommand="gZenVerticalTabsManager.toggleExpand();"></toolbarbutton>
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button chromeclass-toolbar-additional subviewbutton-nav" badge="true" closemenu="none" removable="true" delegatesanchor="true" cui-areatype="toolbar" id="zen-profile-button" data-l10n-id="toolbar-button-account" onclick="ZenProfileDialogUI.showSubView(this, event)"></toolbarbutton>
</toolbar>
`);
document.getElementById('navigator-toolbox').prepend(sidebarBox);
const sideBarTopButtons = document.getElementById('zen-sidebar-top-buttons');
const panelMenu = document.getElementById('PanelUI-menu-button');
panelMenu.classList.add('zen-sidebar-action-button');
panelMenu.setAttribute('cui-areatype', 'toolbar');
sideBarTopButtons.prepend(panelMenu);
},
_focusSearchBar() {

2
src/browser/base/content/zen-components

Submodule src/browser/base/content/zen-components updated: 0f775df5e6...72396b8f55

7
src/browser/base/content/zen-sidebar-icons.inc.xhtml
View File

@@ -1,9 +1,4 @@
<toolbar brighttext="true" id="zen-sidebar-icons-wrapper" class="zen-dont-hide-on-fullscreen">
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button chromeclass-toolbar-additional subviewbutton-nav" badge="true" closemenu="none" removable="true" delegatesanchor="true" cui-areatype="toolbar" id="zen-profile-button" data-l10n-id="toolbar-button-account" onclick="ZenProfileDialogUI.showSubView(this, event)">
</toolbarbutton>
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" data-l10n-id="sidebar-zen-expand" oncommand="gZenVerticalTabsManager.toggleExpand();"></toolbarbutton>
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-bookmark-button" data-l10n-id="sidebar-menu-bookmarks" onclick="gZenUIManager.toogleBookmarksSidebar();"></toolbarbutton>
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-history-button" data-l10n-id="sidebar-menu-history" oncommand="PanelUI.showSubView('PanelUI-history', this);"></toolbarbutton>
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-preferences-button" data-l10n-id="toolbar-settings-button" onclick="event.target.ownerGlobal.openPreferences(undefined);"></toolbarbutton>
<toolbarbutton class="toolbarbutton-1 zen-sidebar-action-button" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>
</toolbar>

9
src/browser/base/content/zen-styles/zen-browser-container.css
View File

@@ -1,4 +1,12 @@
:root:not([inDOMFullscreen='true']):not([chromehidden~='location']):not([chromehidden~='toolbar']) {
#tabbrowser-tabbox {
--zen-webview-correction-margin: 2px;
& > *:not(#tabbrowser-tabpanels) {
margin-top: var(--zen-webview-correction-margin);
}
}
& #tabbrowser-tabbox #tabbrowser-tabpanels .browserSidebarContainer {
width: -moz-available;
border-radius: var(--zen-webview-border-radius, var(--zen-border-radius));
@@ -6,7 +14,6 @@
position: relative;
/* This fixes an issue with the left border */
--zen-webview-correction-margin: 2px;
margin-left: var(--zen-webview-correction-margin);
margin-top: var(--zen-webview-correction-margin);

19
src/browser/base/content/zen-styles/zen-compact-mode.css
View File

@@ -85,24 +85,11 @@
@media not (-moz-bool-pref: 'zen.view.compact.hide-toolbar') {
#navigator-toolbox {
/* Remove the top margin */
/* The toolbox isn't relative to the webview anymore, meaning we can't just add a static value and call it a day...
* The top margin is calculated by taking the following factors into account:
* 1. Element separation
* 2. Extra margin to separate from the webview
* 3. Add element separation variable, to avoid overlaping with the toolbar
* 4. Calculate toolbar height, taken from zen-urlbar.css
*/
--zen-compact-toolbox-margin: calc(
var(--zen-element-separation) + 0.8rem +
(18px + (var(--toolbarbutton-inner-padding) * 2))
) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single);
--zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2)
var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single)
var(--zen-compact-toolbox-margin-single);
margin-top: 0 !important;
:root[zen-sidebar-legacy='true'] & {
--zen-compact-toolbox-margin: calc(var(--zen-compact-toolbox-margin-single) / 2)
var(--zen-compact-toolbox-margin-single) var(--zen-compact-toolbox-margin-single)
var(--zen-compact-toolbox-margin-single);
}
}
#zen-sidebar-web-panel-wrapper,

31
src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
View File

@@ -14,10 +14,6 @@
#browser {
--zen-toolbox-padding: 5px;
:root:not([zen-sidebar-legacy='true']) & {
--zen-toolbox-top-align: var(--zen-toolbox-padding);
}
}
#navigator-toolbox {
@@ -97,7 +93,7 @@
#zen-sidebar-icons-wrapper {
background: transparent;
& toolbarbutton {
& toolbarbutton:not(#zen-workspaces-button) {
width: fit-content;
padding: 0 !important;
}
@@ -158,10 +154,9 @@
--zen-toolbox-min-width: 150px;
& #zen-sidebar-icons-wrapper {
display: grid;
display: flex;
/* Make sure the icons take most of the space, smartly */
grid-template-columns: repeat(auto-fit, minmax(34px, auto));
gap: 4px;
flex-direction: row;
justify-content: space-between;
padding-top: calc(var(--zen-toolbox-padding) * 2);
@@ -169,7 +164,7 @@
width: 100%;
position: relative;
--toolbarbutton-inner-padding: 9px !important;
--toolbarbutton-inner-padding: var(--zen-toolbar-button-inner-padding) !important;
justify-content: space-between;
}
@@ -238,10 +233,6 @@
}
@media (-moz-bool-pref: 'zen.view.sidebar-expanded.on-hover') {
:root:not([zen-sidebar-legacy='true']) #navigator-toolbox:is([zen-user-hover='true']:hover, :not([zen-user-hover='true'])) {
padding-right: 47px !important;
}
& #zen-profile-button {
width: 100% !important;
padding: var(--toolbarbutton-inner-padding) !important;
@@ -470,4 +461,18 @@
opacity: 0;
display: none;
}
/* Mark: Sidebar top buttons */
#zen-sidebar-top-buttons {
--toolbarbutton-inner-padding: var(--zen-toolbar-button-inner-padding) !important;
gap: 5px;
& .zen-sidebar-action-button {
padding: 0 !important;
& label {
display: none !important;
}
}
}
}

4
src/browser/base/content/zen-styles/zen-theme.css
View File

@@ -74,6 +74,10 @@
--zen-button-border-radius: 7px;
--zen-button-padding: 0.6rem 1.2rem;
/* Toolbar */
--zen-toolbar-height: 39px;
--zen-toolbar-button-inner-padding: 6px;
/* Other colors */
--urlbar-box-bgcolor: var(--zen-urlbar-background) !important;
--toolbar-field-focus-background-color: var(--urlbar-box-bgcolor) !important;

3
src/browser/base/content/zen-styles/zen-toolbar.css
View File

@@ -1,4 +1,5 @@
#nav-bar {
#nav-bar,
#zen-sidebar-top-buttons {
background: transparent;
}

74
src/browser/base/content/zen-styles/zen-urlbar.css
View File

@@ -171,53 +171,26 @@ button.popup-notification-dropmarker {
margin-top: 5px;
}
:root:not([zen-sidebar-legacy='true']) {
@media (max-width: 650px) {
#urlbar-container {
width: calc(176px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding)));
}
#nav-bar[downloadsbuttonshown] #urlbar-container,
#nav-bar[unifiedextensionsbuttonshown] #urlbar-container {
width: calc(76px + 24px + 2 * var(--toolbarbutton-inner-padding));
}
#nav-bar[downloadsbuttonshown][unifiedextensionsbuttonshown] #urlbar-container {
width: 176px;
}
#identity-icon-box {
max-width: 70px;
}
#urlbar-zoom-button {
display: none;
}
@media (max-width: 550px) {
#urlbar-container {
width: calc(176px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding)));
}
}
:root[zen-sidebar-legacy='true'] {
@media (max-width: 550px) {
#urlbar-container {
width: calc(176px + 2 * (24px + 2 * var(--toolbarbutton-inner-padding)));
}
#nav-bar[downloadsbuttonshown] #urlbar-container,
#nav-bar[unifiedextensionsbuttonshown] #urlbar-container {
width: calc(76px + 24px + 2 * var(--toolbarbutton-inner-padding));
}
#nav-bar[downloadsbuttonshown] #urlbar-container,
#nav-bar[unifiedextensionsbuttonshown] #urlbar-container {
width: calc(76px + 24px + 2 * var(--toolbarbutton-inner-padding));
}
#nav-bar[downloadsbuttonshown][unifiedextensionsbuttonshown] #urlbar-container {
width: 176px;
}
#nav-bar[downloadsbuttonshown][unifiedextensionsbuttonshown] #urlbar-container {
width: 176px;
}
#identity-icon-box {
max-width: 70px;
}
#identity-icon-box {
max-width: 70px;
}
#urlbar-zoom-button {
display: none;
}
#urlbar-zoom-button {
display: none;
}
}
@@ -272,6 +245,15 @@ button.popup-notification-dropmarker {
}
}
#nav-bar,
#zen-sidebar-top-buttons {
min-height: var(--zen-toolbar-height) !important;
height: var(--zen-toolbar-height) !important;
max-height: var(--zen-toolbar-height) !important;
display: flex;
align-items: center;
}
/* Other small tweaks */
#nav-bar-customization-target {
/* Don't grow if potentially-user-sized elements (like the searchbar or the
@@ -279,6 +261,8 @@ button.popup-notification-dropmarker {
* available space as much as possible, see bug 1795260. */
min-width: 0;
--toolbarbutton-inner-padding: var(--zen-toolbar-button-inner-padding);
/* Add space to beginning of toolbar and make that space click the first <toolbarbutton> */
> :is(toolbarbutton, toolbaritem):first-child,
> toolbarpaletteitem:first-child > :is(toolbarbutton, toolbaritem) {
@@ -286,12 +270,6 @@ button.popup-notification-dropmarker {
}
}
@media (-moz-bool-pref: 'zen.view.compact') or (-moz-bool-pref: 'zen.themes.tabs.legacy-location') {
#nav-bar {
padding-left: var(--zen-element-separation) !important;
}
}
.titlebar-button:last-child {
padding-right: var(--zen-element-separation) !important;
}

10
src/browser/base/content/zen-styles/zen-workspaces.css
View File

@@ -1,12 +1,9 @@
#zen-workspaces-button {
border: 1px solid var(--zen-colors-border);
border-radius: var(--zen-button-border-radius);
min-height: 33px;
justify-content: center;
align-items: center;
display: flex;
box-shadow: rgba(0, 0, 0, 0.05) 0px 1px 2px 0px;
-moz-window-dragging: no-drag;
margin: 0 30px;
opacity: .6;
}
#zen-workspaces-button .zen-workspace-sidebar-name {
@@ -15,7 +12,7 @@
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
font-size: 12px;
font-size: 13px;
pointer-events: none;
}
@@ -51,7 +48,6 @@
white-space: nowrap;
text-overflow: ellipsis;
display: flex;
padding: 0 10px;
width: calc(100% - var(--zen-tabbrowser-padding) * 6) !important;
gap: 0.5ch;
}

10
src/browser/components/customizableui/CustomizableUI-sys-mjs.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/components/customizableui/CustomizableUI.sys.mjs b/browser/components/customizableui/CustomizableUI.sys.mjs
index f466105b8290b13c672351bb68dd92644dd670fe..b195cd59d7ff07ff512e7388c9dc33f3c661d955 100644
index 289c3df7dcd6fa6b35681ce61c1e920b6a2651d7..f15e9e92a27f1779cda6521e33915ddc4e3a93e5 100644
--- a/browser/components/customizableui/CustomizableUI.sys.mjs
+++ b/browser/components/customizableui/CustomizableUI.sys.mjs
@@ -25,7 +25,7 @@ ChromeUtils.defineLazyGetter(lazy, "gWidgetsBundle", function () {
@@ -23,7 +23,7 @@ index f466105b8290b13c672351bb68dd92644dd670fe..b195cd59d7ff07ff512e7388c9dc33f3
lazy.resetPBMToolbarButtonEnabled ? "reset-pbm-toolbar-button" : null,
].filter(name => name);
@@ -288,7 +287,7 @@ var CustomizableUIInternal = {
@@ -288,10 +287,10 @@ var CustomizableUIInternal = {
{
type: CustomizableUI.TYPE_TOOLBAR,
defaultPlacements: [
@@ -31,4 +31,8 @@ index f466105b8290b13c672351bb68dd92644dd670fe..b195cd59d7ff07ff512e7388c9dc33f3
+// "firefox-view-button",
"tabbrowser-tabs",
"new-tab-button",
"alltabs-button",
- "alltabs-button",
+// "alltabs-button",
],
defaultCollapsed: null,
},

16
src/browser/components/preferences/zen-settings.js
View File

@@ -510,13 +510,10 @@ var gZenLooksAndFeel = {
this._initializeTabbarExpandForm();
gZenThemeBuilder.init();
gZenMarketplaceManager.init();
var onLegacyToolbarChange = this.onLegacyToolbarChange.bind(this);
Services.prefs.addObserver('zen.themes.tabs.legacy-location', onLegacyToolbarChange);
var onPreferColorSchemeChange = this.onPreferColorSchemeChange.bind(this);
window.matchMedia('(prefers-color-scheme: dark)').addListener(onPreferColorSchemeChange);
this.onPreferColorSchemeChange();
window.addEventListener('unload', () => {
Services.prefs.removeObserver('zen.themes.tabs.legacy-location', onLegacyToolbarChange);
window.matchMedia('(prefers-color-scheme: dark)').removeListener(onPreferColorSchemeChange);
});
setTimeout(() => {
@@ -576,14 +573,6 @@ var gZenLooksAndFeel = {
}
},
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() {
const form = document.getElementById('zen-expand-tabbar-strat');
const radios = form.querySelectorAll('input[type=radio]');
@@ -872,11 +861,6 @@ Preferences.addAll([
type: 'bool',
default: false,
},
{
id: 'zen.themes.tabs.legacy-location',
type: 'bool',
default: false,
},
{
id: 'zen.workspaces.hide-default-container-indicator',
type: 'bool',

3
src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
View File

@@ -198,9 +198,6 @@
data-l10n-id="zen-look-and-feel-compact-toolbar-flash-popup"
preference="zen.view.compact.toolbar-flash-popup"/>
</vbox>
<checkbox id="zenLooksAndFeelShowLegacyToolbar"
data-l10n-id="zen-look-and-feel-legacy-toolbar"
preference="zen.themes.tabs.legacy-location"/>
</groupbox>
<hbox id="zenSidePanelsCategory"

26
src/browser/themes/shared/zen-icons/icons.css
View File

@@ -19,8 +19,8 @@
list-style-image: url('back.svg') !important;
}
:root[zen-sidebar-legacy='true'] #forward-button,
:root[zen-sidebar-legacy='true'] #zen-sidebar-web-panel-forward {
#forward-button,
#zen-sidebar-web-panel-forward {
list-style-image: url('forward.svg') !important;
@media (max-width: 650px) {
@@ -28,17 +28,8 @@
}
}
:root:not([zen-sidebar-legacy='true']) #forward-button,
:root:not([zen-sidebar-legacy='true']) #zen-sidebar-web-panel-forward {
list-style-image: url('forward.svg') !important;
@media (max-width: 650px) {
display: none;
}
}
:root[zen-sidebar-legacy='true'] #reload-button,
:root[zen-sidebar-legacy='true'] #zen-sidebar-web-panel-reload {
#reload-button,
#zen-sidebar-web-panel-reload {
list-style-image: url('reload.svg') !important;
@media (max-width: 650px) {
@@ -46,15 +37,6 @@
}
}
:root:not([zen-sidebar-legacy='true']) #reload-button,
:root:not([zen-sidebar-legacy='true']) #zen-sidebar-web-panel-reload {
list-style-image: url('reload.svg') !important;
@media (max-width: 700px) {
display: none;
}
}
#stop-button,
.close-icon,
#zen-sidebar-web-panel-close {