Move images (#1372)

* Move mixed/img/ to images/

* Move bg/img/ to images/

README.md

@@ -84,14 +84,14 @@ primary language is not English, you may consider also importing the English ver
 
 ## Basic Usage ##
 
-1.  Click the <img src="ext/mixed/img/yomichan-icon.svg" alt="" width="16" height="16"> _Yomichan_ button in the browser bar to open the quick-actions popup.
+1.  Click the <img src="ext/images/yomichan-icon.svg" alt="" width="16" height="16"> _Yomichan_ button in the browser bar to open the quick-actions popup.
 
     <a href="resources/images/browser-action-popup1.png"><img src="resources/images/browser-action-popup1.png" width="103" height="100"></a>
 
-    *   The <img src="ext/mixed/img/cog.svg" alt="" width="16" height="16"> _cog_ button will open the Settings page.
-    *   The <img src="ext/mixed/img/magnifying-glass.svg" alt="" width="16" height="16"> _magnifying glass_ button will open the Search page.
-    *   The <img src="ext/mixed/img/question-mark-circle.svg" alt="" width="16" height="16"> _question mark_ button will open the Information page.
-    *   The <img src="ext/mixed/img/profile.svg" alt="" width="16" height="16"> _profile_ button will appear when multiple profiles exist, allowing the current profile to be quickly changed.
+    *   The <img src="ext/images/cog.svg" alt="" width="16" height="16"> _cog_ button will open the Settings page.
+    *   The <img src="ext/images/magnifying-glass.svg" alt="" width="16" height="16"> _magnifying glass_ button will open the Search page.
+    *   The <img src="ext/images/question-mark-circle.svg" alt="" width="16" height="16"> _question mark_ button will open the Information page.
+    *   The <img src="ext/images/profile.svg" alt="" width="16" height="16"> _profile_ button will appear when multiple profiles exist, allowing the current profile to be quickly changed.
 
 2.  Import the dictionaries you wish to use for term and kanji searches. If you do not have any dictionaries installed
     or enabled, Yomichan will warn you that it is not ready for use by displaying an orange exclamation mark over its
@@ -105,7 +105,7 @@ primary language is not English, you may consider also importing the English ver
 
     <a href="resources/images/search-popup-terms.png"><img src="resources/images/search-popup-terms-thumb.png" width="128" height="95"></a>
 
-4.  Click on the <img src="ext/mixed/img/play-audio.svg" alt="" width="16" height="16"> _speaker_ button to hear the term pronounced by a native speaker. If an audio sample is
+4.  Click on the <img src="ext/images/play-audio.svg" alt="" width="16" height="16"> _speaker_ button to hear the term pronounced by a native speaker. If an audio sample is
     not available, you will hear a short click instead. You can configure the sources used to retrieve audio samples in
     the options page.
 

dev/data/manifest-variants.json

@@ -6,23 +6,23 @@
         "description": "Japanese dictionary with Anki integration",
         "author": "Alex Yatskov",
         "icons": {
-            "16": "mixed/img/icon16.png",
-            "19": "mixed/img/icon19.png",
-            "32": "mixed/img/icon32.png",
-            "38": "mixed/img/icon38.png",
-            "48": "mixed/img/icon48.png",
-            "64": "mixed/img/icon64.png",
-            "128": "mixed/img/icon128.png"
+            "16": "images/icon16.png",
+            "19": "images/icon19.png",
+            "32": "images/icon32.png",
+            "38": "images/icon38.png",
+            "48": "images/icon48.png",
+            "64": "images/icon64.png",
+            "128": "images/icon128.png"
         },
         "browser_action": {
             "default_icon": {
-                "16": "mixed/img/icon16.png",
-                "19": "mixed/img/icon19.png",
-                "32": "mixed/img/icon32.png",
-                "38": "mixed/img/icon38.png",
-                "48": "mixed/img/icon48.png",
-                "64": "mixed/img/icon64.png",
-                "128": "mixed/img/icon128.png"
+                "16": "images/icon16.png",
+                "19": "images/icon19.png",
+                "32": "images/icon32.png",
+                "38": "images/icon38.png",
+                "48": "images/icon48.png",
+                "64": "images/icon64.png",
+                "128": "images/icon128.png"
             },
             "default_title": "Yomichan",
             "default_popup": "bg/context.html"

ext/bg/background.html

@@ -4,13 +4,13 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width,initial-scale=1">
         <title>Background</title>
-        <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-        <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-        <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-        <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-        <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-        <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+        <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+        <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+        <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+        <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+        <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+        <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     </head>
     <body>
         <textarea id="clipboard-paste-target"></textarea>

ext/bg/context.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Action Popup</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/bg/css/context.css">
 </head>
 <body>

ext/bg/css/context.css

@@ -73,12 +73,12 @@ label {
     mask-size: var(--icon-size);
     mask-image: var(--icon-image);
 }
-.icon[data-icon=profile]                 { --icon-image: url(/mixed/img/profile.svg); }
-.icon[data-icon=cog]                     { --icon-image: url(/mixed/img/cog.svg); }
-.icon[data-icon=key]                     { --icon-image: url(/mixed/img/key.svg); }
-.icon[data-icon=magnifying-glass]        { --icon-image: url(/mixed/img/magnifying-glass.svg); }
-.icon[data-icon=exclamation-point-short] { --icon-image: url(/mixed/img/exclamation-point-short.svg); }
-.icon[data-icon=question-mark-circle]    { --icon-image: url(/mixed/img/question-mark-circle.svg); }
+.icon[data-icon=profile]                 { --icon-image: url(/images/profile.svg); }
+.icon[data-icon=cog]                     { --icon-image: url(/images/cog.svg); }
+.icon[data-icon=key]                     { --icon-image: url(/images/key.svg); }
+.icon[data-icon=magnifying-glass]        { --icon-image: url(/images/magnifying-glass.svg); }
+.icon[data-icon=exclamation-point-short] { --icon-image: url(/images/exclamation-point-short.svg); }
+.icon[data-icon=question-mark-circle]    { --icon-image: url(/images/question-mark-circle.svg); }
 
 
 /* Page-specific styles */
@@ -130,7 +130,7 @@ label {
     display: block;
     width: 100%;
     height: 100%;
-    background-image: url(/mixed/img/right-chevron.svg);
+    background-image: url(/images/right-chevron.svg);
     background-repeat: no-repeat;
     background-position: center center;
     background-size: contain;
@@ -371,7 +371,7 @@ select.profile-select {
     bottom: 0;
     background-color: #edc75e;
 
-    --icon-image: url(/mixed/img/material-down-arrow.svg);
+    --icon-image: url(/images/material-down-arrow.svg);
     --icon-size: contain;
 
     -webkit-mask-repeat: no-repeat;

ext/bg/css/settings.css

@@ -58,7 +58,7 @@ html:root:not([data-options-general-result-output-mode=merge]) #dictionary-main-
     width: 20px;
     height: 20px;
     display: block;
-    background: url(/mixed/img/mouse.svg) no-repeat center center;
+    background: url(/images/mouse.svg) no-repeat center center;
     background-size: 20px 20px;
 }
 

ext/bg/css/settings2.css

@@ -382,7 +382,7 @@ a.heading-link-light {
     background-size: 12px 12px;
     width: 12px;
     height: 12px;
-    background-image: url(/mixed/img/up-arrow.svg);
+    background-image: url(/images/up-arrow.svg);
     margin-right: calc(var(--padding) * 0.5);
 }
 .sidebar-body {

ext/bg/info.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Info</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>

ext/bg/legal.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Legal</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>

ext/bg/permissions.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Permissions</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>

ext/bg/pitch-accents-preview.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Pitch Accents Preview</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/pitch-accents-preview.css">
 </head>

ext/bg/popup-preview.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Popup Preview</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/bg/css/popup-preview.css">
     <link rel="stylesheet" type="text/css" href="/mixed/css/popup-outer.css" id="popup-outer-css">
 </head>

ext/bg/search.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Search</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
     <link rel="stylesheet" type="text/css" href="/mixed/css/search.css">

ext/bg/settings.html

@@ -4,13 +4,13 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width,initial-scale=1">
         <title>Yomichan Options (Old)</title>
-        <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-        <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-        <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-        <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-        <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-        <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-        <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+        <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+        <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+        <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+        <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+        <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+        <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
         <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap.min.css">
         <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap/css/bootstrap-theme.min.css">
         <link rel="stylesheet" type="text/css" href="/bg/css/settings.css">
@@ -702,7 +702,7 @@
 
             <div class="ignore-form-changes">
                 <div>
-                    <img src="/mixed/img/spinner.gif" class="pull-right" id="dictionary-spinner" alt="" hidden>
+                    <img src="/images/spinner.gif" class="pull-right" id="dictionary-spinner" alt="" hidden>
                     <h3>Dictionaries</h3>
                 </div>
 
@@ -908,7 +908,7 @@
 
             <div>
                 <div>
-                    <img src="/mixed/img/spinner.gif" class="pull-right" id="anki-spinner" alt="" hidden>
+                    <img src="/images/spinner.gif" class="pull-right" id="anki-spinner" alt="" hidden>
                     <h3>Anki Options</h3>
                 </div>
 
@@ -1264,7 +1264,7 @@
                     countless hours that I have devoted to this extension.
                 </p>
                 <p>
-                    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=4DBTN9A3CUAFN" target="_blank" rel="noopener"><img src="/bg/img/paypal.gif" alt=""></a>
+                    <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&amp;hosted_button_id=4DBTN9A3CUAFN" target="_blank" rel="noopener"><img src="/images/paypal.gif" alt=""></a>
                 </p>
             </div>
 

ext/bg/settings2.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Settings</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>

ext/bg/template-renderer.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Handlebars Sandbox</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
 </head>
 <body>
     <script src="/mixed/lib/handlebars.min.js"></script>

ext/bg/welcome.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Welcome to Yomichan!</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/bg/css/settings2.css">
 </head>
@@ -28,19 +28,19 @@
     <div class="settings-group">
         <div class="settings-item">
             <div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">
-                Clicking the <img src="/mixed/img/yomichan-icon.svg" class="inline-icon" alt=""> <em>Yomichan</em> button in the browser bar will open the quick-actions popup.
+                Clicking the <img src="/images/yomichan-icon.svg" class="inline-icon" alt=""> <em>Yomichan</em> button in the browser bar will open the quick-actions popup.
             </div></div></div>
             <div class="settings-item-children settings-item-children-group">
                 <div class="settings-item"><div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">
-                    The <img src="/mixed/img/cog.svg" class="inline-icon" alt=""> <em>cog</em> button will open the <a href="settings2.html" target="_blank" rel="noopener">Settings</a> page.
+                    The <img src="/images/cog.svg" class="inline-icon" alt=""> <em>cog</em> button will open the <a href="settings2.html" target="_blank" rel="noopener">Settings</a> page.
                 </div></div></div></div>
                 <div class="settings-item"><div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">
-                    The <img src="/mixed/img/magnifying-glass.svg" class="inline-icon" alt=""> <em>magnifying glass</em> button will open the <a href="/bg/search.html" target="_blank" rel="noopener">Search</a> page,
+                    The <img src="/images/magnifying-glass.svg" class="inline-icon" alt=""> <em>magnifying glass</em> button will open the <a href="/bg/search.html" target="_blank" rel="noopener">Search</a> page,
                     enabling text and terms to be looked up using the installed dictionaries.
                     This can even be used in offline mode!
                 </div></div></div></div>
                 <div class="settings-item"><div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">
-                    The <img src="/mixed/img/question-mark-circle.svg" class="inline-icon" alt=""> <em>question mark</em> button will open the <a href="/bg/info.html" target="_blank" rel="noopener">Information</a> page,
+                    The <img src="/images/question-mark-circle.svg" class="inline-icon" alt=""> <em>question mark</em> button will open the <a href="/bg/info.html" target="_blank" rel="noopener">Information</a> page,
                     which has some helpful information and links about Yomichan.
                 </div></div></div></div>
             </div>
@@ -71,7 +71,7 @@
             </div></div></div>
             <div class="settings-item-children settings-item-children-group">
                 <div class="settings-item"><div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">
-                    Clicking the <img src="/mixed/img/play-audio.svg" class="inline-icon" alt=""> <em>speaker</em> button of an entry in the search results
+                    Clicking the <img src="/images/play-audio.svg" class="inline-icon" alt=""> <em>speaker</em> button of an entry in the search results
                     will play an audio clip of a term's pronunciation using an online dictionary, if available.
                 </div></div></div></div>
                 <div class="settings-item"><div class="settings-item-inner"><div class="settings-item-left"><div class="settings-item-label">

ext/fg/float.html

@@ -4,13 +4,13 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Yomichan Search</title>
-    <link rel="icon" type="image/png" href="/mixed/img/icon16.png" sizes="16x16">
-    <link rel="icon" type="image/png" href="/mixed/img/icon19.png" sizes="19x19">
-    <link rel="icon" type="image/png" href="/mixed/img/icon32.png" sizes="32x32">
-    <link rel="icon" type="image/png" href="/mixed/img/icon38.png" sizes="38x38">
-    <link rel="icon" type="image/png" href="/mixed/img/icon48.png" sizes="48x48">
-    <link rel="icon" type="image/png" href="/mixed/img/icon64.png" sizes="64x64">
-    <link rel="icon" type="image/png" href="/mixed/img/icon128.png" sizes="128x128">
+    <link rel="icon" type="image/png" href="/images/icon16.png" sizes="16x16">
+    <link rel="icon" type="image/png" href="/images/icon19.png" sizes="19x19">
+    <link rel="icon" type="image/png" href="/images/icon32.png" sizes="32x32">
+    <link rel="icon" type="image/png" href="/images/icon38.png" sizes="38x38">
+    <link rel="icon" type="image/png" href="/images/icon48.png" sizes="48x48">
+    <link rel="icon" type="image/png" href="/images/icon64.png" sizes="64x64">
+    <link rel="icon" type="image/png" href="/images/icon128.png" sizes="128x128">
     <link rel="stylesheet" type="text/css" href="/mixed/css/material.css">
     <link rel="stylesheet" type="text/css" href="/mixed/css/display.css">
 </head>

ext/manifest.json

@@ -5,23 +5,23 @@
     "description": "Japanese dictionary with Anki integration",
     "author": "Alex Yatskov",
     "icons": {
-        "16": "mixed/img/icon16.png",
-        "19": "mixed/img/icon19.png",
-        "32": "mixed/img/icon32.png",
-        "38": "mixed/img/icon38.png",
-        "48": "mixed/img/icon48.png",
-        "64": "mixed/img/icon64.png",
-        "128": "mixed/img/icon128.png"
+        "16": "images/icon16.png",
+        "19": "images/icon19.png",
+        "32": "images/icon32.png",
+        "38": "images/icon38.png",
+        "48": "images/icon48.png",
+        "64": "images/icon64.png",
+        "128": "images/icon128.png"
     },
     "browser_action": {
         "default_icon": {
-            "16": "mixed/img/icon16.png",
-            "19": "mixed/img/icon19.png",
-            "32": "mixed/img/icon32.png",
-            "38": "mixed/img/icon38.png",
-            "48": "mixed/img/icon48.png",
-            "64": "mixed/img/icon64.png",
-            "128": "mixed/img/icon128.png"
+            "16": "images/icon16.png",
+            "19": "images/icon19.png",
+            "32": "images/icon32.png",
+            "38": "images/icon38.png",
+            "48": "images/icon48.png",
+            "64": "images/icon64.png",
+            "128": "images/icon128.png"
         },
         "default_title": "Yomichan",
         "default_popup": "bg/context.html"

ext/mixed/css/display.css

@@ -625,19 +625,19 @@ button.action-button::before {
     background-size: contain;
 }
 button.action-button[data-icon=view-note]::before {
-    background-image: url('/mixed/img/view-note.svg');
+    background-image: url('/images/view-note.svg');
 }
 button.action-button[data-icon=add-term-kanji]::before {
-    background-image: url('/mixed/img/add-term-kanji.svg');
+    background-image: url('/images/add-term-kanji.svg');
 }
 button.action-button[data-icon=add-term-kana]::before {
-    background-image: url('/mixed/img/add-term-kana.svg');
+    background-image: url('/images/add-term-kana.svg');
 }
 button.action-button[data-icon=play-audio]::before {
-    background-image: url('/mixed/img/play-audio.svg');
+    background-image: url('/images/play-audio.svg');
 }
 button.action-button[data-icon=source-term]::before {
-    background-image: url('/mixed/img/source-term.svg');
+    background-image: url('/images/source-term.svg');
 }
 .entry[data-type=term][data-expression-multi=true] .actions>button.action-button.action-play-audio {
     display: none;
@@ -903,12 +903,12 @@ button.action-button[data-icon=source-term]::before {
     mask-position: center center;
     mask-mode: alpha;
     mask-size: contain;
-    mask-image: url(/mixed/img/material-right-arrow.svg);
+    mask-image: url(/images/material-right-arrow.svg);
     -webkit-mask-repeat: no-repeat;
     -webkit-mask-position: center center;
     -webkit-mask-mode: alpha;
     -webkit-mask-size: contain;
-    -webkit-mask-image: url(/mixed/img/material-right-arrow.svg);
+    -webkit-mask-image: url(/images/material-right-arrow.svg);
 }
 .term-expression:not(:first-of-type) .term-expression-current-indicator,
 :root:not([data-popup-current-indicator-mode=triangle]) .term-expression-current-indicator {
@@ -935,7 +935,7 @@ button.action-button[data-icon=source-term]::before {
     background-color: transparent;
     background-repeat: no-repeat;
     background-size: contain;
-    background-image: url('/mixed/img/entry-current.svg');
+    background-image: url('/images/entry-current.svg');
 }
 
 

ext/mixed/css/material.css

@@ -183,46 +183,46 @@
     mask-image: var(--icon-image);
 }
 .icon[data-icon=none]                    { --icon-image: linear-gradient(transparent, transparent); }
-.icon[data-icon=profile]                 { --icon-image: url(/mixed/img/profile.svg); }
-.icon[data-icon=cog]                     { --icon-image: url(/mixed/img/cog.svg); }
-.icon[data-icon=palette]                 { --icon-image: url(/mixed/img/palette.svg); }
-.icon[data-icon=popup]                   { --icon-image: url(/mixed/img/popup.svg); }
-.icon[data-icon=speaker]                 { --icon-image: url(/mixed/img/speaker.svg); }
-.icon[data-icon=scanning]                { --icon-image: url(/mixed/img/scanning.svg); }
-.icon[data-icon=text-parsing]            { --icon-image: url(/mixed/img/text-parsing.svg); }
-.icon[data-icon=translation]             { --icon-image: url(/mixed/img/translation.svg); }
-.icon[data-icon=book]                    { --icon-image: url(/mixed/img/book.svg); }
-.icon[data-icon=note-card]               { --icon-image: url(/mixed/img/note-card.svg); }
-.icon[data-icon=keyboard]                { --icon-image: url(/mixed/img/keyboard.svg); }
-.icon[data-icon=backup]                  { --icon-image: url(/mixed/img/backup.svg); }
-.icon[data-icon=lock]                    { --icon-image: url(/mixed/img/lock.svg); }
-.icon[data-icon=question-mark]           { --icon-image: url(/mixed/img/question-mark.svg); }
-.icon[data-icon=popup-size]              { --icon-image: url(/mixed/img/popup-size.svg); }
-.icon[data-icon=hamburger-menu]          { --icon-image: url(/mixed/img/hamburger-menu.svg); }
-.icon[data-icon=kebab-menu]              { --icon-image: url(/mixed/img/kebab-menu.svg); }
-.icon[data-icon=mouse]                   { --icon-image: url(/mixed/img/mouse.svg); }
-.icon[data-icon=exclamation-point-short] { --icon-image: url(/mixed/img/exclamation-point-short.svg); }
-.icon[data-icon=magnifying-glass]        { --icon-image: url(/mixed/img/magnifying-glass.svg); }
-.icon[data-icon=collapse]                { --icon-image: url(/mixed/img/collapse.svg); }
-.icon[data-icon=expand]                  { --icon-image: url(/mixed/img/expand.svg); }
-.icon[data-icon=window]                  { --icon-image: url(/mixed/img/window.svg); }
-.icon[data-icon=cross]                   { --icon-image: url(/mixed/img/cross.svg); }
-.icon[data-icon=checkmark]               { --icon-image: url(/mixed/img/checkmark.svg); }
-.icon[data-icon=sentence-parsing]        { --icon-image: url(/mixed/img/sentence-parsing.svg); }
-.icon[data-icon=question-mark]           { --icon-image: url(/mixed/img/question-mark.svg); }
-.icon[data-icon=question-mark-circle]    { --icon-image: url(/mixed/img/question-mark-circle.svg); }
-.icon[data-icon=question-mark-thick]     { --icon-image: url(/mixed/img/question-mark-thick.svg); }
-.icon[data-icon=left-chevron]            { --icon-image: url(/mixed/img/left-chevron.svg); }
-.icon[data-icon=right-chevron]           { --icon-image: url(/mixed/img/right-chevron.svg); }
-.icon[data-icon=plus-thick]              { --icon-image: url(/mixed/img/plus-thick.svg); }
-.icon[data-icon=clipboard]               { --icon-image: url(/mixed/img/clipboard.svg); }
-.icon[data-icon=key]                     { --icon-image: url(/mixed/img/key.svg); }
+.icon[data-icon=profile]                 { --icon-image: url(/images/profile.svg); }
+.icon[data-icon=cog]                     { --icon-image: url(/images/cog.svg); }
+.icon[data-icon=palette]                 { --icon-image: url(/images/palette.svg); }
+.icon[data-icon=popup]                   { --icon-image: url(/images/popup.svg); }
+.icon[data-icon=speaker]                 { --icon-image: url(/images/speaker.svg); }
+.icon[data-icon=scanning]                { --icon-image: url(/images/scanning.svg); }
+.icon[data-icon=text-parsing]            { --icon-image: url(/images/text-parsing.svg); }
+.icon[data-icon=translation]             { --icon-image: url(/images/translation.svg); }
+.icon[data-icon=book]                    { --icon-image: url(/images/book.svg); }
+.icon[data-icon=note-card]               { --icon-image: url(/images/note-card.svg); }
+.icon[data-icon=keyboard]                { --icon-image: url(/images/keyboard.svg); }
+.icon[data-icon=backup]                  { --icon-image: url(/images/backup.svg); }
+.icon[data-icon=lock]                    { --icon-image: url(/images/lock.svg); }
+.icon[data-icon=question-mark]           { --icon-image: url(/images/question-mark.svg); }
+.icon[data-icon=popup-size]              { --icon-image: url(/images/popup-size.svg); }
+.icon[data-icon=hamburger-menu]          { --icon-image: url(/images/hamburger-menu.svg); }
+.icon[data-icon=kebab-menu]              { --icon-image: url(/images/kebab-menu.svg); }
+.icon[data-icon=mouse]                   { --icon-image: url(/images/mouse.svg); }
+.icon[data-icon=exclamation-point-short] { --icon-image: url(/images/exclamation-point-short.svg); }
+.icon[data-icon=magnifying-glass]        { --icon-image: url(/images/magnifying-glass.svg); }
+.icon[data-icon=collapse]                { --icon-image: url(/images/collapse.svg); }
+.icon[data-icon=expand]                  { --icon-image: url(/images/expand.svg); }
+.icon[data-icon=window]                  { --icon-image: url(/images/window.svg); }
+.icon[data-icon=cross]                   { --icon-image: url(/images/cross.svg); }
+.icon[data-icon=checkmark]               { --icon-image: url(/images/checkmark.svg); }
+.icon[data-icon=sentence-parsing]        { --icon-image: url(/images/sentence-parsing.svg); }
+.icon[data-icon=question-mark]           { --icon-image: url(/images/question-mark.svg); }
+.icon[data-icon=question-mark-circle]    { --icon-image: url(/images/question-mark-circle.svg); }
+.icon[data-icon=question-mark-thick]     { --icon-image: url(/images/question-mark-thick.svg); }
+.icon[data-icon=left-chevron]            { --icon-image: url(/images/left-chevron.svg); }
+.icon[data-icon=right-chevron]           { --icon-image: url(/images/right-chevron.svg); }
+.icon[data-icon=plus-thick]              { --icon-image: url(/images/plus-thick.svg); }
+.icon[data-icon=clipboard]               { --icon-image: url(/images/clipboard.svg); }
+.icon[data-icon=key]                     { --icon-image: url(/images/key.svg); }
 .icon[data-icon=material-down-arrow] {
-    --icon-image: url(/mixed/img/material-down-arrow.svg);
+    --icon-image: url(/images/material-down-arrow.svg);
     --icon-size: var(--material-arrow-dimension2) var(--material-arrow-dimension1);
 }
 .icon[data-icon=material-right-arrow] {
-    --icon-image: url(/mixed/img/material-right-arrow.svg);
+    --icon-image: url(/images/material-right-arrow.svg);
     --icon-size: var(--material-arrow-dimension1) var(--material-arrow-dimension2);
 }
 
@@ -277,20 +277,20 @@ label.checkbox {
     transition: opacity var(--animation-duration) linear, background-color var(--animation-duration) linear;
 }
 .checkbox-fill {
-    mask-image: url(/mixed/img/checkbox-fill.svg);
-    -webkit-mask-image: url(/mixed/img/checkbox-fill.svg);
+    mask-image: url(/images/checkbox-fill.svg);
+    -webkit-mask-image: url(/images/checkbox-fill.svg);
     background-color: var(--checkbox-unchecked-color);
     opacity: 0;
 }
 .checkbox-border {
-    mask-image: url(/mixed/img/checkbox-border.svg);
-    -webkit-mask-image: url(/mixed/img/checkbox-border.svg);
+    mask-image: url(/images/checkbox-border.svg);
+    -webkit-mask-image: url(/images/checkbox-border.svg);
     background-color: var(--checkbox-unchecked-color);
     opacity: 1;
 }
 .checkbox-check {
-    mask-image: url(/mixed/img/checkbox-check.svg);
-    -webkit-mask-image: url(/mixed/img/checkbox-check.svg);
+    mask-image: url(/images/checkbox-check.svg);
+    -webkit-mask-image: url(/images/checkbox-check.svg);
     background-color: var(--checkbox-check-color);
     opacity: 0;
 }
@@ -482,12 +482,12 @@ label.radio {
     -webkit-mask-size: var(--radio-size) var(--radio-size);
 }
 .radio-border {
-    mask-image: url(/mixed/img/radio-button.svg);
-    -webkit-mask-image: url(/mixed/img/radio-button.svg);
+    mask-image: url(/images/radio-button.svg);
+    -webkit-mask-image: url(/images/radio-button.svg);
 }
 .radio-dot {
-    mask-image: url(/mixed/img/radio-button-dot.svg);
-    -webkit-mask-image: url(/mixed/img/radio-button-dot.svg);
+    mask-image: url(/images/radio-button-dot.svg);
+    -webkit-mask-image: url(/images/radio-button-dot.svg);
     opacity: 1;
     transform: none;
     transition:
@@ -571,7 +571,7 @@ select {
     appearance: none;
     -moz-appearance: none;
     -webkit-appearance: none;
-    background-image: url(/mixed/img/material-down-arrow.svg);
+    background-image: url(/images/material-down-arrow.svg);
     background-repeat: no-repeat;
     background-position: right calc(10em / var(--font-size-no-units)) center;
     background-color: var(--input-background-color);

resources/icons.svg

@@ -8,7 +8,7 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-filename="../ext/mixed/img/icon32.png"
+   inkscape:export-filename="../ext/images/icon32.png"
    inkscape:export-ydpi="192"
    inkscape:export-xdpi="192"
    sodipodi:docname="icons.svg"