mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-08 19:59:59 +02:00
105 lines
4.1 KiB
C++
105 lines
4.1 KiB
C++
diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
|
|
index a0a382643a2f74b6d789f3641ef300eed202d5e9..a962e155f1452362a2a35df89c8f56e1c0d9968c 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 -->
|
|
@@ -17,9 +17,11 @@
|
|
#include browser-menubar.inc
|
|
</toolbaritem>
|
|
<spacer flex="1" skipintoolbarset="true" style="order: 1000;"/>
|
|
+#if 0
|
|
#include titlebar-items.inc.xhtml
|
|
+#endif
|
|
</toolbar>
|
|
-
|
|
+<hbox id="titlebar">
|
|
<toolbar id="TabsToolbar"
|
|
class="browser-toolbar browser-titlebar"
|
|
fullscreentoolbar="true"
|
|
@@ -32,7 +34,7 @@
|
|
|
|
<hbox class="titlebar-spacer" type="pre-tabs"/>
|
|
|
|
- <hbox flex="1" align="end" class="toolbar-items">
|
|
+ <hbox flex="1" align="start" class="toolbar-items">
|
|
<toolbartabstop/>
|
|
<hbox id="TabsToolbar-customization-target" flex="1">
|
|
<toolbarbutton id="firefox-view-button"
|
|
@@ -40,9 +42,9 @@
|
|
data-l10n-id="toolbar-button-firefox-view-2"
|
|
role="button"
|
|
aria-pressed="false"
|
|
+ hidden="true"
|
|
cui-areatype="toolbar"
|
|
removable="true"/>
|
|
-
|
|
<tabs id="tabbrowser-tabs"
|
|
is="tabbrowser-tabs"
|
|
aria-multiselectable="true"
|
|
@@ -50,6 +52,10 @@
|
|
tooltip="tabbrowser-tab-tooltip"
|
|
orient="horizontal"
|
|
stopwatchid="FX_TAB_CLICK_MS">
|
|
+<html:div id="zen-essentials-container" skipintoolbarset="true"></html:div>
|
|
+<hbox id="zen-current-workspace-indicator-container"></hbox>
|
|
+<html:div id="zen-tabs-wrapper">
|
|
+<html:div id="zen-browser-tabs-container">
|
|
<hbox class="tab-drop-indicator" hidden="true"/>
|
|
# If the name (tabbrowser-arrowscrollbox) or structure of this changes
|
|
# significantly, there is an optimization in
|
|
@@ -57,7 +63,7 @@
|
|
# the current structure that we may want to revisit.
|
|
<html:div id="vertical-pinned-tabs-container" tabindex="-1"></html:div>
|
|
<html:div id="vertical-pinned-tabs-container-separator"></html:div>
|
|
- <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
|
|
+ <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="vertical" flex="1" clicktoscroll="" scrolledtostart="" scrolledtoend="">
|
|
<tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
|
|
<hbox id="tabbrowser-arrowscrollbox-periphery">
|
|
<toolbartabstop/>
|
|
@@ -75,6 +81,8 @@
|
|
tooltip="dynamic-shortcut-tooltip"
|
|
data-l10n-id="tabs-toolbar-new-tab"/>
|
|
<html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
|
|
+</html:div>
|
|
+</html:div>
|
|
</tabs>
|
|
|
|
<toolbarbutton id="new-tab-button"
|
|
@@ -100,11 +108,12 @@
|
|
#include private-browsing-indicator.inc.xhtml
|
|
<toolbarbutton id="content-analysis-indicator"
|
|
class="toolbarbutton-1 content-analysis-indicator-icon"/>
|
|
-
|
|
+#if 0
|
|
#include titlebar-items.inc.xhtml
|
|
-
|
|
+#endif
|
|
+#include zen-sidebar-icons.inc.xhtml
|
|
</toolbar>
|
|
-
|
|
+</hbox>
|
|
<toolbar id="nav-bar"
|
|
class="browser-toolbar chromeclass-location"
|
|
data-l10n-id="navbar-accessible"
|
|
@@ -490,10 +499,12 @@
|
|
consumeanchor="PanelUI-button"
|
|
data-l10n-id="appmenu-menu-button-closed2"/>
|
|
</toolbaritem>
|
|
+#include titlebar-items.inc.xhtml
|
|
<hbox class="titlebar-spacer" type="post-tabs"/>
|
|
#include private-browsing-indicator.inc.xhtml
|
|
-
|
|
+#if 0
|
|
#include titlebar-items.inc.xhtml
|
|
+#endif
|
|
</toolbar>
|
|
|
|
<toolbar id="PersonalToolbar"
|