From 8cd4ac66492620e5c45dc7c834b164a714903bb3 Mon Sep 17 00:00:00 2001
From: John Bowdre <john@bowdre.net>
Date: Fri, 20 May 2022 15:44:20 -0500
Subject: [PATCH] remove/fix local icons to default to theme icons

---
 config/_default/params.toml                   |   2 +-
 .../icons/android-chrome-192x192.png          | Bin
 .../icons/android-chrome-256x256.png          | Bin
 .../{images => }/icons/apple-touch-icon.png   | Bin
 static/{images => }/icons/favicon-16x16.png   | Bin
 static/{images => }/icons/favicon-32x32.png   | Bin
 static/{images => }/icons/mstile-150x150.png  | Bin
 .../{images => }/icons/safari-pinned-tab.svg  |   0
 static/{images => }/icons/site.webmanifest    |   4 +-
 static/images/icons/bar.svg                   |   1 -
 static/images/icons/cancel.svg                |  42 -----------
 static/images/icons/caret-icon.svg            |   1 -
 static/images/icons/carly.svg                 |   1 -
 static/images/icons/close.svg                 |   1 -
 static/images/icons/copy.svg                  |  66 ------------------
 static/images/icons/expand.svg                |   1 -
 static/images/icons/link.svg                  |   1 -
 static/images/icons/order.svg                 |  66 ------------------
 18 files changed, 3 insertions(+), 183 deletions(-)
 rename static/{images => }/icons/android-chrome-192x192.png (100%)
 rename static/{images => }/icons/android-chrome-256x256.png (100%)
 rename static/{images => }/icons/apple-touch-icon.png (100%)
 rename static/{images => }/icons/favicon-16x16.png (100%)
 rename static/{images => }/icons/favicon-32x32.png (100%)
 rename static/{images => }/icons/mstile-150x150.png (100%)
 rename static/{images => }/icons/safari-pinned-tab.svg (100%)
 rename static/{images => }/icons/site.webmanifest (72%)
 delete mode 100644 static/images/icons/bar.svg
 delete mode 100644 static/images/icons/cancel.svg
 delete mode 100644 static/images/icons/caret-icon.svg
 delete mode 100644 static/images/icons/carly.svg
 delete mode 100644 static/images/icons/close.svg
 delete mode 100644 static/images/icons/copy.svg
 delete mode 100644 static/images/icons/expand.svg
 delete mode 100644 static/images/icons/link.svg
 delete mode 100644 static/images/icons/order.svg

diff --git a/config/_default/params.toml b/config/_default/params.toml
index 2189670..9dc3e49 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -7,7 +7,7 @@ since = 2018
 
 ## Logos & icons
 fallBackOgImage = "logos/thumbnail.png"
-iconsDir = "images/icons/"
+iconsDir = "/icons/"
 centerLogo = false
 logo = "logos/logo.png"
 footerLogo = "logos/logo_footer.png"
diff --git a/static/images/icons/android-chrome-192x192.png b/static/icons/android-chrome-192x192.png
similarity index 100%
rename from static/images/icons/android-chrome-192x192.png
rename to static/icons/android-chrome-192x192.png
diff --git a/static/images/icons/android-chrome-256x256.png b/static/icons/android-chrome-256x256.png
similarity index 100%
rename from static/images/icons/android-chrome-256x256.png
rename to static/icons/android-chrome-256x256.png
diff --git a/static/images/icons/apple-touch-icon.png b/static/icons/apple-touch-icon.png
similarity index 100%
rename from static/images/icons/apple-touch-icon.png
rename to static/icons/apple-touch-icon.png
diff --git a/static/images/icons/favicon-16x16.png b/static/icons/favicon-16x16.png
similarity index 100%
rename from static/images/icons/favicon-16x16.png
rename to static/icons/favicon-16x16.png
diff --git a/static/images/icons/favicon-32x32.png b/static/icons/favicon-32x32.png
similarity index 100%
rename from static/images/icons/favicon-32x32.png
rename to static/icons/favicon-32x32.png
diff --git a/static/images/icons/mstile-150x150.png b/static/icons/mstile-150x150.png
similarity index 100%
rename from static/images/icons/mstile-150x150.png
rename to static/icons/mstile-150x150.png
diff --git a/static/images/icons/safari-pinned-tab.svg b/static/icons/safari-pinned-tab.svg
similarity index 100%
rename from static/images/icons/safari-pinned-tab.svg
rename to static/icons/safari-pinned-tab.svg
diff --git a/static/images/icons/site.webmanifest b/static/icons/site.webmanifest
similarity index 72%
rename from static/images/icons/site.webmanifest
rename to static/icons/site.webmanifest
index 8c4a5a5..650a363 100644
--- a/static/images/icons/site.webmanifest
+++ b/static/icons/site.webmanifest
@@ -3,12 +3,12 @@
     "short_name": "",
     "icons": [
         {
-            "src": "/images/icons/android-chrome-192x192.png",
+            "src": "/icons/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/images/icons/android-chrome-256x256.png",
+            "src": "/icons/android-chrome-256x256.png",
             "sizes": "256x256",
             "type": "image/png"
         }
diff --git a/static/images/icons/bar.svg b/static/images/icons/bar.svg
deleted file mode 100644
index 0defb0a..0000000
--- a/static/images/icons/bar.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" height="67" viewBox="0 0 100 67" width="100" xmlns="http://www.w3.org/2000/svg"><g fill="#fff"><path d="m0 6.66667h1e2V0H0z"></path><path d="m0 35.2082h1e2v-6.6666H0z"></path><path d="m1e2 66.6665H0v-6.6667h1e2z"></path></g></svg>
diff --git a/static/images/icons/cancel.svg b/static/images/icons/cancel.svg
deleted file mode 100644
index f2e8469..0000000
--- a/static/images/icons/cancel.svg
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve" fill="#fff">
-<g>
-	<g>
-		<path d="M294.111,256.001L504.109,46.003c10.523-10.524,10.523-27.586,0-38.109c-10.524-10.524-27.587-10.524-38.11,0L256,217.892
-			L46.002,7.894c-10.524-10.524-27.586-10.524-38.109,0s-10.524,27.586,0,38.109l209.998,209.998L7.893,465.999
-			c-10.524,10.524-10.524,27.586,0,38.109c10.524,10.524,27.586,10.523,38.109,0L256,294.11l209.997,209.998
-			c10.524,10.524,27.587,10.523,38.11,0c10.523-10.524,10.523-27.586,0-38.109L294.111,256.001z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/static/images/icons/caret-icon.svg b/static/images/icons/caret-icon.svg
deleted file mode 100644
index 8f9bb98..0000000
--- a/static/images/icons/caret-icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" height="5" viewBox="0 0 10 5" width="10" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><mask id="a" height="5" maskUnits="userSpaceOnUse" width="10" x="0" y="0"><path d="m.833008.333496 4.166662 4.166664 4.16667-4.166664z" fill="#fff"/></mask><g fill="#80868b" mask="url(#a)"><path d="m-5-8h20v20h-20z"/><path d="m-5-8h20v20h-20z"/><path d="m-5-8h20v20h-20z"/></g></svg>
\ No newline at end of file
diff --git a/static/images/icons/carly.svg b/static/images/icons/carly.svg
deleted file mode 100644
index 9bab2ec..0000000
--- a/static/images/icons/carly.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer" enable-background="new 0 0 512 512" height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><path d="m504.971 239.029-56.971-56.97v-98.059c0-46.317-37.682-84-84-84h-44c-13.255 0-24 10.745-24 24s10.745 24 24 24h44c19.851 0 36 16.149 36 36v108c0 6.365 2.529 12.47 7.029 16.971l47.03 47.029-47.029 47.029c-4.501 4.501-7.03 10.606-7.03 16.971v108c0 19.851-16.149 36-36 36h-44c-13.255 0-24 10.745-24 24s10.745 24 24 24h44c46.318 0 84-37.683 84-84v-98.059l56.971-56.971c9.372-9.372 9.372-24.568 0-33.941z"/><path d="m112 192v-108c0-19.851 16.149-36 36-36h44c13.255 0 24-10.745 24-24s-10.745-24-24-24h-44c-46.318 0-84 37.683-84 84v98.059l-56.971 56.97c-9.373 9.373-9.373 24.568 0 33.941l56.971 56.971v98.059c0 46.317 37.682 84 84 84h44c13.255 0 24-10.745 24-24s-10.745-24-24-24h-44c-19.851 0-36-16.149-36-36v-108c0-6.365-2.529-12.47-7.029-16.971l-47.03-47.029 47.029-47.029c4.501-4.501 7.03-10.606 7.03-16.971z"/></svg>
\ No newline at end of file
diff --git a/static/images/icons/close.svg b/static/images/icons/close.svg
deleted file mode 100644
index 0b43290..0000000
--- a/static/images/icons/close.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg enable-background="new 0 0 15.642 15.642" viewBox="0 0 15.642 15.642" xmlns="http://www.w3.org/2000/svg"><path fill="#fff" d="m8.882 7.821 6.541-6.541c.293-.293.293-.768 0-1.061s-.768-.293-1.061 0l-6.541 6.541-6.541-6.54c-.293-.293-.768-.293-1.061 0s-.293.768 0 1.061l6.541 6.541-6.54 6.54c-.293.293-.293.768 0 1.061.147.146.338.22.53.22s.384-.073.53-.22l6.541-6.541 6.541 6.541c.147.146.338.22.53.22s.384-.073.53-.22c.293-.293.293-.768 0-1.061z"/></svg>
diff --git a/static/images/icons/copy.svg b/static/images/icons/copy.svg
deleted file mode 100644
index 518a650..0000000
--- a/static/images/icons/copy.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M366.905,108.016h-141.91c-11.048,0-20.003,8.955-20.003,20.003s8.955,20.003,20.003,20.003h141.91
-			c11.048,0,20.003-8.955,20.003-20.003S377.952,108.016,366.905,108.016z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M366.905,188.027h-141.91c-11.048,0-20.003,8.955-20.003,20.003s8.955,20.003,20.003,20.003h141.91
-			c11.047,0,20.003-8.955,20.003-20.003S377.953,188.027,366.905,188.027z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M286.004,268.039h-61.009c-11.048,0-20.003,8.955-20.003,20.003c0,11.048,8.955,20.003,20.003,20.003h61.009
-			c11.048,0,20.003-8.955,20.003-20.003C306.007,276.994,297.052,268.039,286.004,268.039z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M448.028,272.039c11.048,0,20.003-8.955,20.003-20.003V80.012C468.031,35.893,432.137,0,388.019,0H203.992
-			c-44.094,0-79.971,35.853-80.012,79.938c-44.118,0-80.012,35.893-80.012,80.012v272.039c0,44.118,35.893,80.012,80.012,80.012
-			h194.028c44.118,0,80.012-35.893,80.012-80.012v-0.608c39.414-4.938,70.01-38.662,70.01-79.389
-			c0-11.048-8.955-20.003-20.003-20.003c-11.048,0-20.003,8.955-20.003,20.003c0,22.054-17.942,40.001-39.996,40.006l-184.027,0.045
-			h-0.009c-10.685,0-20.73-4.16-28.285-11.715c-7.558-7.556-11.721-17.604-11.721-28.291V80.012
-			c0-22.059,17.947-40.006,40.006-40.006H388.02c22.059,0,40.006,17.947,40.006,40.006v172.025
-			C428.025,263.084,436.98,272.039,448.028,272.039z M203.992,432.047h0.02l154.002-0.038
-			c-0.012,22.049-17.954,39.984-40.006,39.984H123.981c-22.059,0-40.006-17.947-40.006-40.006V159.948
-			c0-22.059,17.947-40.006,40.006-40.006v232.094c0,21.375,8.325,41.471,23.441,56.583
-			C162.535,423.729,182.622,432.047,203.992,432.047z"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>
diff --git a/static/images/icons/expand.svg b/static/images/icons/expand.svg
deleted file mode 100644
index 14d8524..0000000
--- a/static/images/icons/expand.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="512pt" viewBox="0 0 512.016 512" width="512pt" xmlns="http://www.w3.org/2000/svg"><path d="m240 426.675781h-181.332031c-32.363281 0-58.667969-26.304687-58.667969-58.667969v-309.332031c0-32.363281 26.304688-58.6679685 58.667969-58.6679685h309.332031c32.363281 0 58.667969 26.3046875 58.667969 58.6679685v181.332031c0 8.832032-7.167969 16-16 16s-16-7.167968-16-16v-181.332031c0-14.699219-11.96875-26.667969-26.667969-26.667969h-309.332031c-14.699219 0-26.667969 11.96875-26.667969 26.667969v309.332031c0 14.699219 11.96875 26.667969 26.667969 26.667969h181.332031c8.832031 0 16 7.167969 16 16s-7.167969 16-16 16zm0 0"/><path d="m496 512.007812h-138.667969c-8.832031 0-16-7.167968-16-16 0-8.832031 7.167969-16 16-16h122.667969v-122.667968c0-8.832032 7.167969-16 16-16s16 7.167968 16 16v138.667968c0 8.832032-7.167969 16-16 16zm0 0"/><path d="m496 512.007812c-4.097656 0-8.191406-1.558593-11.308594-4.691406l-181.332031-181.335937c-6.25-6.25-6.25-16.382813 0-22.632813s16.382813-6.25 22.636719 0l181.332031 181.332032c6.25 6.25 6.25 16.382812 0 22.636718-3.136719 3.132813-7.230469 4.691406-11.328125 4.691406zm0 0"/></svg>
\ No newline at end of file
diff --git a/static/images/icons/link.svg b/static/images/icons/link.svg
deleted file mode 100644
index 6a60d1d..0000000
--- a/static/images/icons/link.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg enable-background="new 0 0 64 64" height="512" viewBox="0 0 64 64" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m19 40c1.104 0 2-.896 2-2s-.896-2-2-2c-3.86 0-7-3.14-7-7 0-1.873.728-3.628 2.059-4.95 1.313-1.322 3.068-2.05 4.941-2.05h10c3.86 0 7 3.14 7 7 0 .258-.015.509-.048.78-.174 1.574-.885 3.052-2.017 4.176-.532.54-1.137.974-1.797 1.289-.997.476-1.419 1.669-.944 2.666.476.996 1.669 1.419 2.667.943 1.08-.516 2.063-1.219 2.908-2.075 1.763-1.75 2.885-4.08 3.156-6.539.051-.413.075-.819.075-1.24 0-6.065-4.935-11-11-11h-10c-2.947 0-5.709 1.147-7.77 3.221-2.083 2.07-3.23 4.832-3.23 7.779 0 6.065 4.935 11 11 11z"/><path d="m45 28c-1.104 0-2 .896-2 2s.896 2 2 2c3.86 0 7 3.141 7 7 0 1.873-.728 3.628-2.059 4.95-1.313 1.322-3.068 2.05-4.941 2.05h-10c-3.86 0-7-3.141-7-7 0-.258.015-.509.048-.78.174-1.574.885-3.052 2.017-4.176.532-.54 1.136-.974 1.796-1.289.997-.476 1.419-1.67.944-2.667s-1.669-1.418-2.667-.944c-1.081.516-2.064 1.22-2.908 2.076-1.763 1.75-2.885 4.08-3.156 6.538-.05.415-.074.821-.074 1.242 0 6.065 4.935 11 11 11h10c2.946 0 5.709-1.147 7.77-3.221 2.083-2.07 3.23-4.833 3.23-7.779 0-6.065-4.935-11-11-11z"/></g></svg>
diff --git a/static/images/icons/order.svg b/static/images/icons/order.svg
deleted file mode 100644
index df12b77..0000000
--- a/static/images/icons/order.svg
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
-<g>
-	<g>
-		<path d="M492,236H144.262c-11.046,0-20,8.954-20,20s8.954,20,20,20H492c11.046,0,20-8.954,20-20C512,244.954,503.046,236,492,236z
-			"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M492,86H144.262c-11.046,0-20,8.954-20,20s8.954,20,20,20H492c11.046,0,20-8.954,20-20S503.046,86,492,86z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<path d="M492,386H144.262c-11.046,0-20,8.954-20,20c0,11.046,8.954,20,20,20H492c11.046,0,20-8.954,20-20
-			C512,394.954,503.046,386,492,386z"/>
-	</g>
-</g>
-<g>
-	<g>
-		<circle cx="27" cy="106" r="27"/>
-	</g>
-</g>
-<g>
-	<g>
-		<circle cx="27" cy="256" r="27"/>
-	</g>
-</g>
-<g>
-	<g>
-		<circle cx="27" cy="406" r="27"/>
-	</g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-<g>
-</g>
-</svg>