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

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

5 files changed, 29 insertions, 0 deletions

diff --git a/application/basilisk/themes/shared/reader/reader-mode-16.png b/application/basilisk/themes/shared/reader/reader-mode-16.png
new file mode 100644
index 000000000..12e2fd991
--- /dev/null
+++ b/application/basilisk/themes/shared/reader/reader-mode-16.png
diff --git a/application/basilisk/themes/shared/reader/reader-mode-16@2x.png b/application/basilisk/themes/shared/reader/reader-mode-16@2x.png
new file mode 100644
index 000000000..236f52d8f
--- /dev/null
+++ b/application/basilisk/themes/shared/reader/reader-mode-16@2x.png
diff --git a/application/basilisk/themes/shared/reader/reader-tour.png b/application/basilisk/themes/shared/reader/reader-tour.png
new file mode 100644
index 000000000..be346b384
--- /dev/null
+++ b/application/basilisk/themes/shared/reader/reader-tour.png
diff --git a/application/basilisk/themes/shared/reader/reader-tour@2x.png b/application/basilisk/themes/shared/reader/reader-tour@2x.png
new file mode 100644
index 000000000..1a60d93ca
--- /dev/null
+++ b/application/basilisk/themes/shared/reader/reader-tour@2x.png
diff --git a/application/basilisk/themes/shared/reader/readerMode.svg b/application/basilisk/themes/shared/reader/readerMode.svg
new file mode 100644
index 000000000..9293d1df2
--- /dev/null
+++ b/application/basilisk/themes/shared/reader/readerMode.svg
@@ -0,0 +1,29 @@
+<?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="48" height="16" viewBox="0 0 48 16">

+  <defs>

+    <path id="glyphShape-readerMode-book" d="M5.5,5h-2C3.2,5,3,5.2,3,5.5S3.2,6,3.5,6h2 C5.8,6,6,5.8,6,5.5S5.8,5,5.5,5z M5.5,7h-2C3.2,7,3,7.2,3,7.5S3.2,8,3.5,8h2C5.8,8,6,7.8,6,7.5S5.8,7,5.5,7z M5.5,9h-2 C3.2,9,3,9.2,3,9.5S3.2,10,3.5,10h2C5.8,10,6,9.8,6,9.5S5.8,9,5.5,9z M15.4,2c0,0-3.1,0-4.4,0S8.1,2.5,8,4.3C7.9,2.5,6.3,2,5,2 S0.6,2,0.6,2C0.3,2,0,2.3,0,2.7v9.6C0,12.6,0.3,13,0.6,13c0,0,2.6,0,4.4,0c1.6,0,2.8,1,3,2.3C8.2,14,9.4,13,11,13 c1.8,0,4.4,0,4.4,0c0.4,0,0.6-0.4,0.6-0.8V2.7C16,2.3,15.7,2,15.4,2z M14,11L14,11c-0.2,0-1.6,0-3,0c-1.6,0-2.9,0.8-3,2.2 C7.9,11.8,6.6,11,5,11c-1.4,0-2.8,0-3,0l0,0l0,0V4c0,0,2.7,0,3.5,0C6.6,4,8,5.5,8,6.8C8,5.5,9.4,4,10.5,4C11.3,4,14,4,14,4V11 L14,11z"/>

+    <linearGradient id="gradient-state-default" x1="0%" y1="0%" x2="0" y2="100%">

+      <stop stop-color="#989898" offset="0%"/>

+      <stop stop-color="#808080" offset="100%"/>

+    </linearGradient>

+    <linearGradient id="gradient-state-hover" x1="0%" y1="0%" x2="0" y2="100%">

+      <stop stop-color="#24aef4" offset="0%"/>

+      <stop stop-color="#177bdb" offset="100%"/>

+    </linearGradient>

+    <linearGradient id="gradient-state-pressed" x1="0%" y1="0%" x2="0" y2="100%">

+      <stop stop-color="#ff9300" offset="0%"/>

+      <stop stop-color="#ff5500" offset="100%"/>

+    </linearGradient>

+    <style>

+      .icon-state-default { fill: url(#gradient-state-default); }

+      .icon-state-hover   { fill: url(#gradient-state-hover); }

+      .icon-state-pressed { fill: url(#gradient-state-pressed); }

+    </style>

+  </defs>

+  <use xlink:href="#glyphShape-readerMode-book" class="icon-state-default"/>

+  <use xlink:href="#glyphShape-readerMode-book" class="icon-state-hover" transform="translate(16)"/>

+  <use xlink:href="#glyphShape-readerMode-book" class="icon-state-pressed" transform="translate(32)"/>

+</svg>