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

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

26 files changed, 75 insertions, 0 deletions

diff --git a/application/basilisk/themes/windows/tabbrowser/newtab-inverted-win7.svg b/application/basilisk/themes/windows/tabbrowser/newtab-inverted-win7.svg
new file mode 100644
index 000000000..10ffbc745
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/newtab-inverted-win7.svg
@@ -0,0 +1,13 @@
+<!-- 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 width="16" height="18" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="#666" stroke-width="2" fill="none">
+    <rect x="7" y="4" width="2" height="10" rx="0.25" ry="0.25"/>
+    <rect x="3" y="8" width="10" height="2" rx="0.25" ry="0.25"/>
+  </g>
+  <g fill="#fff">
+    <rect width="2" height="10" x="7" y="4"/>
+    <rect width="10" height="2" x="3" y="8"/>
+  </g>
+</svg>
diff --git a/application/basilisk/themes/windows/tabbrowser/newtab-inverted.svg b/application/basilisk/themes/windows/tabbrowser/newtab-inverted.svg
new file mode 100644
index 000000000..2728cda5c
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/newtab-inverted.svg
@@ -0,0 +1,13 @@
+<!-- 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 width="16" height="18" xmlns="http://www.w3.org/2000/svg">
+  <g stroke="#666" stroke-width="2" fill="none">
+    <rect x="7" y="3" width="2" height="12" rx="0.25" ry="0.25"/>
+    <rect x="2" y="8" width="12" height="2" rx="0.25" ry="0.25"/>
+  </g>
+  <g fill="#fff">
+    <rect x="7" y="3" width="2" height="12"/>
+    <rect x="2" y="8" width="12" height="2"/>
+  </g>
+</svg>
diff --git a/application/basilisk/themes/windows/tabbrowser/newtab-win7.svg b/application/basilisk/themes/windows/tabbrowser/newtab-win7.svg
new file mode 100644
index 000000000..3f431c9db
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/newtab-win7.svg
@@ -0,0 +1,16 @@
+<!-- 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 width="16" height="18" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="gradient" x1="0%" x2="0%" y1="0%" y2="100%">
+      <stop offset="0%" stop-color="#1c2835"/>
+      <stop offset="60%" stop-color="#606e7b"/>
+      <stop offset="100%" stop-color="#465765"/>
+    </linearGradient>
+  </defs>
+  <g fill="url(#gradient)">
+    <rect width="10" height="2" x="3" y="8"/>
+    <rect width="2" height="10" x="7" y="4"/>
+  </g>
+</svg>
diff --git a/application/basilisk/themes/windows/tabbrowser/newtab.svg b/application/basilisk/themes/windows/tabbrowser/newtab.svg
new file mode 100644
index 000000000..40548da4a
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/newtab.svg
@@ -0,0 +1,7 @@
+<!-- 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 width="16" height="18" xmlns="http://www.w3.org/2000/svg" fill="#4c4c4c">
+  <rect x="7" y="3" width="2" height="12"/>
+  <rect x="2" y="8" width="12" height="2"/>
+</svg>
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-active-middle.png b/application/basilisk/themes/windows/tabbrowser/tab-active-middle.png
new file mode 100644
index 000000000..b7e6d6f77
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-active-middle.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-active-middle@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-active-middle@2x.png
new file mode 100644
index 000000000..1e92acbda
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-active-middle@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-inverted.svg b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
new file mode 100644
index 000000000..13d3beb95
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-inverted.svg
@@ -0,0 +1,7 @@
+<!-- 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 width="15" height="17" xmlns="http://www.w3.org/2000/svg">
+  <path fill="#666" stroke-width="1.5" stroke="#666" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
+  <path fill="#fff" d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z"/>
+</svg>
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-win7.svg b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-win7.svg
new file mode 100644
index 000000000..41bb5ab13
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left-win7.svg
@@ -0,0 +1,13 @@
+<!-- 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 width="15" height="17" xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <linearGradient id="gradient" x1="0%" x2="0%" y1="0%" y2="100%">
+      <stop offset="0%" stop-color="#1c2835"/>
+      <stop offset="60%" stop-color="#606e7b"/>
+      <stop offset="100%" stop-color="#465765"/>
+    </linearGradient>
+  </defs>
+  <path d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z" fill="url(#gradient)"/>
+</svg>
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-arrow-left.svg b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left.svg
new file mode 100644
index 000000000..9bd59ddd3
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-arrow-left.svg
@@ -0,0 +1,6 @@
+<!-- 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 width="15" height="17" xmlns="http://www.w3.org/2000/svg">
+  <path d="M11 4L9.5 2.5l-5.875 6 5.875 6L11 13 6.625 8.5z" fill="#4c4c4c"/>
+</svg>
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10.png
new file mode 100644
index 000000000..fb353b17e
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png
new file mode 100644
index 000000000..eefb6ac47
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end-preWin10@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-end.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end.png
new file mode 100644
index 000000000..d68ea6da6
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-end@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-end@2x.png
new file mode 100644
index 000000000..8ed84ab37
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-end@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10.png
new file mode 100644
index 000000000..51e066c2e
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png
new file mode 100644
index 000000000..b26cb95de
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle-preWin10@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-middle.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle.png
new file mode 100644
index 000000000..faaf7e38e
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-middle@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-middle@2x.png
new file mode 100644
index 000000000..c9d245f4f
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-middle@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10.png
new file mode 100644
index 000000000..cf0dc852a
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png
new file mode 100644
index 000000000..bbfc77dd1
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start-preWin10@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-start.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start.png
new file mode 100644
index 000000000..d1f0b5561
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-background-start@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-background-start@2x.png
new file mode 100644
index 000000000..e860275a6
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-background-start@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-stroke-end.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end.png
new file mode 100644
index 000000000..2aa5711f8
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-stroke-end@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end@2x.png
new file mode 100644
index 000000000..a87002a83
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-end@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-stroke-start.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start.png
new file mode 100644
index 000000000..4e4e41f63
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tab-stroke-start@2x.png b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start@2x.png
new file mode 100644
index 000000000..13bd6add1
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tab-stroke-start@2x.png
diff --git a/application/basilisk/themes/windows/tabbrowser/tabDragIndicator.png b/application/basilisk/themes/windows/tabbrowser/tabDragIndicator.png
new file mode 100644
index 000000000..63c4eccad
--- /dev/null
+++ b/application/basilisk/themes/windows/tabbrowser/tabDragIndicator.png