Twemoji License

This license applies to the emoji art contained within the bundled emoji font file.

-Copyright (c) 2016 Ranks.com Inc. -Copyright (c) 2014 Twitter, Inc and other contributors. +Copyright (c) 2018 Twitter, Inc and other contributors. Creative Commons Attribution 4.0 International (CC BY 4.0) -- cgit v1.2.3 From 5e8e0689c44562dcd7cb212e7c85085278426e9d Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 5 Apr 2018 09:31:09 -0400 Subject: Port over logopage --- toolkit/content/jar.mn | 1 + toolkit/content/logopage.xhtml | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 toolkit/content/logopage.xhtml (limited to 'toolkit/content') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 0a0f0253b..f1a222a58 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -55,6 +55,7 @@ toolkit.jar: content/global/filepicker.properties content/global/globalOverlay.js content/global/mozilla.xhtml + content/global/logopage.xhtml content/global/process-content.js content/global/resetProfile.css content/global/resetProfile.js diff --git a/toolkit/content/logopage.xhtml b/toolkit/content/logopage.xhtml new file mode 100644 index 000000000..bcf1da0f0 --- /dev/null +++ b/toolkit/content/logopage.xhtml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + +

+ + -- cgit v1.2.3 From fb84e0f3226f1b9233aa2a6bfc55c38110694ffd Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 7 Apr 2018 06:10:48 -0400 Subject: Make about:logopage available to any browser that opts into MOZ_PHOENIX Follow up to 5e8e0689c --- toolkit/content/jar.mn | 2 ++ 1 file changed, 2 insertions(+) (limited to 'toolkit/content') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index f1a222a58..b80838835 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -55,7 +55,9 @@ toolkit.jar: content/global/filepicker.properties content/global/globalOverlay.js content/global/mozilla.xhtml +#ifdef MOZ_PHOENIX content/global/logopage.xhtml +#endif content/global/process-content.js content/global/resetProfile.css content/global/resetProfile.js -- cgit v1.2.3 From eb09a5738ccdc46202b597570a878d72f22b16b0 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Sat, 7 Apr 2018 08:22:56 -0400 Subject: Make code style consistent across all AboutRedirector's --- toolkit/content/jar.mn | 2 ++ toolkit/content/memoriam.xhtml | 76 ++++++++++++++++++++++++++++++++++++++++++ toolkit/content/mozilla.css | 36 ++++++++++++++++++++ toolkit/content/mozilla.xhtml | 35 ++----------------- 4 files changed, 116 insertions(+), 33 deletions(-) create mode 100644 toolkit/content/memoriam.xhtml create mode 100644 toolkit/content/mozilla.css (limited to 'toolkit/content') diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index b80838835..946e499f1 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -54,6 +54,8 @@ 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 new file mode 100644 index 000000000..f1a1b474d --- /dev/null +++ b/toolkit/content/memoriam.xhtml @@ -0,0 +1,76 @@ + + %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 new file mode 100644 index 000000000..d5eae6415 --- /dev/null +++ b/toolkit/content/mozilla.css @@ -0,0 +1,36 @@ +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 2acfc9f5d..8c79b5ff9 100644 --- a/toolkit/content/mozilla.xhtml +++ b/toolkit/content/mozilla.xhtml @@ -15,39 +15,8 @@ &chronicles.title.55.2; - + -- cgit v1.2.3 From bf6bb142fc5bcb49b053788e06160af304f639e5 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 8 Apr 2018 12:24:27 +0200 Subject: Remove telemetry experiments framework --- toolkit/content/aboutSupport.xhtml | 33 --------------------------------- 1 file changed, 33 deletions(-) (limited to 'toolkit/content') diff --git a/toolkit/content/aboutSupport.xhtml b/toolkit/content/aboutSupport.xhtml index e2885c8b8..a043dfe3b 100644 --- a/toolkit/content/aboutSupport.xhtml +++ b/toolkit/content/aboutSupport.xhtml @@ -504,39 +504,6 @@ -

- &aboutSupport.experimentsTitle; -

- - - - - - - - - - - - - - - -

- &aboutSupport.experimentName; -	- &aboutSupport.experimentId; -	- &aboutSupport.experimentDescription; -	- &aboutSupport.experimentActive; -	- &aboutSupport.experimentEndDate; -	- &aboutSupport.experimentHomepage; -	- &aboutSupport.experimentBranch; -

#if defined(MOZ_SANDBOX) -- cgit v1.2.3 From ac05ab923af8bc5b0c077fe3a271492af19dbea8 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Wed, 11 Apr 2018 17:30:34 +0200 Subject: Fix aboutSupport.js Addresses comments: https://github.com/MoonchildProductions/UXP/commit/bf6bb142fc5bcb49b053788e06160af304f639e5#commitcomment-28527974 https://github.com/MoonchildProductions/UXP/commit/0f99df52d5309158c7b916581c5a79496b1844db#commitcomment-28527792 --- toolkit/content/aboutSupport.js | 16 ---------------- toolkit/content/jar.mn | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'toolkit/content') diff --git a/toolkit/content/aboutSupport.js b/toolkit/content/aboutSupport.js index 5daf6d189..97b795b5b 100644 --- a/toolkit/content/aboutSupport.js +++ b/toolkit/content/aboutSupport.js @@ -151,22 +151,6 @@ var snapshotFormatters = { })); }, - experiments: function experiments(data) { - $.append($("experiments-tbody"), data.map(function (experiment) { - return $.new("tr", [ - $.new("td", experiment.name), - $.new("td", experiment.id), - $.new("td", experiment.description), - $.new("td", experiment.active), - $.new("td", experiment.endDate), - $.new("td", [ - $.new("a", experiment.detailURL, null, {href : experiment.detailURL, }) - ]), - $.new("td", experiment.branch), - ]); - })); - }, - modifiedPreferences: function modifiedPreferences(data) { $.append($("prefs-tbody"), sortedArrayFromObject(data).map( function ([name, value]) { diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn index 946e499f1..f9ac19a24 100644 --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn @@ -28,7 +28,7 @@ toolkit.jar: content/global/aboutwebrtc/aboutWebrtc.css (aboutwebrtc/aboutWebrtc.css) content/global/aboutwebrtc/aboutWebrtc.js (aboutwebrtc/aboutWebrtc.js) content/global/aboutwebrtc/aboutWebrtc.html (aboutwebrtc/aboutWebrtc.html) - content/global/aboutSupport.js +* content/global/aboutSupport.js * content/global/aboutSupport.xhtml content/global/aboutTelemetry.js content/global/aboutTelemetry.xhtml -- cgit v1.2.3

EmojiOne License

Twemoji License

Mozilla: In Memoriam

- &aboutSupport.experimentsTitle; -