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

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

1 files changed, 37 insertions, 0 deletions

diff --git a/application/basilisk/components/preferences/handlers.css b/application/basilisk/components/preferences/handlers.css
new file mode 100644
index 000000000..6af75a08b
--- /dev/null
+++ b/application/basilisk/components/preferences/handlers.css
@@ -0,0 +1,37 @@
+/* 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/. */
+
+#handlersView > richlistitem {
+  -moz-binding: url("chrome://browser/content/preferences/handlers.xml#handler");
+}
+
+#handlersView > richlistitem[selected="true"] {
+  -moz-binding: url("chrome://browser/content/preferences/handlers.xml#handler-selected");
+}
+
+#containersView > richlistitem {
+  -moz-binding: url("chrome://browser/content/preferences/handlers.xml#container");
+}
+
+/**
+ * Make the icons appear.
+ * Note: we display the icon box for every item whether or not it has an icon
+ * so the labels of all the items align vertically.
+ */
+.actionsMenu > menupopup > menuitem > .menu-iconic-left {
+  display: -moz-box;
+  min-width: 16px;
+}
+
+listitem.offlineapp {
+  -moz-binding: url("chrome://browser/content/preferences/handlers.xml#offlineapp");
+}
+
+/* Apply crisp rendering for favicons at exactly 2dppx resolution */
+@media (resolution: 2dppx) {
+  #handlersView > richlistitem,
+  .actionsMenu > menupopup > menuitem > .menu-iconic-left {
+    image-rendering: -moz-crisp-edges;
+  }
+}