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

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

1 files changed, 0 insertions, 147 deletions

diff --git a/application/palemoon/themes/linux/preferences/aboutPermissions.css b/application/palemoon/themes/linux/preferences/aboutPermissions.css
deleted file mode 100644
index 2ad833fb2..000000000
--- a/application/palemoon/themes/linux/preferences/aboutPermissions.css
+++ /dev/null
@@ -1,147 +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/. */
-
-@import url("chrome://global/skin/inContentUI.css");
-
-/* header */
-
-#permissions-pagetitle {
-  font-size: 200%;
-  font-weight: bold;
-  padding-bottom: 0.5em;
-}
-
-/* sites box */
-
-#sites-box {
-  padding: 10px;
-  width: 25em;
-}
-
-#sites-filter {
-  margin: 0;
-}
-
-#sites-list {
-  margin: 5px 0 0 0;
-}
-
-.site {
-  padding: 4px;
-  border-bottom: 1px solid ThreeDLightShadow;
-}
-
-.site-favicon {
-  height: 16px;
-  width: 16px;
-  -moz-margin-end: 4px;
-  list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png");
-}
-
-#all-sites-item > .site-container > .site-favicon {
-  list-style-image: none;
-}
-
-/* permissions box */
-
-#permissions-box {
-  padding-top: 10px;
-  overflow-y: auto;
-}
-
-#site-description {
-  font-size: 125%;
-  -moz-margin-start: 6px; /* to match button margin */
-}
-
-#site-label {
-  font-weight: bold;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-
-#defaults-description {
-  font-size: 125%;
-  font-weight: bold;
-  -moz-margin-start: 6px;
-}
-
-.pref-item {
-  margin-bottom: 10px;
-}
-
-.pref-icon {
-  width: 36px;
-  height: 36px;
-  -moz-margin-end: 10px;
-}
-
-.pref-icon[type="password"] {
-  list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png);
-}
-.pref-icon[type="image"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="popup"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="cookie"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="desktop-notification"] {
-  list-style-image: url(chrome://browser/skin/web-notifications-icon.svg);
-}
-.pref-icon[type="install"] {
-  list-style-image: url(chrome://mozapps/skin/extensions/extensionGeneric.png);
-}
-.pref-icon[type="geo"] {
-  list-style-image: url(chrome://browser/skin/Geolocation-64.png);
-}
-.pref-icon[type="indexedDB"] {
-  list-style-image: url(chrome://global/skin/icons/question-64.png);
-}
-.pref-icon[type="plugins"] {
-  list-style-image: url(chrome://mozapps/skin/plugins/pluginGeneric.png);
-}
-
-.pref-title {
-  font-size: 125%;
-  margin-bottom: 0;
-  font-weight: bold;
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.pref-default {
-  margin-left: 0.5em;
-  padding-left: 0;
-}
-
-.pref-set-default {
-  visibility: collapse;
-}
-
-.pref-menulist {
-  margin-left: 6px;
-  margin-right: 6px;
-}
-
-.plugins-label {
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.plugins-vulnerable {
-  margin-left: 0;
-  padding-left: 0;
-  margin-right: 0;
-  padding-right: 0;
-}
-
-.plugins-default {
-  margin-left: 0.5em;
-  padding-left: 0;
-  margin-right: 1em;
-  padding-right: 0;
-}