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

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

1 files changed, 54 insertions, 0 deletions

diff --git a/application/basilisk/themes/shared/identity-block/connection-mixed-active-loaded.svg b/application/basilisk/themes/shared/identity-block/connection-mixed-active-loaded.svg
new file mode 100644
index 000000000..35d84784a
--- /dev/null
+++ b/application/basilisk/themes/shared/identity-block/connection-mixed-active-loaded.svg
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"
+     width="16" height="16" viewBox="0 0 16 16">
+#include ../icon-colors.inc.svg
+  <style>
+    svg > g:not(:target) {
+      display: none;
+    }
+  </style>
+
+  <defs>
+    <rect id="shape-lock-clasp-outer" x="4" y="2" width="8" height="10" rx="4" ry="4" />
+    <rect id="shape-lock-clasp-inner" x="6" y="4" width="4" height="6" rx="2" ry="2" />
+    <rect id="shape-lock-base" x="3" y="7" width="10" height="7" rx="1" ry="1" />
+
+    <mask id="mask-clasp-cutout">
+      <use xlink:href="#shape-lock-clasp-outer" fill="#fff" />
+      <use xlink:href="#shape-lock-clasp-inner" fill="#000" />
+      <line x1="2" y1="13" x2="14" y2="1.5" stroke="#000" stroke-width="2" />
+      <line x1="2" y1="15" x2="14" y2="3.5" stroke="#000" stroke-width="2" />
+      <rect x="3" y="7" width="10" height="7" rx="1" ry="1" fill="#000" />
+    </mask>
+
+    <mask id="mask-base-cutout">
+      <use xlink:href="#shape-lock-base" fill="#fff" />
+      <line x1="2" y1="14.8" x2="14" y2="3.2" stroke="#000" stroke-width="1.8" />
+    </mask>
+
+    <g id="lock">
+      <use xlink:href="#shape-lock-clasp-outer" mask="url(#mask-clasp-cutout)"/>
+      <use xlink:href="#shape-lock-base" mask="url(#mask-base-cutout)"/>
+    </g>
+
+    <line id="strike-through-red" x1="2" y1="14.1" x2="14" y2="2.5" stroke="#d92d21" stroke-width="1.8"/>
+  </defs>
+
+  <g id="icon">
+    <use xlink:href="#lock" class="fieldtext"/>
+    <use xlink:href="#strike-through-red"/>
+  </g>
+
+  <g id="icon-black">
+    <use xlink:href="#lock" class="black"/>
+    <use xlink:href="#strike-through-red"/>
+  </g>
+
+  <g id="icon-white">
+    <use xlink:href="#lock" class="white"/>
+    <use xlink:href="#strike-through-red"/>
+  </g>
+</svg>