Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mr-cheff committed Nov 19, 2024
2 parents 30b14a6 + 2f79e11 commit 47a8e8e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
4 changes: 4 additions & 0 deletions src/browser/base/zen-components/ZenPinnedTabManager.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,10 @@

gBrowser.pinTab(newTab);

if(newTab.getAttribute("zen-workspace-id") !== ZenWorkspaces.activeWorkspace && newTab.getAttribute("zen-essential") !== "true") {
gBrowser.hideTab(newTab, undefined, true);
}

newTab.initialize();
}

Expand Down
9 changes: 8 additions & 1 deletion src/browser/themes/shared/zen-icons/icons.css
Original file line number Diff line number Diff line change
Expand Up @@ -565,16 +565,23 @@
/* tab sound icons */
.tab-icon-overlay[soundplaying] {
list-style-image: url('tab-audio-playing-small.svg') !important;
background-image: none !important;
fill: white !important;
}

.tab-icon-overlay[muted] {
list-style-image: url('tab-audio-muted-small.svg') !important;
background-image: none !important;
fill: white !important;
}

.tab-icon-overlay[activemedia-blocked] {
list-style-image: url('tab-audio-blocked-small.svg') !important;
background-image: none !important;
fill: white !important;
}


/* reload/stop animation */
#stop-reload-button[animate]
> #reload-button[displaystop]
Expand Down Expand Up @@ -897,7 +904,7 @@ menuitem[contexttype='fullscreen'][label*='Exit'] {
#context_pinSelectedTabs,
#context_unpinSelectedTabs,
.customize-context-moveToPanel,
#context_zen-replace-pinned-url-with-current{
#context_zen-replace-pinned-url-with-current {
--menu-image: url('pin.svg');
}

Expand Down

0 comments on commit 47a8e8e

Please sign in to comment.