diff --git a/application/palemoon/base/content/palemoon.xhtml b/application/palemoon/base/content/palemoon.xhtml new file mode 100644 index 0000000000..96757052c4 --- /dev/null +++ b/application/palemoon/base/content/palemoon.xhtml @@ -0,0 +1,66 @@ + + %mozillaDTD; + + %directionDTD; +]> + + + + + + + &chronicles.title.55.2; + + + + + + +
+

+ &chronicles.quote.55.2; +

+ +

+ &chronicles.from.55.2; +

+
+ + + diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn index 246cf90179..d8c3f4b213 100644 --- a/application/palemoon/base/jar.mn +++ b/application/palemoon/base/jar.mn @@ -69,6 +69,7 @@ browser.jar: content/browser/padlock_classic_https.png (content/padlock_classic_https.png) content/browser/padlock_classic_low.png (content/padlock_classic_low.png) content/browser/padlock_classic_broken.png (content/padlock_classic_broken.png) + content/browser/palemoon.xhtml (content/palemoon.xhtml) content/browser/newtab/newTab.xhtml (content/newtab/newTab.xhtml) * content/browser/newtab/newTab.js (content/newtab/newTab.js) content/browser/newtab/newTab.css (content/newtab/newTab.css) diff --git a/application/palemoon/components/about/AboutRedirector.cpp b/application/palemoon/components/about/AboutRedirector.cpp index 7e4c634f70..508202c7d5 100644 --- a/application/palemoon/components/about/AboutRedirector.cpp +++ b/application/palemoon/components/about/AboutRedirector.cpp @@ -57,7 +57,7 @@ static RedirEntry kRedirMap[] = { nsIAboutModule::ALLOW_SCRIPT }, { - "palemoon", "chrome://global/content/memoriam.xhtml", + "palemoon", "chrome://browser/content/palemoon.xhtml", nsIAboutModule::URI_SAFE_FOR_UNTRUSTED_CONTENT | nsIAboutModule::HIDE_FROM_ABOUTABOUT }, diff --git a/toolkit/locales/en-US/chrome/global/mozilla.dtd b/application/palemoon/locales/en-US/chrome/browser/palemoon.dtd similarity index 100% rename from toolkit/locales/en-US/chrome/global/mozilla.dtd rename to application/palemoon/locales/en-US/chrome/browser/palemoon.dtd diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn index 046cb0ac71..8d88e16fd3 100644 --- a/application/palemoon/locales/jar.mn +++ b/application/palemoon/locales/jar.mn @@ -28,6 +28,7 @@ locale/browser/openLocation.properties (%chrome/browser/openLocation.properties) locale/browser/pageInfo.dtd (%chrome/browser/pageInfo.dtd) locale/browser/pageInfo.properties (%chrome/browser/pageInfo.properties) + locale/browser/palemoon.dtd (%chrome/browser/palemoon.dtd) locale/browser/quitDialog.properties (%chrome/browser/quitDialog.properties) locale/browser/safeMode.dtd (%chrome/browser/safeMode.dtd) locale/browser/sanitize.dtd (%chrome/browser/sanitize.dtd) diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index c8dd6dc473..0c0f9494a0 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -57,8 +57,6 @@ toolkit.jar: #endif content/global/filepicker.properties content/global/globalOverlay.js - content/global/memoriam.xhtml -* content/global/mozilla.css content/global/mozilla.xhtml #ifdef MOZ_PHOENIX content/global/logopage.xhtml diff --git a/toolkit/content/memoriam.xhtml b/toolkit/content/memoriam.xhtml deleted file mode 100644 index f1a1b474d5..0000000000 --- a/toolkit/content/memoriam.xhtml +++ /dev/null @@ -1,76 +0,0 @@ - - %directionDTD; - - %brandDTD; -]> - - - - - - - Mozilla: In Memoriam - - - - - - -
-

-

Mozilla: In Memoriam

-
- Dedicated to the tireless developers who have come and gone.
- To those who have put their heart and soul into Mozilla products.
- To those who have seen their good intentions and hard work squandered.
- To those who really cared about the user, and cared about usability.
- To those who truly understood us and desired freedom, but were unheard.
- To those who knew that change is inevitable, but loss of vision is not.
- To those who were forced to give up the good fight.
-
- Thank you. &brandFullName; would not have been possible without you.
-
-

- -

-

-
- - - \ No newline at end of file diff --git a/toolkit/content/mozilla.css b/toolkit/content/mozilla.css deleted file mode 100644 index d5eae6415c..0000000000 --- a/toolkit/content/mozilla.css +++ /dev/null @@ -1,36 +0,0 @@ -html { -%ifdef MC_PALEMOON - background: #333399 radial-gradient( circle at 75% 25%, #6666b0 0%, #333399 40%, #111177 80%) center center / cover no-repeat; -%else - background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat; -%endif - - color: white; - font-style: italic; - text-rendering: optimizeLegibility; - min-height: 100%; -} - -#moztext { - margin-top: 15%; - font-size: 1.1em; - font-family: serif; - text-align: center; - line-height: 1.5; -} - -#from { - font-size: 1.95em; - font-family: serif; - text-align: right; -} - -em { - font-size: 1.3em; - line-height: 0; -} - -a { - text-decoration: none; - color: white; -} \ No newline at end of file diff --git a/toolkit/content/mozilla.xhtml b/toolkit/content/mozilla.xhtml index 8c79b5ff99..f1a1b474d5 100644 --- a/toolkit/content/mozilla.xhtml +++ b/toolkit/content/mozilla.xhtml @@ -1,9 +1,9 @@ - %mozillaDTD; %directionDTD; + + %brandDTD; ]>