mirror of
https://github.com/zen-browser/desktop.git
synced 2026-08-28 01:11:32 +00:00
Fixed UI for full screen mode
This commit is contained in:
@@ -1,10 +1,29 @@
|
||||
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
|
||||
index d445abe7e743b2ec5d46d42f8f149c000e3c7997..80226e0504cc9c3c052a4cce17a6b4f5e6f2d91f 100644
|
||||
index d445abe7e743b2ec5d46d42f8f149c000e3c7997..0da9a11cb6d5f0c40025a2b71fd6fd4524e3e0b3 100644
|
||||
--- a/browser/base/content/browser-box.inc.xhtml
|
||||
+++ b/browser/base/content/browser-box.inc.xhtml
|
||||
@@ -18,6 +18,9 @@
|
||||
</vbox>
|
||||
<splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
|
||||
@@ -2,22 +2,13 @@
|
||||
# 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/.
|
||||
|
||||
-<hbox flex="1" id="browser">
|
||||
- <vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
|
||||
- <box id="sidebar-header" align="center">
|
||||
- <toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">
|
||||
- <image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
|
||||
- <label id="sidebar-title" crop="end" control="sidebar"/>
|
||||
- <image id="sidebar-switcher-arrow"/>
|
||||
- </toolbarbutton>
|
||||
- <image id="sidebar-throbber"/>
|
||||
- <spacer id="sidebar-spacer"/>
|
||||
- <toolbarbutton id="sidebar-close" class="close-icon tabbable" data-l10n-id="sidebar-close-button" oncommand="SidebarUI.hide();"/>
|
||||
- </box>
|
||||
- <browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
|
||||
- </vbox>
|
||||
- <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
|
||||
+<vbox id="browser">
|
||||
+#include navigator-toolbox.inc.xhtml
|
||||
+
|
||||
<vbox id="appcontent" flex="1">
|
||||
+
|
||||
+#include zen-browser-box-ui.inc.xhtml
|
||||
@@ -12,3 +31,9 @@ index d445abe7e743b2ec5d46d42f8f149c000e3c7997..80226e0504cc9c3c052a4cce17a6b4f5
|
||||
<!-- gNotificationBox will be added here lazily. -->
|
||||
<tabbox id="tabbrowser-tabbox"
|
||||
flex="1" tabcontainer="tabbrowser-tabs">
|
||||
@@ -25,4 +16,4 @@
|
||||
flex="1" selectedIndex="0"/>
|
||||
</tabbox>
|
||||
</vbox>
|
||||
-</hbox>
|
||||
+</vbox>
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
|
||||
index 8a2a20280954eb9db144a723f477e7afc603fda3..5688021b08b378e48bb100621fbdc0c5c05fc634 100644
|
||||
index 8a2a20280954eb9db144a723f477e7afc603fda3..b4697a1195644b1869e2aaa7f03dbb34af7bc747 100644
|
||||
--- a/browser/base/content/browser.css
|
||||
+++ b/browser/base/content/browser.css
|
||||
@@ -2,6 +2,8 @@
|
||||
@@ -11,12 +11,15 @@ index 8a2a20280954eb9db144a723f477e7afc603fda3..5688021b08b378e48bb100621fbdc0c5
|
||||
@namespace html url("http://www.w3.org/1999/xhtml");
|
||||
|
||||
:root,
|
||||
@@ -1321,7 +1323,7 @@ printpreview-pagination:focus-within,
|
||||
@@ -1319,9 +1321,9 @@ printpreview-pagination:focus-within,
|
||||
|
||||
|
||||
#sidebar-box {
|
||||
min-width: 14em;
|
||||
- min-width: 14em;
|
||||
+ min-width: 323px;
|
||||
max-width: 36em;
|
||||
- width: 18em;
|
||||
+ width: 269px;
|
||||
+ width: 393px;
|
||||
}
|
||||
|
||||
/* WebExtension Sidebars */
|
||||
|
||||
18
src/browser/base/content/browser-xhtml.patch
Normal file
18
src/browser/base/content/browser-xhtml.patch
Normal file
@@ -0,0 +1,18 @@
|
||||
diff --git a/browser/base/content/browser.xhtml b/browser/base/content/browser.xhtml
|
||||
index b4886fb5f74568b4c09eb620be9efb74e39c599c..31496c51584b789895a83ba35be9d6828862c759 100644
|
||||
--- a/browser/base/content/browser.xhtml
|
||||
+++ b/browser/base/content/browser.xhtml
|
||||
@@ -163,9 +163,10 @@
|
||||
</vbox>
|
||||
</html:template>
|
||||
|
||||
-#include navigator-toolbox.inc.xhtml
|
||||
-
|
||||
-#include browser-box.inc.xhtml
|
||||
+ <hbox flex="1">
|
||||
+ #include zen-sidebar-box.inc.xhtml
|
||||
+ #include browser-box.inc.xhtml
|
||||
+ </hbox>
|
||||
|
||||
<html:template id="customizationPanel">
|
||||
<box id="customization-container" flex="1" hidden="true"><![CDATA[
|
||||
14
src/browser/base/content/zen-sidebar-box.inc.xhtml
Normal file
14
src/browser/base/content/zen-sidebar-box.inc.xhtml
Normal file
@@ -0,0 +1,14 @@
|
||||
<vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
|
||||
<box id="sidebar-header" align="center">
|
||||
<toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">
|
||||
<image id="sidebar-icon" consumeanchor="sidebar-switcher-target"/>
|
||||
<label id="sidebar-title" crop="end" control="sidebar"/>
|
||||
<image id="sidebar-switcher-arrow"/>
|
||||
</toolbarbutton>
|
||||
<image id="sidebar-throbber"/>
|
||||
<spacer id="sidebar-spacer"/>
|
||||
<toolbarbutton id="sidebar-close" class="close-icon tabbable" data-l10n-id="sidebar-close-button" oncommand="SidebarUI.hide();"/>
|
||||
</box>
|
||||
<browser id="sidebar" autoscroll="false" disablehistory="true" disablefullscreen="true" tooltip="aHTMLTooltip"/>
|
||||
</vbox>
|
||||
<splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
|
||||
Reference in New Issue
Block a user