From 0755d96837405c936b93afb372c7f5e4ba2cbced Mon Sep 17 00:00:00 2001
From: Ryan C <lootyhoofer@gmail.com>
Date: Sat, 13 Jul 2019 23:24:29 +0100
Subject: [PATCH] Update Reader View icons

---
 src/chrome/global/reader/RM-Close-24x24.svg   | 22 ++++++++++++++++---
 .../reader/RM-Content-Width-Minus-42x16.svg   |  5 ++++-
 .../reader/RM-Content-Width-Plus-44x16.svg    |  5 ++++-
 .../reader/RM-Line-Height-Minus-38x14.svg     |  5 ++++-
 .../reader/RM-Line-Height-Plus-38x24.svg      |  5 ++++-
 .../global/reader/RM-Type-Controls-Arrow.svg  |  6 ++---
 6 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/chrome/global/reader/RM-Close-24x24.svg b/src/chrome/global/reader/RM-Close-24x24.svg
index f836371..89fc1eb 100644
--- a/src/chrome/global/reader/RM-Close-24x24.svg
+++ b/src/chrome/global/reader/RM-Close-24x24.svg
@@ -1,7 +1,23 @@
+<?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" width="24" height="24" viewBox="0 0 24 24">
-  <path fill="context-fill" d="M19,22H6a2,2,0,0,1-2-2V18l2,2H18a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1H6L4,6V4A2,2,0,0,1,6,2H19a2,2,0,0,1,2,2V20A2,2,0,0,1,19,22Zm-6-9H5.4l4.2,4.154L8.186,18.631,1.567,12.017,8.021,5.411,9.5,6.95,5.424,11H13v2Z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
+  <defs>
+    <style>
+      use:not(:target) {
+        display: none;
+      }
+      #close {
+        fill: #808080;
+      }
+      #close-hover {
+        fill: #fff;
+      }
+    </style>
 
+    <path id="close-shape" d="M19,22H6a2,2,0,0,1-2-2V18l2,2H18a1,1,0,0,0,1-1V5a1,1,0,0,0-1-1H6L4,6V4A2,2,0,0,1,6,2H19a2,2,0,0,1,2,2V20A2,2,0,0,1,19,22Zm-6-9H5.4l4.2,4.154L8.186,18.631,1.567,12.017,8.021,5.411,9.5,6.95,5.424,11H13v2Z"/>
+  </defs>
+  <use id="close" xlink:href="#close-shape"/>
+  <use id="close-hover" xlink:href="#close-shape"/>
+</svg>
diff --git a/src/chrome/global/reader/RM-Content-Width-Minus-42x16.svg b/src/chrome/global/reader/RM-Content-Width-Minus-42x16.svg
index 482a392..48bbb9e 100644
--- a/src/chrome/global/reader/RM-Content-Width-Minus-42x16.svg
+++ b/src/chrome/global/reader/RM-Content-Width-Minus-42x16.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <!-- 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"
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      width="42"
      height="16"
      viewBox="0 0 42 16"
diff --git a/src/chrome/global/reader/RM-Content-Width-Plus-44x16.svg b/src/chrome/global/reader/RM-Content-Width-Plus-44x16.svg
index da02e60..bcdcbe8 100644
--- a/src/chrome/global/reader/RM-Content-Width-Plus-44x16.svg
+++ b/src/chrome/global/reader/RM-Content-Width-Plus-44x16.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <!-- 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"
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      width="44"
      height="16"
      viewBox="0 0 44 16"
diff --git a/src/chrome/global/reader/RM-Line-Height-Minus-38x14.svg b/src/chrome/global/reader/RM-Line-Height-Minus-38x14.svg
index 59517c2..05d5282 100644
--- a/src/chrome/global/reader/RM-Line-Height-Minus-38x14.svg
+++ b/src/chrome/global/reader/RM-Line-Height-Minus-38x14.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <!-- 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"
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      width="38"
      height="14"
      viewBox="0 0 38 14"
diff --git a/src/chrome/global/reader/RM-Line-Height-Plus-38x24.svg b/src/chrome/global/reader/RM-Line-Height-Plus-38x24.svg
index ba50c5a..0a5ee0d 100644
--- a/src/chrome/global/reader/RM-Line-Height-Plus-38x24.svg
+++ b/src/chrome/global/reader/RM-Line-Height-Plus-38x24.svg
@@ -1,10 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
 <!-- 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"
+<svg version="1.1"
+     xmlns="http://www.w3.org/2000/svg"
+     xmlns:xlink="http://www.w3.org/1999/xlink"
      width="38"
      height="24"
      viewBox="0 0 38 24"
diff --git a/src/chrome/global/reader/RM-Type-Controls-Arrow.svg b/src/chrome/global/reader/RM-Type-Controls-Arrow.svg
index 9c66311..2079dc1 100644
--- a/src/chrome/global/reader/RM-Type-Controls-Arrow.svg
+++ b/src/chrome/global/reader/RM-Type-Controls-Arrow.svg
@@ -2,7 +2,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 xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 24">
-  <polygon points="16.58 0.01 16.57 0 4.58 12 16.57 24 16.58 23.98 16.58 0.01" fill="#b5b5b5"/>
-  <polyline points="16.63 1.51 6.08 12.01 16.63 22.5" fill="#fbfbfb"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+  <polygon opacity="0.15"  points="16.583,0.015 16.569,0 4.583,12 16.569,24 16.583,23.985"/>
+  <polygon fill="#fbfbfb" points="16.575,1.021 16.561,1.008 5.583,12 16.577,23.008 16.591,22.994 "/>
 </svg>