mirror of
https://github.com/zen-browser/desktop.git
synced 2026-05-02 03:55:06 +00:00
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
This commit is contained in:
@@ -380,12 +380,15 @@
|
||||
<hbox class="zen-theme-picker-custom-list-item">
|
||||
<html:div class="zen-theme-picker-dot custom"></html:div>
|
||||
<label class="zen-theme-picker-custom-list-item-label"></label>
|
||||
<toolbarbutton class="zen-theme-picker-custom-list-item-remove toolbarbutton-1" oncommand="gZenThemePicker.removeCustomColor(event);"></toolbarbutton>
|
||||
<toolbarbutton class="zen-theme-picker-custom-list-item-remove toolbarbutton-1"></toolbarbutton>
|
||||
</hbox>
|
||||
`);
|
||||
listItems.querySelector('.zen-theme-picker-custom-list-item').setAttribute('data-color', color);
|
||||
listItems.querySelector('.zen-theme-picker-dot').style.setProperty('--zen-theme-picker-dot-color', color);
|
||||
listItems.querySelector('.zen-theme-picker-custom-list-item-label').textContent = color;
|
||||
listItems
|
||||
.querySelector('.zen-theme-picker-custom-list-item-remove')
|
||||
.addEventListener('command', this.removeCustomColor.bind(this));
|
||||
|
||||
this.customColorList.appendChild(listItems);
|
||||
}
|
||||
|
||||
@@ -2775,7 +2775,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
||||
(tab) =>
|
||||
tab.getAttribute('zen-workspace-id') !== tabWorkspaceId &&
|
||||
!tab.hasAttribute('zen-essential') &&
|
||||
!(this.containerSpecificEssentials && tab.getAttribute('container') !== aTab.getAttribute('container'))
|
||||
!(this.containerSpecificEssentials && tab.getAttribute('container') !== aTab.getAttribute('container')) &&
|
||||
!tab.hasAttribute('zen-empty-tab')
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user