diff --git a/src/browser/themes/shared/browser-shared-css.patch b/src/browser/themes/shared/browser-shared-css.patch index f048fce61..336e80efe 100644 --- a/src/browser/themes/shared/browser-shared-css.patch +++ b/src/browser/themes/shared/browser-shared-css.patch @@ -2,16 +2,6 @@ diff --git a/browser/themes/shared/browser-shared.css b/browser/themes/shared/br index f2171eb033a1143870f4708c63f565fabb535c4b..a21631e56e74d5d1887554d2752a612887ed20c5 100644 --- a/browser/themes/shared/browser-shared.css +++ b/browser/themes/shared/browser-shared.css -@@ -27,6 +27,9 @@ - @import url("chrome://browser/skin/UITour.css"); - @import url("chrome://browser/skin/formautofill-notification.css"); - -+@import url("chrome://global/skin/zen-global-shared.css"); -+@import url("chrome://browser/skin/zen-browser-shared.css"); -+ - @namespace html url("http://www.w3.org/1999/xhtml"); - - :root, @@ -73,7 +76,7 @@ body { --short-notification-gradient: #9059FF; diff --git a/src/browser/themes/shared/sidebar-css.patch b/src/browser/themes/shared/sidebar-css.patch deleted file mode 100644 index 65f8a2382..000000000 --- a/src/browser/themes/shared/sidebar-css.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/browser/themes/shared/sidebar.css b/browser/themes/shared/sidebar.css -index a9b3886e1ff4a36c5bd161985719f66a41d95458..242b3ad30785bed1937d9bf99e8abc7427111541 100644 ---- a/browser/themes/shared/sidebar.css -+++ b/browser/themes/shared/sidebar.css -@@ -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"); -+ - @namespace html url("http://www.w3.org/1999/xhtml"); - - :root { diff --git a/src/toolkit/content/jar-mn.patch b/src/toolkit/content/jar-mn.patch deleted file mode 100644 index 6faef7f7d..000000000 --- a/src/toolkit/content/jar-mn.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn -index 8b18c945253d00603891cc5f0b989476318e219c..c5368eec8d9a760c19a827fe7a4b9afb4b702976 100644 ---- a/toolkit/content/jar.mn -+++ b/toolkit/content/jar.mn -@@ -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 diff --git a/src/toolkit/content/xul-css.patch b/src/toolkit/content/xul-css.patch index 3522c33cb..1f515d3d1 100644 --- a/src/toolkit/content/xul-css.patch +++ b/src/toolkit/content/xul-css.patch @@ -2,15 +2,6 @@ diff --git a/toolkit/content/xul.css b/toolkit/content/xul.css index 908132d598083dd43ee62940f4bac84e49238c92..eb7edf3870032fe796b3fa676de96e1dbb5eea85 100644 --- a/toolkit/content/xul.css +++ b/toolkit/content/xul.css -@@ -12,6 +12,8 @@ - * browser.css. - */ - -+@import url("chrome://global/content/zen-xul.css"); -+ - @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* set default namespace to XUL */ - @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */ - @@ -485,7 +487,8 @@ deck > *|*:not(:-moz-native-anonymous) { } diff --git a/src/toolkit/themes/shared/in-content/common-shared-css.patch b/src/toolkit/themes/shared/in-content/common-shared-css.patch index d9dba00ca..7a19bafb5 100644 --- a/src/toolkit/themes/shared/in-content/common-shared-css.patch +++ b/src/toolkit/themes/shared/in-content/common-shared-css.patch @@ -2,15 +2,6 @@ diff --git a/toolkit/themes/shared/in-content/common-shared.css b/toolkit/themes index 2b59a0604b4bfefd3bdcfdb9a3964937e9699114..92705331fa12d88e9091310c1f527562931e7132 100644 --- a/toolkit/themes/shared/in-content/common-shared.css +++ b/toolkit/themes/shared/in-content/common-shared.css -@@ -5,6 +5,8 @@ - @import url("chrome://global/skin/design-system/tokens-brand.css"); - @import url("chrome://global/skin/design-system/text-and-typography.css"); - -+@import url("chrome://global/skin/in-content/zen-common-shared.css"); -+ - @namespace html "http://www.w3.org/1999/xhtml"; - @namespace xul "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; - @@ -63,7 +65,7 @@ --in-content-table-border-color: var(--in-content-box-border-color); --in-content-table-header-background: var(--in-content-primary-button-background); diff --git a/src/toolkit/themes/shared/popup-css.patch b/src/toolkit/themes/shared/popup-css.patch index 3c94d3ea8..5a39b60f3 100644 --- a/src/toolkit/themes/shared/popup-css.patch +++ b/src/toolkit/themes/shared/popup-css.patch @@ -2,15 +2,6 @@ diff --git a/toolkit/themes/shared/popup.css b/toolkit/themes/shared/popup.css index ed230860215c734e6fb903b3660d0c679043e3f3..348436a56cecdf101da66cdec9d64f1bb851ba4d 100644 --- a/toolkit/themes/shared/popup.css +++ b/toolkit/themes/shared/popup.css -@@ -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("zen-popup.css"); -+ - @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); - - /* ::::: menupopup ::::: */ @@ -13,16 +15,16 @@ panel { color-scheme: light dark;