Merge branch 'zen-browser:main' into main

This commit is contained in:
Bryan Galdámez 2024-09-18 16:54:38 -06:00 committed by GitHub
commit b1e32c2f3f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View file

@ -79,7 +79,7 @@ var gZenBrowserManagerSidebar = {
// relative to avoid the top margin // relative to avoid the top margin
// 20px is the padding // 20px is the padding
let parentRelativeHeight = let parentRelativeHeight =
parent.getBoundingClientRect().height - parent.getBoundingClientRect().top + sidebar.getBoundingClientRect().top - 20; parent.getBoundingClientRect().height - parent.getBoundingClientRect().top + sidebar.getBoundingClientRect().top - 30;
let minHeight = parseInt(computedStyle.getPropertyValue('min-height').replace('px', '')); let minHeight = parseInt(computedStyle.getPropertyValue('min-height').replace('px', ''));
if (!this._isDragging) { if (!this._isDragging) {
// Prevent multiple resizes // Prevent multiple resizes

0
src/ZenThemesCommon.mjs Normal file
View file

View file

@ -344,14 +344,14 @@ var ZenWorkspaces = {
button.removeAttribute('hidden'); button.removeAttribute('hidden');
return; return;
} }
let browserTabs = document.getElementById('tabbrowser-tabs'); const nextSibling = document.getElementById('zen-sidepanel-button');
let button = document.createElement('toolbarbutton'); let button = document.createElement('toolbarbutton');
button.id = 'zen-workspaces-button'; button.id = 'zen-workspaces-button';
button.className = 'toolbarbutton-1 chromeclass-toolbar-additional'; button.className = 'toolbarbutton-1 chromeclass-toolbar-additional';
button.setAttribute('label', 'Workspaces'); button.setAttribute('label', 'Workspaces');
button.setAttribute('tooltiptext', 'Workspaces'); button.setAttribute('tooltiptext', 'Workspaces');
button.onclick = this.openWorkspacesDialog.bind(this); button.onclick = this.openWorkspacesDialog.bind(this);
browserTabs.insertAdjacentElement('beforebegin', button); nextSibling.before(button);
}, },
async _updateWorkspacesButton() { async _updateWorkspacesButton() {