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