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

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

1 files changed, 0 insertions, 66 deletions

diff --git a/browser/themes/linux/preferences/applications.css b/browser/themes/linux/preferences/applications.css
deleted file mode 100644
index 508076304..000000000
--- a/browser/themes/linux/preferences/applications.css
+++ /dev/null
@@ -1,66 +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/. */
-
-/**
- * Line up the actions menu with action labels above and below it.
- * Equalize the distance from the left side of the action box to the left side
- * of the icon for both the menu and the non-menu versions of the action box.
- * Also make sure the labels are the same distance away from the icons.
- */
-.actionsMenu {
-  margin-top: -1px;
-  margin-bottom: -1px;
-  margin-inline-start: -1px;
-  margin-inline-end: 0;
-}
-
-.typeIcon,
-.actionIcon {
-  margin-inline-start: 3px;
-  margin-inline-end: 3px;
-}
-
-#handlersView > richlistitem label {
-  margin-inline-start: 1px;
-  margin-top: 2px;
-}
-
-#handlersView > richlistitem {
-  min-height: 25px;
-}
-
-richlistitem[appHandlerIcon="ask"],
-menuitem[appHandlerIcon="ask"] {
-  list-style-image: url("chrome://browser/skin/preferences/alwaysAsk.png");
-}
-
-richlistitem[appHandlerIcon="save"],
-menuitem[appHandlerIcon="save"] {
-  list-style-image: url("moz-icon://stock/gtk-save?size=menu");
-}
-
-richlistitem[appHandlerIcon="feed"],
-menuitem[appHandlerIcon="feed"] {
-  list-style-image: url("chrome://browser/skin/page-livemarks.png");
-}
-
-richlistitem[appHandlerIcon="plugin"],
-menuitem[appHandlerIcon="plugin"] {
-  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
-}
-
-.actionsMenu .menulist-icon {
-  margin-inline-end: 1px;
-  height: 16px;
-  width: 16px;
-}
-
-.actionsMenu > menupopup > menuitem > .menu-iconic-left {
-  padding-inline-start: 0;
-  padding-inline-end: 4px !important;
-}
-
-.actionsMenu > menupopup > menuitem {
-  padding-inline-start: 3px;
-}