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

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

4 files changed, 0 insertions, 192 deletions

diff --git a/browser/themes/linux/feeds/feedIcon.png b/browser/themes/linux/feeds/feedIcon.png
deleted file mode 100644
index a788fffb0..000000000
--- a/browser/themes/linux/feeds/feedIcon.png
+++ /dev/null
diff --git a/browser/themes/linux/feeds/feedIcon16.png b/browser/themes/linux/feeds/feedIcon16.png
deleted file mode 100644
index f8536a4e1..000000000
--- a/browser/themes/linux/feeds/feedIcon16.png
+++ /dev/null
diff --git a/browser/themes/linux/feeds/subscribe-ui.css b/browser/themes/linux/feeds/subscribe-ui.css
deleted file mode 100644
index f1650036e..000000000
--- a/browser/themes/linux/feeds/subscribe-ui.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 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/. */
-
-.alwaysUse {
-  padding: 5px;
-}
diff --git a/browser/themes/linux/feeds/subscribe.css b/browser/themes/linux/feeds/subscribe.css
deleted file mode 100644
index a9b59d2e1..000000000
--- a/browser/themes/linux/feeds/subscribe.css
+++ /dev/null
@@ -1,185 +0,0 @@
-/* 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 {
-  background: -moz-Dialog;
-  font: 3mm tahoma,arial,helvetica,sans-serif;
-}
-
-#subscribeUsingDescription,
-#subscribeButton {
-  display: block;
-}
-
-#subscribeUsingDescription {
-  margin-bottom: 0.5em;
-}
-
-#subscribeButton {
-  margin-top: 0.5em;
-  margin-inline-start: auto;
-}
-
-#feedBody {
-  border: 1px solid THreeDShadow;
-  padding: 3em;
-  padding-inline-start: 30px;
-  margin: 2em auto;
-  background: -moz-Field;
-}
-
-#feedHeaderContainer {
-  border: 1px solid ThreeDShadow;
-  border-radius: 10px;
-  margin: -4em auto 0 auto;
-  background-color: InfoBackground;
-  -moz-appearance: -moz-gtk-info-bar;
-  display: flex;
-}
-
-#feedHeaderContainerSpacer {
-  flex-grow: 1;
-}
-
-#feedHeader {
-  margin-top: 4.9em;
-  margin-bottom: 1em;
-  margin-inline-start: 1.4em;
-  margin-inline-end: 1em;
-  padding-inline-start: 2.9em;
-  font-size: 110%;
-  color: -moz-gtk-info-bar-text;
-}
-
-.feedBackground {
-  background: url("chrome://browser/skin/feeds/feedIcon.png") 0% 10% no-repeat;
-}
-
-.videoPodcastBackground {
-  background: url("chrome://browser/skin/feeds/videoFeedIcon.png") 0% 10% no-repeat;
-}
-
-.audioPodcastBackground {
-  background: url("chrome://browser/skin/feeds/audioFeedIcon.png") 0% 10% no-repeat;
-}
-
-#feedHeader[dir="rtl"] {
-  background-position: 100% 10%;
-}
-
-#feedIntroText {
-  display: none;
-}
-
-#feedHeader[firstrun="true"] #feedIntroText {
-  padding-top: 0.1em;
-  padding-inline-start: 0.6em;
-  display: block;
-}
-
-#feedHeader[firstrun="true"] > #feedSubscribeLine {
-  padding-inline-start: 1.8em;
-}
-
-#feedSubscribeLine {
-  padding-top: 0.2em;
-  padding-inline-start: 0.5em;
-}
-
-/* Don't print subscription UI */
-@media print {
-  #feedHeaderContainer {
-    display: none;
-  }
-}
-
-body {
-  margin: 0;
-  padding: 0 3em;
-  color: -moz-fieldText;
-  font: message-box;
-}
-
-h1 {
-  font-size: 160%;
-  border-bottom: 2px solid ThreeDLightShadow;
-  margin: 0 0 .2em 0;
-}
-
-h2 {
-  color: GrayText;
-  font-size: 110%;
-  font-weight: normal;
-  margin: 0 0 .6em 0;
-}
-
-#feedTitleLink {
-  float: right;
-  margin-inline-start: .6em;
-  margin-inline-end: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-a[href] img {
-  border: none;
-}
-
-#feedTitleContainer {
-  margin-inline-start: 0;
-  margin-inline-end: .6em;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#feedTitleImage {
-  margin-inline-start: .6em;
-  margin-inline-end: 0;
-  margin-top: 0;
-  margin-bottom: 0;
-  max-width: 300px;
-  max-height: 150px;
-}
-
-.feedEntryContent {
-  font-size: 110%;
-}
- 
-.link {
-  color: #0000FF;
-  text-decoration: underline;
-  cursor: pointer;
-}
-
-.link:hover:active {
-  color: #FF0000;
-}
-
-.lastUpdated {
-  font-size: 85%;
-  font-weight: normal;
-}
-
-.type-icon {
-  vertical-align: bottom;
-  height: 16px;
-  width: 16px;
-}
-
-.enclosures {
-  border: 1px solid THreeDShadow;
-  padding: 1em;
-  margin: 1em auto;
-  background: -moz-Dialog;
-}
-
-.enclosure {
-  vertical-align: middle;
-  margin-left: 2px;
-}
-
-.handlersMenuList > .menulist-label-box > .menulist-icon {
-  max-width: 16px;
-  max-height: 16px;
-}