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

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

1 files changed, 39 insertions, 0 deletions

diff --git a/application/basilisk/themes/shared/icon-colors.inc.svg b/application/basilisk/themes/shared/icon-colors.inc.svg
new file mode 100644
index 000000000..dc29d6055
--- /dev/null
+++ b/application/basilisk/themes/shared/icon-colors.inc.svg
@@ -0,0 +1,39 @@
+<style>
+
+.fieldtext {
+  fill: -moz-fieldtext;
+#ifdef MOZ_WIDGET_GTK
+  /* The fill-opacity needs to be sufficient for high-contrast settings, and
+     pathological Gtk themes where -moz-fieldtext provides low contrast by
+     default. */
+  fill-opacity: .7;
+#else
+  fill-opacity: .5;
+#endif
+}
+
+#ifdef XP_WIN
+@media (-moz-windows-default-theme: 0) {
+  /* more opacity for high-contrast themes */
+  .fieldtext {
+    fill-opacity: .8;
+  }
+}
+#endif
+
+.highlighttext {
+  fill: highlighttext;
+  fill-opacity: 1;
+}
+
+.black {
+  fill: black;
+  fill-opacity: .6;
+}
+
+.white {
+  fill: white;
+  fill-opacity: .7;
+}
+
+</style>