mirror of
https://github.com/zen-browser/desktop
synced 2026-04-25 17:15:00 +02:00
* chore: Sync upstream to `Firefox 147.0` * chore: Continued migration, b=no-bug, c=tests * chore: Finish migration without testing, b=no-bug, c=scripts, tabs, media, common, split-view * feat: Finish migration, b=no-bug, c=common, compact-mode, split-view, workspaces * feat: Finish basic migration, b=no-bug, c=kbs, common, folders * feat: Update surfer, b=no-bug, c=scripts
54 lines
2.4 KiB
C++
54 lines
2.4 KiB
C++
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
|
|
index 68c24f730d56f548cf1e286198a04f8363529378..71418c93ce7216d71412f2fa67295322bb73abad 100644
|
|
--- a/browser/base/content/navigator-toolbox.inc.xhtml
|
|
+++ b/browser/base/content/navigator-toolbox.inc.xhtml
|
|
@@ -2,7 +2,7 @@
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
|
|
-<toolbox id="navigator-toolbox" class="browser-toolbox-background">
|
|
+<toolbox id="navigator-toolbox" class="browser-toolbox-background" persist="width style">
|
|
<script src="chrome://browser/content/navigator-toolbox.js" />
|
|
|
|
<!-- Menu -->
|
|
@@ -18,9 +18,8 @@
|
|
#include browser-menubar.inc
|
|
</toolbaritem>
|
|
<spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
|
|
-#include titlebar-items.inc.xhtml
|
|
</toolbar>
|
|
-
|
|
+<hbox id="titlebar">
|
|
<toolbar id="TabsToolbar"
|
|
class="browser-toolbar browser-titlebar"
|
|
fullscreentoolbar="true"
|
|
@@ -62,6 +61,8 @@
|
|
<html:sidebar-pins-promo id="drag-to-pin-promo-card"></html:sidebar-pins-promo>
|
|
<arrowscrollbox id="pinned-tabs-container" orient="horizontal" clicktoscroll=""></arrowscrollbox>
|
|
<splitter orient="vertical" id="vertical-pinned-tabs-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
|
|
+<html:div id="zen-essentials" skipintoolbarset="true"></html:div>
|
|
+<html:div id="zen-tabs-wrapper">
|
|
<hbox class="tab-drop-indicator" hidden="true"/>
|
|
<arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
|
|
<tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
|
|
@@ -81,6 +82,7 @@
|
|
tooltip="dynamic-shortcut-tooltip"
|
|
data-l10n-id="tabs-toolbar-new-tab"/>
|
|
<html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
|
|
+</html:div>
|
|
</tabs>
|
|
|
|
<toolbarbutton id="new-tab-button"
|
|
@@ -106,9 +108,10 @@
|
|
#include private-browsing-indicator.inc.xhtml
|
|
<toolbarbutton class="content-analysis-indicator toolbarbutton-1 content-analysis-indicator-icon"/>
|
|
|
|
-#include titlebar-items.inc.xhtml
|
|
+#include zen-sidebar-icons.inc.xhtml
|
|
|
|
</toolbar>
|
|
+</hbox>
|
|
|
|
<toolbar id="nav-bar"
|
|
class="browser-toolbar chromeclass-location"
|