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

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

39 files changed, 48 insertions, 0 deletions

diff --git a/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
new file mode 100644
index 000000000..295b4ad74
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted.png
diff --git a/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
new file mode 100644
index 000000000..23889d7cc
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-inverted@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
new file mode 100644
index 000000000..4d71308d2
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion.png
diff --git a/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
new file mode 100644
index 000000000..875f73c5e
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon-lion@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
new file mode 100644
index 000000000..94a11fe5f
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/alltabs-box-bkgnd-icon.png
diff --git a/application/basilisk/themes/osx/tabbrowser/newtab-inverted.png b/application/basilisk/themes/osx/tabbrowser/newtab-inverted.png
new file mode 100644
index 000000000..2d29c2cbe
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/newtab-inverted.png
diff --git a/application/basilisk/themes/osx/tabbrowser/newtab-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/newtab-inverted@2x.png
new file mode 100644
index 000000000..6feba0e83
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/newtab-inverted@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/newtab.png b/application/basilisk/themes/osx/tabbrowser/newtab.png
new file mode 100644
index 000000000..32e42b04c
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/newtab.png
diff --git a/application/basilisk/themes/osx/tabbrowser/newtab@2x.png b/application/basilisk/themes/osx/tabbrowser/newtab@2x.png
new file mode 100644
index 000000000..ffde5f050
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/newtab@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
new file mode 100644
index 000000000..9f74c4e76
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
new file mode 100644
index 000000000..50961db7e
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle-yosemite-inactive@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-active-middle.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle.png
new file mode 100644
index 000000000..c3e5e18ba
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-active-middle@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-active-middle@2x.png
new file mode 100644
index 000000000..6cdc4472e
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-active-middle@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted.png
new file mode 100644
index 000000000..b0826024d
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
new file mode 100644
index 000000000..4ca8ec0ba
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left-inverted@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-left.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left.png
new file mode 100644
index 000000000..61ad41ae9
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-left@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left@2x.png
new file mode 100644
index 000000000..20bf78db2
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-left@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted.png
new file mode 100644
index 000000000..0cd8f37a6
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
new file mode 100644
index 000000000..e4ab8cbaa
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right-inverted@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-right.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right.png
new file mode 100644
index 000000000..37ccf8cfe
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-arrow-right@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right@2x.png
new file mode 100644
index 000000000..d319accc5
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-arrow-right@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-background-end.png b/application/basilisk/themes/osx/tabbrowser/tab-background-end.png
new file mode 100644
index 000000000..2e515a39e
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-end.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-background-end@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-background-end@2x.png
new file mode 100644
index 000000000..18dba9693
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-end@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-background-middle.png b/application/basilisk/themes/osx/tabbrowser/tab-background-middle.png
new file mode 100644
index 000000000..addb64b13
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-middle.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-background-middle@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-background-middle@2x.png
new file mode 100644
index 000000000..41eba94af
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-middle@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-background-start.png b/application/basilisk/themes/osx/tabbrowser/tab-background-start.png
new file mode 100644
index 000000000..243bf0099
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-start.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-background-start@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-background-start@2x.png
new file mode 100644
index 000000000..86403921d
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-background-start@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg b/application/basilisk/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
new file mode 100644
index 000000000..decefab6e
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-selected-end-yosemite-inactive.svg
@@ -0,0 +1,24 @@
+<!-- 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" width="30px" height="31px" preserveAspectRatio="none">
+  <defs>
+    <style>
+      #tab-background-fill {
+        background-color: transparent;
+        background-image: linear-gradient(transparent, transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,97%));
+        background-repeat: no-repeat;
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+
+    <clipPath id="tab-curve-clip-path-end" clipPathUnits="objectBoundingBox">
+      <path d="m 0,0.0625 -0.05,0 0,0.938 1,0 0,-0.028 C 0.67917542,0.95840561 0.56569036,0.81970962 0.51599998,0.5625 0.48279998,0.3905 0.465,0.0659 0,0.0625 z"/>
+    </clipPath>
+  </defs>
+
+  <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-end)">
+    <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
+  </foreignObject>
+</svg>
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg b/application/basilisk/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
new file mode 100644
index 000000000..e29bab297
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-selected-start-yosemite-inactive.svg
@@ -0,0 +1,24 @@
+<!-- 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" width="30px" height="31px" preserveAspectRatio="none">
+  <defs>
+    <style>
+      #tab-background-fill {
+        background-color: transparent;
+        background-image: linear-gradient(transparent, transparent 2px, hsl(0,0%,99%) 2px, hsl(0,0%,97%));
+        background-repeat: no-repeat;
+        height: 100%;
+        width: 100%;
+      }
+    </style>
+
+    <clipPath id="tab-curve-clip-path-start" clipPathUnits="objectBoundingBox">
+      <path d="m 1,0.0625 0.05,0 0,0.938 -1,0 0,-0.028 C 0.32082458,0.95840561 0.4353096,0.81970962 0.48499998,0.5625 0.51819998,0.3905 0.535,0.0659 1,0.0625 z"/>
+    </clipPath>
+  </defs>
+
+  <foreignObject width="30" height="31" clip-path="url(#tab-curve-clip-path-start)">
+    <div id="tab-background-fill" xmlns="http://www.w3.org/1999/xhtml"></div>
+  </foreignObject>
+</svg>
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
new file mode 100644
index 000000000..4206f0c7d
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
new file mode 100644
index 000000000..21ac89270
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end-yosemite-inactive@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-end.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end.png
new file mode 100644
index 000000000..099978580
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-end@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end@2x.png
new file mode 100644
index 000000000..d321ca579
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-end@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
new file mode 100644
index 000000000..2acbac438
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
new file mode 100644
index 000000000..a12fc39a7
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start-yosemite-inactive@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-start.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start.png
new file mode 100644
index 000000000..e5a7b5ee9
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tab-stroke-start@2x.png b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start@2x.png
new file mode 100644
index 000000000..64449115c
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tab-stroke-start@2x.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tabDragIndicator.png b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator.png
new file mode 100644
index 000000000..a373cae53
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator.png
diff --git a/application/basilisk/themes/osx/tabbrowser/tabDragIndicator@2x.png b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator@2x.png
new file mode 100644
index 000000000..b51b873cb
--- /dev/null
+++ b/application/basilisk/themes/osx/tabbrowser/tabDragIndicator@2x.png