mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-01-09 14:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed UI for full screen mode

Browse Source
This commit is contained in:
mauro-balades
2024-04-01 15:57:06 +02:00
parent c04045d64b
commit 2e097197d1
15 changed files with 133 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gluon/hashes.json
View File

@@ -1,6 +1,4 @@
{
"/home/mau/desktop/configs/branding/beta/logo.png": "f889a9d9305437d9749800d4a45dd51882fb4772",
"/home/mau/desktop/configs/branding/beta/MacOSInstaller.svg": "9f1ed2248fbf7b3918957f4580dc49205aedaefd",
"/home/mauro/work/core/configs/branding/beta/logo.png": "f889a9d9305437d9749800d4a45dd51882fb4772",
"/home/mauro/work/core/configs/branding/beta/MacOSInstaller.svg": "9f1ed2248fbf7b3918957f4580dc49205aedaefd"
}

2
.gluon/patchCount
View File

@@ -1 +1 @@
35
36

3
src/browser/app/profile/zen-browser.js
View File

@@ -85,10 +85,13 @@ pref('privacy.globalprivacycontrol.enabled', true);
pref('gfx.canvas.accelerated.cache-items', 4096);
pref('gfx.canvas.accelerated.cache-size', 512);
pref('gfx.content.skia-font-cache-size', 20);
pref('gfx.webrender.all', true);
pref('layout.css.backdrop-filter.enabled', true);
// CUSTOM ZEN PREFS
pref('zen.verticalTabs.enabled', false);
pref('zen.window.translucent', true);
// From: https://github.com/yokoffing/Betterfox

33
src/browser/base/content/browser-box-inc-xhtml.patch
View File

@@ -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>

11
src/browser/base/content/browser-css.patch
View File

@@ -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
View 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
View 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"/>

4
src/browser/themes/addons/alpenglow/manifest-json.patch
View File

@@ -1,5 +1,5 @@
diff --git a/browser/themes/addons/alpenglow/manifest.json b/browser/themes/addons/alpenglow/manifest.json
index 05a25e13915edee3ba51ed1c1b5569faa70cd536..9f4e2274cfc82abc420ea543e360222305a37585 100644
index 05a25e13915edee3ba51ed1c1b5569faa70cd536..9d58f14305c27d4fb4a68c9182aafe0826826746 100644
--- a/browser/themes/addons/alpenglow/manifest.json
+++ b/browser/themes/addons/alpenglow/manifest.json
@@ -3,137 +3,99 @@
@@ -177,7 +177,7 @@ index 05a25e13915edee3ba51ed1c1b5569faa70cd536..9f4e2274cfc82abc420ea543e3602223
+ "toolbar_field_icon_opacity": "0.72",
+ "input_border_color": "rgba(0, 0, 0, .3)",
+ "zap_gradient": "linear-gradient(90deg, #9059FF 0%, #FF4AA2 52.08%, #FFBD4F 100%)",
+ "zen_main_browser_background": "linear-gradient(135deg, rgb(254, 181, 188) 0%, rgb(149, 134, 232) 100%)"
+ "zen_main_browser_background": "linear-gradient(135deg, #fac89a 0%, #e290ff 100%)"
}
},

6
src/browser/themes/shared/jar-inc-mn.patch
View File

@@ -1,11 +1,11 @@
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
index 37b5f04cddde9a3769d31c6e3a93b43da76f44e5..aa8eeb8627521cfee9c6ef827c3509c6323d6d9d 100644
index 37b5f04cddde9a3769d31c6e3a93b43da76f44e5..e7c79a280c9899675b8da8467960386106d42285 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
@@ -285,3 +285,5 @@
@@ -285,3 +285,6 @@
skin/classic/browser/weather/night-partly-cloudy-with-showers.svg (../shared/weather/night-partly-cloudy-with-showers.svg)
skin/classic/browser/weather/night-partly-cloudy-with-thunderstorms.svg (../shared/weather/night-partly-cloudy-with-thunderstorms.svg)
skin/classic/browser/weather/night-mostly-cloudy-with-flurries.svg (../shared/weather/night-mostly-cloudy-with-flurries.svg)
+
+ skin/classic/browser/zen-browser-shared.css (../shared/zen-browser-shared.css)
\ No newline at end of file
+ skin/classic/browser/zen-sidebar.css (../shared/zen-sidebar.css)

37
src/browser/themes/shared/sidebar-css.patch
View File

@@ -1,32 +1,13 @@
diff --git a/browser/themes/shared/sidebar.css b/browser/themes/shared/sidebar.css
index a9b3886e1ff4a36c5bd161985719f66a41d95458..35c0e0dfa9d9560c4ed6a1abfd2a5b28748ab2a5 100644
index a9b3886e1ff4a36c5bd161985719f66a41d95458..242b3ad30785bed1937d9bf99e8abc7427111541 100644
--- a/browser/themes/shared/sidebar.css
+++ b/browser/themes/shared/sidebar.css
@@ -137,3 +137,27 @@ menuseparator + #sidebar-extensions-separator {
fill: currentColor;
opacity: 0.8;
}
@@ -2,6 +2,8 @@
* 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/. */
+@import url("chrome://browser/skin/zen-sidebar.css");
+
+/**
+ * Zen Overrides
+ */
+
+:root {
+ --sidebar-background-color: var(--toolbar-bgcolor) !important;
+}
+
+#sidebar-box {
+ margin: 0 0 var(--zen-appcontent-separator-from-window) var(--zen-appcontent-separator-from-window);
+ border-radius: var(--zen-panel-radius);
+}
+
+#sidebar-splitter {
+ /* we can still use the splitter but we can't see it */
+ background: transparent;
+ border-color: transparent;
+ width: 1px;
+}
+
+#sidebar-box[positionend] {
+ margin: 0 var(--zen-appcontent-separator-from-window) var(--zen-appcontent-separator-from-window) 0;
+}
@namespace html url("http://www.w3.org/1999/xhtml");
:root {

3
src/browser/themes/shared/zen-browser-shared.css
View File

@@ -23,7 +23,7 @@
width: 100%;
}
#urlbar[focused="true"] {
#urlbar[focused="true"][breakout-extend="true"] {
overflow: visible;
}
@@ -37,7 +37,6 @@
outline: none !important;
outline-offset: none !important;
outline-color: none !important;
border-color: var(--zen-appcontent-separator-from-window);
}
#urlbar, #urlbar .urlbar-page-action,

23
src/browser/themes/shared/zen-sidebar.css Normal file
View File

@@ -0,0 +1,23 @@
:root {
--sidebar-background-color: var(--toolbar-bgcolor) !important;
}
#sidebar-box {
margin: var(--zen-appcontent-separator-from-window) !important;
border-radius: var(--zen-panel-radius) !important;
}
#sidebar-splitter {
/* we can still use the splitter but we can't see it */
background: transparent !important;
border-color: transparent !important;
width: 1px !important;
}
#sidebar-box[positionend] {
margin-left: 0 !important;
}
#sidebar-box:not([positionend]) {
margin-right: 0 !important;
}

5
src/toolkit/content/jar-mn.patch
View File

@@ -1,11 +1,12 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
index 8b18c945253d00603891cc5f0b989476318e219c..3021de8ec32e32a9d58a207b4d279b236a264dbf 100644
index 8b18c945253d00603891cc5f0b989476318e219c..c5368eec8d9a760c19a827fe7a4b9afb4b702976 100644
--- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn
@@ -143,3 +143,6 @@ toolkit.jar:
@@ -143,3 +143,7 @@ toolkit.jar:
# Third party files
content/global/third_party/d3/d3.js (/third_party/js/d3/d3.js)
content/global/third_party/cfworker/json-schema.js (/third_party/js/cfworker/json-schema.js)
+
+# Zen modules
+ content/global/zen-xul.css
+ content/global/zen-fullscreen-override.css

10
src/toolkit/content/zen-fullscreen-override.css Normal file
View File

@@ -0,0 +1,10 @@
[inDOMFullscreen="true"] #nav-bar {
display: none !important;
}
[inDOMFullscreen="true"] #appcontent {
margin: 0 !important;
border-radius: 0 !important;
}

14
src/toolkit/content/zen-xul.css
View File

@@ -1,19 +1,25 @@
@import url("zen-fullscreen-override.css");
:root {
--zen-main-browser-background: light-dark(#ddd, #4a4a4a);
--zen-appcontent-separator-from-window: 20px;
--zen-appcontent-separator-from-window: 10px;
}
html#main-window > body > toolbox#navigator-toolbox,
hbox#browser {
toolbox#navigator-toolbox,
#browser {
background: transparent !important;
}
#browser {
width: 100%;
}
html#main-window > body {
background: var(--zen-main-browser-background) !important;
}
#appcontent {
:not([inDOMFullscreen="true"]) #appcontent {
border-radius: var(--zen-panel-radius);
overflow: hidden;
box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1);