summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--application/palemoon/base/content/palemoon.xhtml66
-rw-r--r--application/palemoon/base/jar.mn1
-rw-r--r--application/palemoon/components/about/AboutRedirector.cpp2
-rw-r--r--application/palemoon/locales/en-US/chrome/browser/palemoon.dtd (renamed from toolkit/locales/en-US/chrome/global/mozilla.dtd)0
-rw-r--r--application/palemoon/locales/jar.mn1
-rw-r--r--toolkit/content/jar.mn2
-rw-r--r--toolkit/content/memoriam.xhtml76
-rw-r--r--toolkit/content/mozilla.css36
-rw-r--r--toolkit/content/mozilla.xhtml57
-rw-r--r--toolkit/locales/jar.mn1
10 files changed, 118 insertions, 124 deletions
diff --git a/application/palemoon/base/content/palemoon.xhtml b/application/palemoon/base/content/palemoon.xhtml
new file mode 100644
index 000000000..96757052c
--- /dev/null
+++ b/application/palemoon/base/content/palemoon.xhtml
@@ -0,0 +1,66 @@
+<!DOCTYPE html
+[
+ <!ENTITY % mozillaDTD SYSTEM "chrome://browser/locale/palemoon.dtd" >
+ %mozillaDTD;
+ <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
+ %directionDTD;
+]>
+
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - 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/. -->
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <meta charset='utf-8' />
+ <title>&chronicles.title.55.2;</title>
+
+<style type="text/css">
+html {
+ background: #333399 radial-gradient( circle at 75% 25%, #6666b0 0%, #333399 40%, #111177 80%) center center / cover no-repeat;
+ 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;
+}
+</style>
+</head>
+
+<body dir="&locale.dir;">
+
+<section>
+ <p id="moztext">
+ &chronicles.quote.55.2;
+ </p>
+
+ <p id="from">
+ &chronicles.from.55.2;
+ </p>
+</section>
+
+</body>
+</html>
diff --git a/application/palemoon/base/jar.mn b/application/palemoon/base/jar.mn
index 246cf9017..d8c3f4b21 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 7e4c634f7..508202c7d 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
index 038d8eb75..038d8eb75 100644
--- a/toolkit/locales/en-US/chrome/global/mozilla.dtd
+++ b/application/palemoon/locales/en-US/chrome/browser/palemoon.dtd
diff --git a/application/palemoon/locales/jar.mn b/application/palemoon/locales/jar.mn
index 046cb0ac7..8d88e16fd 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 c8dd6dc47..0c0f9494a 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 f1a1b474d..000000000
--- a/toolkit/content/memoriam.xhtml
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html
-[
- <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
- %directionDTD;
- <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
- %brandDTD;
-]>
-
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - 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/. -->
-
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <meta charset='utf-8' />
- <title>Mozilla: In Memoriam</title>
-
-<style>
-html {
- background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
- 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.0em;
- font-family: serif;
- text-align: right;
-}
-
-em {
- font-size: 1.3em;
- line-height: 0;
-}
-
-a {
- text-decoration: none;
- color: white;
-}
-</style>
-</head>
-
-<body dir="&locale.dir;">
-
-<section>
- <p id="moztext">
- <h1>Mozilla: In Memoriam</h1>
- <br/>
- Dedicated to the tireless developers who have come and gone.<br/>
- To those who have put their heart and soul into Mozilla products.<br/>
- To those who have seen their good intentions and hard work squandered.<br/>
- To those who really cared about the user, and cared about usability.<br/>
- To those who truly understood us and desired freedom, but were unheard.<br/>
- To those who knew that change is inevitable, but loss of vision is not.<br/>
- To those who were forced to give up the good fight.<br/>
- <br/>
- <em>Thank you.</em> &brandFullName; would not have been possible without you.<br/>
- <br/>
- </p>
-
- <p id="from">
- </p>
-</section>
-
-</body>
-</html> \ No newline at end of file
diff --git a/toolkit/content/mozilla.css b/toolkit/content/mozilla.css
deleted file mode 100644
index d5eae6415..000000000
--- 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 8c79b5ff9..f1a1b474d 100644
--- a/toolkit/content/mozilla.xhtml
+++ b/toolkit/content/mozilla.xhtml
@@ -1,9 +1,9 @@
<!DOCTYPE html
[
- <!ENTITY % mozillaDTD SYSTEM "chrome://global/locale/mozilla.dtd" >
- %mozillaDTD;
<!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
%directionDTD;
+ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+ %brandDTD;
]>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
@@ -13,23 +13,64 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset='utf-8' />
- <title>&chronicles.title.55.2;</title>
+ <title>Mozilla: In Memoriam</title>
- <link rel="stylesheet" href="chrome://global/content/mozilla.css"
- type="text/css"/>
+<style>
+html {
+ background: maroon radial-gradient( circle, #a01010 0%, #800000 80%) center center / cover no-repeat;
+ 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.0em;
+ font-family: serif;
+ text-align: right;
+}
+
+em {
+ font-size: 1.3em;
+ line-height: 0;
+}
+
+a {
+ text-decoration: none;
+ color: white;
+}
+</style>
</head>
<body dir="&locale.dir;">
<section>
<p id="moztext">
- &chronicles.quote.55.2;
+ <h1>Mozilla: In Memoriam</h1>
+ <br/>
+ Dedicated to the tireless developers who have come and gone.<br/>
+ To those who have put their heart and soul into Mozilla products.<br/>
+ To those who have seen their good intentions and hard work squandered.<br/>
+ To those who really cared about the user, and cared about usability.<br/>
+ To those who truly understood us and desired freedom, but were unheard.<br/>
+ To those who knew that change is inevitable, but loss of vision is not.<br/>
+ To those who were forced to give up the good fight.<br/>
+ <br/>
+ <em>Thank you.</em> &brandFullName; would not have been possible without you.<br/>
+ <br/>
</p>
<p id="from">
- &chronicles.from.55.2;
</p>
</section>
</body>
-</html>
+</html> \ No newline at end of file
diff --git a/toolkit/locales/jar.mn b/toolkit/locales/jar.mn
index 23b9d72fb..e92e10599 100644
--- a/toolkit/locales/jar.mn
+++ b/toolkit/locales/jar.mn
@@ -67,7 +67,6 @@
locale/@AB_CD@/global/intl.properties (%chrome/global/intl.properties)
locale/@AB_CD@/global/keys.properties (%chrome/global/keys.properties)
locale/@AB_CD@/global/languageNames.properties (%chrome/global/languageNames.properties)
- locale/@AB_CD@/global/mozilla.dtd (%chrome/global/mozilla.dtd)
#ifndef MOZ_FENNEC
locale/@AB_CD@/global/narrate.properties (%chrome/global/narrate.properties)
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 17:08:22 +0000