Merge commit '50d3e596bbe89c95615f96eb71f6bc5be737a1db' into Basilisk-releasev2018.07.18

# Conflicts:
#	browser/app/profile/firefox.js
#	browser/components/preferences/jar.mn

1 files changed, 25 insertions, 0 deletions

diff --git a/application/basilisk/branding/unofficial/content/aboutDialog.css b/application/basilisk/branding/unofficial/content/aboutDialog.css
new file mode 100644
index 000000000..be7fdcab6
--- /dev/null
+++ b/application/basilisk/branding/unofficial/content/aboutDialog.css
@@ -0,0 +1,25 @@
+/* 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/. */
+
+#aboutDialogContainer {
+  background-image: url("chrome://branding/content/about-background.png");
+  background-repeat: no-repeat;
+  background-color: rgb(10,17,37);
+  color: #fff;
+}
+
+.text-link {
+  color: #fff !important;
+  text-decoration: underline;
+}
+
+#rightBox {
+  /* this margin prevents text from overlapping the planet image */
+  margin-left: 280px;
+  margin-right: 20px;
+}
+
+#bottomBox {
+  background-color: rgba(0,0,0,.7);
+}