diff --git a/.gluon/patchCount b/.gluon/patchCount
index dce6588ca..7c091989d 100644
--- a/.gluon/patchCount
+++ b/.gluon/patchCount
@@ -1 +1 @@
-36
\ No newline at end of file
+37
\ No newline at end of file
diff --git a/src/browser/base/content/appmenu-viewcache-inc-xhtml.patch b/src/browser/base/content/appmenu-viewcache-inc-xhtml.patch
new file mode 100644
index 000000000..c58ade66b
--- /dev/null
+++ b/src/browser/base/content/appmenu-viewcache-inc-xhtml.patch
@@ -0,0 +1,11 @@
+diff --git a/browser/base/content/appmenu-viewcache.inc.xhtml b/browser/base/content/appmenu-viewcache.inc.xhtml
+index 07b1765f18236835363fb74c898d3a690659cc9b..7b58cbb5de147ed29fbc48c0093c731fe5cca90b 100644
+--- a/browser/base/content/appmenu-viewcache.inc.xhtml
++++ b/browser/base/content/appmenu-viewcache.inc.xhtml
+@@ -765,5 +765,6 @@
+
+
+
++#include zen-panels-ui.inc.xhtml
+ #include ../../components/reportbrokensite/content/reportBrokenSitePanel.inc.xhtml
+
diff --git a/src/browser/base/content/browser-css.patch b/src/browser/base/content/browser-css.patch
index d351ba2ed..1d898e7d0 100644
--- a/src/browser/base/content/browser-css.patch
+++ b/src/browser/base/content/browser-css.patch
@@ -1,5 +1,5 @@
diff --git a/browser/base/content/browser.css b/browser/base/content/browser.css
-index 8a2a20280954eb9db144a723f477e7afc603fda3..b4697a1195644b1869e2aaa7f03dbb34af7bc747 100644
+index 8a2a20280954eb9db144a723f477e7afc603fda3..e3069de5c78cab1b26f602b7ae501e22687d2cad 100644
--- a/browser/base/content/browser.css
+++ b/browser/base/content/browser.css
@@ -2,6 +2,8 @@
@@ -11,7 +11,7 @@ index 8a2a20280954eb9db144a723f477e7afc603fda3..b4697a1195644b1869e2aaa7f03dbb34
@namespace html url("http://www.w3.org/1999/xhtml");
:root,
-@@ -1319,9 +1321,9 @@ printpreview-pagination:focus-within,
+@@ -1319,13 +1321,13 @@ printpreview-pagination:focus-within,
#sidebar-box {
@@ -23,6 +23,11 @@ index 8a2a20280954eb9db144a723f477e7afc603fda3..b4697a1195644b1869e2aaa7f03dbb34
}
/* WebExtension Sidebars */
+-#sidebar-box[sidebarcommand$="-sidebar-action"] > #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
++#sidebar-box[sidebarcommand$="-sidebar-action"] #sidebar-header > #sidebar-switcher-target > #sidebar-icon {
+ list-style-image: var(--webextension-menuitem-image, inherit);
+ -moz-context-properties: fill;
+ fill: currentColor;
@@ -1526,3 +1528,19 @@ toolbar[keyNav=true]:not([collapsed=true], [customizing=true]) toolbartabstop {
/**
* End Dialogs
diff --git a/src/browser/base/content/zen-panels-ui.inc.xhtml b/src/browser/base/content/zen-panels-ui.inc.xhtml
new file mode 100644
index 000000000..596f88a2a
--- /dev/null
+++ b/src/browser/base/content/zen-panels-ui.inc.xhtml
@@ -0,0 +1,7 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/browser/base/content/zen-sidebar-box.inc.xhtml b/src/browser/base/content/zen-sidebar-box.inc.xhtml
index 402466231..b00ff0450 100644
--- a/src/browser/base/content/zen-sidebar-box.inc.xhtml
+++ b/src/browser/base/content/zen-sidebar-box.inc.xhtml
@@ -10,5 +10,6 @@
+ #include zen-sidebar-icons.inc.xhtml
\ No newline at end of file
diff --git a/src/browser/base/content/zen-sidebar-icons.inc.xhtml b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
new file mode 100644
index 000000000..ee4bf164c
--- /dev/null
+++ b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/src/browser/themes/shared/jar-inc-mn.patch b/src/browser/themes/shared/jar-inc-mn.patch
index 4ba12a948..e624a7d3d 100644
--- a/src/browser/themes/shared/jar-inc-mn.patch
+++ b/src/browser/themes/shared/jar-inc-mn.patch
@@ -1,11 +1,13 @@
diff --git a/browser/themes/shared/jar.inc.mn b/browser/themes/shared/jar.inc.mn
-index 37b5f04cddde9a3769d31c6e3a93b43da76f44e5..e7c79a280c9899675b8da8467960386106d42285 100644
+index 37b5f04cddde9a3769d31c6e3a93b43da76f44e5..91a98361c9cb389911c12ace35f8956d5f8ea396 100644
--- a/browser/themes/shared/jar.inc.mn
+++ b/browser/themes/shared/jar.inc.mn
-@@ -285,3 +285,6 @@
+@@ -285,3 +285,7 @@
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)
+ skin/classic/browser/zen-sidebar.css (../shared/zen-sidebar.css)
++ skin/classic/browser/zen-panel-ui.css (../shared/zen-panel-ui.css)
+\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index 046eb7bdd..d9465dfd3 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -1,4 +1,6 @@
+@import url("zen-panel-ui.css");
+
#navigator-toolbox toolbar#TabsToolbar {
margin: 10px var(--zen-appcontent-separator-from-window);
}
@@ -45,7 +47,11 @@
border-radius: 999px !important;
}
-#urlbar:not([extend="true"]) #identity-box.chromeUI #identity-icon-box {
+#urlbar #identity-box.chromeUI #identity-icon-box {
+ border-radius: 5px !important;
+}
+
+#urlbar:not([focused="true"]) #identity-box.chromeUI #identity-icon-box {
border-radius: 20px 10px 10px 20px !important;
}
@@ -58,7 +64,7 @@
#urlbar:not([extend="true"]) #identity-box #identity-icon-box { position: relative;}
/* TODO: this does NOT show up! */
-#urlbar:not([extend="true"]) #identity-box:not(.chromeUI):not(.localResource) #identity-icon-box::after {
+/* #urlbar:not([extend="true"]) #identity-box:not(.chromeUI):not(.localResource) #identity-icon-box::after {
content: '';
position: absolute;
top: 50%;
@@ -68,15 +74,14 @@
background: var(--zen-dialog-border-color);
transition: .1s;
transform: translateY(-50%);
-}
+} */
#urlbar:not([extend="true"]) #identity-box:not(.chromeUI):not(.localResource) #identity-icon-box {
- margin: 0 5px;
padding-right: 5px;
}
#urlbar:not([extend="true"]) #identity-box:not(.chromeUI):not(.localResource) {
- padding-right: 5px;
+ margin-inline-end: 0 !important;
}
.urlbar-page-action {
diff --git a/src/browser/themes/shared/zen-panel-ui.css b/src/browser/themes/shared/zen-panel-ui.css
new file mode 100644
index 000000000..7ca18434f
--- /dev/null
+++ b/src/browser/themes/shared/zen-panel-ui.css
@@ -0,0 +1,12 @@
+
+#PanelUI-zen-profiles {
+ --menu-panel-width: 8em;
+}
+
+#PanelUI-zen-profiles-header {
+ width: -moz-available;
+ height: 200px;
+ border-radius: var(--panel-border-radius);
+ background: var(--zen-main-browser-background);
+ margin: 5px;
+}
\ No newline at end of file
diff --git a/src/browser/themes/shared/zen-sidebar.css b/src/browser/themes/shared/zen-sidebar.css
index 932e96685..aa6fd39a4 100644
--- a/src/browser/themes/shared/zen-sidebar.css
+++ b/src/browser/themes/shared/zen-sidebar.css
@@ -1,10 +1,14 @@
:root {
--sidebar-background-color: var(--toolbar-bgcolor) !important;
+ --zen-sidebar-box-shadow: 0 1px 4px var(--color-black-a10);
}
#sidebar-box {
margin: var(--zen-appcontent-separator-from-window) !important;
border-radius: var(--zen-panel-radius) !important;
+ box-shadow: var(--zen-sidebar-box-shadow) !important;
+ overflow: hidden;
+ transition: .2s;
}
#sidebar-splitter {
@@ -20,4 +24,97 @@
#sidebar-box:not([positionend]) {
margin-right: 0 !important;
-}
\ No newline at end of file
+}
+
+#sidebar-box[hidden="true"] {
+ display: flex !important;
+ flex-direction: column;
+ min-width: 0 !important;
+ width: 50px !important;
+ align-items: center;
+}
+
+#sidebar-box[hidden="true"] > *:not(#zen-sidebar-icons-wrapper) {
+ display: none !important;
+}
+
+#sidebar-box[hidden="true"] #zen-sidebar-icons-wrapper {
+ display: flex;
+ flex-direction: column;
+ padding: 3px;
+ height: 100%;
+ position: relative;
+ background: transparent !important;
+ align-items: center;
+ justify-content: end;
+}
+
+.zen-sidebar-action-button {
+ width: 40px;
+ height: 40px;
+ padding: 0;
+ margin: 0;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ border-radius: 10px;
+}
+
+.zen-sidebar-action-button:hover {
+ background: var(--toolbarbutton-hover-background);
+}
+
+.zen-sidebar-action-button:hover image {
+ background: transparent !important;
+}
+
+.zen-sidebar-action-button label {
+ display: none !important;
+}
+
+#sidebar-box[hidden="true"] .zen-sidebar-action-button {
+ opacity: 0;
+ animation: zen-sidebar-button-fadeIn 0.4s forwards;
+}
+
+@keyframes zen-sidebar-button-fadeIn {
+ 0% {
+ transform: translateX(-110%);
+ opacity: 0;
+ }
+ 100% {
+ opacity: 1;
+ transform: translateX(0);
+ }
+}
+
+/* Icons */
+
+#zen-preferences-button {
+ list-style-image: url("chrome://global/skin/icons/settings.svg");
+}
+
+#zen-history-button {
+ list-style-image: url("chrome://browser/skin/history.svg");
+}
+
+#zen-bookmark-button {
+ list-style-image: url(chrome://browser/skin/bookmark-hollow.svg);
+}
+
+#zen-profile-button {
+ list-style-image: var(--avatar-image-url);
+}
+
+/* Ugly code */
+
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(1) { animation-delay: 0.1s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(2) { animation-delay: 0.2s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(3) { animation-delay: 0.3s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(4) { animation-delay: 0.4s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(5) { animation-delay: 0.5s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(6) { animation-delay: 0.6s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(7) { animation-delay: 0.7s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(8) { animation-delay: 0.8s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(9) { animation-delay: 0.9s; }
+#sidebar-box[hidden="true"] .zen-sidebar-action-button:nth-child(10) { animation-delay: 1s; }