From 98975d59231eeedeaa2b17998b56a3c21e5d647e Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Fri, 12 Feb 2021 20:27:43 -0500 Subject: [PATCH] Move images (#1372) * Move mixed/img/ to images/ * Move bg/img/ to images/ --- README.md | 12 +-- dev/data/manifest-variants.json | 28 +++--- ext/bg/background.html | 14 +-- ext/bg/context.html | 14 +-- ext/bg/css/context.css | 16 +-- ext/bg/css/settings.css | 2 +- ext/bg/css/settings2.css | 2 +- ext/bg/info.html | 14 +-- ext/bg/legal.html | 14 +-- ext/bg/permissions.html | 14 +-- ext/bg/pitch-accents-preview.html | 14 +-- ext/bg/popup-preview.html | 14 +-- ext/bg/search.html | 14 +-- ext/bg/settings.html | 20 ++-- ext/bg/settings2.html | 14 +-- ext/bg/template-renderer.html | 14 +-- ext/bg/welcome.html | 24 ++--- ext/fg/float.html | 14 +-- ext/{mixed/img => images}/add-term-kana.svg | 0 ext/{mixed/img => images}/add-term-kanji.svg | 0 ext/{mixed/img => images}/backup.svg | 0 ext/{mixed/img => images}/book.svg | 0 ext/{mixed/img => images}/checkbox-border.svg | 0 ext/{mixed/img => images}/checkbox-check.svg | 0 ext/{mixed/img => images}/checkbox-fill.svg | 0 ext/{mixed/img => images}/checkmark.svg | 0 ext/{mixed/img => images}/clipboard.svg | 0 ext/{mixed/img => images}/cog.svg | 0 ext/{mixed/img => images}/collapse.svg | 0 ext/{mixed/img => images}/cross.svg | 0 ext/{mixed/img => images}/entry-current.svg | 0 .../exclamation-point-short.svg | 0 ext/{mixed/img => images}/expand.svg | 0 ext/{mixed/img => images}/hamburger-menu.svg | 0 ext/{mixed/img => images}/hiragana-a.svg | 0 ext/{mixed/img => images}/icon128.png | Bin ext/{mixed/img => images}/icon16.png | Bin ext/{mixed/img => images}/icon19.png | Bin ext/{mixed/img => images}/icon32.png | Bin ext/{mixed/img => images}/icon38.png | Bin ext/{mixed/img => images}/icon48.png | Bin ext/{mixed/img => images}/icon64.png | Bin ext/{mixed/img => images}/kebab-menu.svg | 0 ext/{mixed/img => images}/key.svg | 0 ext/{mixed/img => images}/keyboard.svg | 0 ext/{mixed/img => images}/left-chevron.svg | 0 ext/{mixed/img => images}/lock.svg | 0 .../img => images}/magnifying-glass.svg | 0 .../img => images}/material-down-arrow.svg | 0 .../img => images}/material-right-arrow.svg | 0 ext/{mixed/img => images}/mouse.svg | 0 ext/{mixed/img => images}/note-card.svg | 0 ext/{mixed/img => images}/palette.svg | 0 ext/{bg/img => images}/paypal.gif | Bin ext/{mixed/img => images}/play-audio.svg | 0 .../img => images}/plus-circle-large.svg | 0 .../img => images}/plus-circle-small.svg | 0 ext/{mixed/img => images}/plus-thick.svg | 0 ext/{mixed/img => images}/popup-size.svg | 0 ext/{mixed/img => images}/popup.svg | 0 ext/{mixed/img => images}/profile.svg | 0 .../img => images}/question-mark-circle.svg | 0 .../img => images}/question-mark-thick.svg | 0 ext/{mixed/img => images}/question-mark.svg | 0 .../img => images}/radio-button-dot.svg | 0 ext/{mixed/img => images}/radio-button.svg | 0 ext/{mixed/img => images}/right-chevron.svg | 0 ext/{mixed/img => images}/scanning.svg | 0 .../img => images}/sentence-parsing.svg | 0 ext/{mixed/img => images}/source-term.svg | 0 ext/{mixed/img => images}/speaker.svg | 0 ext/{mixed/img => images}/spinner.gif | Bin ext/{mixed/img => images}/spinner.svg | 0 ext/{mixed/img => images}/text-parsing.svg | 0 ext/{mixed/img => images}/translation.svg | 0 ext/{mixed/img => images}/up-arrow.svg | 0 ext/{mixed/img => images}/view-note.svg | 0 ext/{mixed/img => images}/window.svg | 0 ext/{mixed/img => images}/yomichan-icon.svg | 0 ext/manifest.json | 28 +++--- ext/mixed/css/display.css | 16 +-- ext/mixed/css/material.css | 94 +++++++++--------- resources/icons.svg | 2 +- 83 files changed, 199 insertions(+), 199 deletions(-) rename ext/{mixed/img => images}/add-term-kana.svg (100%) rename ext/{mixed/img => images}/add-term-kanji.svg (100%) rename ext/{mixed/img => images}/backup.svg (100%) rename ext/{mixed/img => images}/book.svg (100%) rename ext/{mixed/img => images}/checkbox-border.svg (100%) rename ext/{mixed/img => images}/checkbox-check.svg (100%) rename ext/{mixed/img => images}/checkbox-fill.svg (100%) rename ext/{mixed/img => images}/checkmark.svg (100%) rename ext/{mixed/img => images}/clipboard.svg (100%) rename ext/{mixed/img => images}/cog.svg (100%) rename ext/{mixed/img => images}/collapse.svg (100%) rename ext/{mixed/img => images}/cross.svg (100%) rename ext/{mixed/img => images}/entry-current.svg (100%) rename ext/{mixed/img => images}/exclamation-point-short.svg (100%) rename ext/{mixed/img => images}/expand.svg (100%) rename ext/{mixed/img => images}/hamburger-menu.svg (100%) rename ext/{mixed/img => images}/hiragana-a.svg (100%) rename ext/{mixed/img => images}/icon128.png (100%) rename ext/{mixed/img => images}/icon16.png (100%) rename ext/{mixed/img => images}/icon19.png (100%) rename ext/{mixed/img => images}/icon32.png (100%) rename ext/{mixed/img => images}/icon38.png (100%) rename ext/{mixed/img => images}/icon48.png (100%) rename ext/{mixed/img => images}/icon64.png (100%) rename ext/{mixed/img => images}/kebab-menu.svg (100%) rename ext/{mixed/img => images}/key.svg (100%) rename ext/{mixed/img => images}/keyboard.svg (100%) rename ext/{mixed/img => images}/left-chevron.svg (100%) rename ext/{mixed/img => images}/lock.svg (100%) rename ext/{mixed/img => images}/magnifying-glass.svg (100%) rename ext/{mixed/img => images}/material-down-arrow.svg (100%) rename ext/{mixed/img => images}/material-right-arrow.svg (100%) rename ext/{mixed/img => images}/mouse.svg (100%) rename ext/{mixed/img => images}/note-card.svg (100%) rename ext/{mixed/img => images}/palette.svg (100%) rename ext/{bg/img => images}/paypal.gif (100%) rename ext/{mixed/img => images}/play-audio.svg (100%) rename ext/{mixed/img => images}/plus-circle-large.svg (100%) rename ext/{mixed/img => images}/plus-circle-small.svg (100%) rename ext/{mixed/img => images}/plus-thick.svg (100%) rename ext/{mixed/img => images}/popup-size.svg (100%) rename ext/{mixed/img => images}/popup.svg (100%) rename ext/{mixed/img => images}/profile.svg (100%) rename ext/{mixed/img => images}/question-mark-circle.svg (100%) rename ext/{mixed/img => images}/question-mark-thick.svg (100%) rename ext/{mixed/img => images}/question-mark.svg (100%) rename ext/{mixed/img => images}/radio-button-dot.svg (100%) rename ext/{mixed/img => images}/radio-button.svg (100%) rename ext/{mixed/img => images}/right-chevron.svg (100%) rename ext/{mixed/img => images}/scanning.svg (100%) rename ext/{mixed/img => images}/sentence-parsing.svg (100%) rename ext/{mixed/img => images}/source-term.svg (100%) rename ext/{mixed/img => images}/speaker.svg (100%) rename ext/{mixed/img => images}/spinner.gif (100%) rename ext/{mixed/img => images}/spinner.svg (100%) rename ext/{mixed/img => images}/text-parsing.svg (100%) rename ext/{mixed/img => images}/translation.svg (100%) rename ext/{mixed/img => images}/up-arrow.svg (100%) rename ext/{mixed/img => images}/view-note.svg (100%) rename ext/{mixed/img => images}/window.svg (100%) rename ext/{mixed/img => images}/yomichan-icon.svg (100%) diff --git a/README.md b/README.md index 1fcf5979..32433cfc 100644 --- a/README.md +++ b/README.md @@ -84,14 +84,14 @@ primary language is not English, you may consider also importing the English ver ## Basic Usage ## -1. Click the _Yomichan_ button in the browser bar to open the quick-actions popup. +1. Click the _Yomichan_ button in the browser bar to open the quick-actions popup. - * The _cog_ button will open the Settings page. - * The _magnifying glass_ button will open the Search page. - * The _question mark_ button will open the Information page. - * The _profile_ button will appear when multiple profiles exist, allowing the current profile to be quickly changed. + * The _cog_ button will open the Settings page. + * The _magnifying glass_ button will open the Search page. + * The _question mark_ button will open the Information page. + * The _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 -4. Click on the _speaker_ button to hear the term pronounced by a native speaker. If an audio sample is +4. Click on the _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. diff --git a/dev/data/manifest-variants.json b/dev/data/manifest-variants.json index 981213c8..7e7c6566 100644 --- a/dev/data/manifest-variants.json +++ b/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" diff --git a/ext/bg/background.html b/ext/bg/background.html index 5e4e2703..101bd09c 100644 --- a/ext/bg/background.html +++ b/ext/bg/background.html @@ -4,13 +4,13 @@ Background - - - - - - - + + + + + + + diff --git a/ext/bg/context.html b/ext/bg/context.html index 785570d8..4e28b7b0 100644 --- a/ext/bg/context.html +++ b/ext/bg/context.html @@ -4,13 +4,13 @@ Yomichan Action Popup - - - - - - - + + + + + + + diff --git a/ext/bg/css/context.css b/ext/bg/css/context.css index 27cbdb92..a77511ad 100644 --- a/ext/bg/css/context.css +++ b/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; diff --git a/ext/bg/css/settings.css b/ext/bg/css/settings.css index 7230f59d..707de85a 100644 --- a/ext/bg/css/settings.css +++ b/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; } diff --git a/ext/bg/css/settings2.css b/ext/bg/css/settings2.css index 725804c3..4f487d74 100644 --- a/ext/bg/css/settings2.css +++ b/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 { diff --git a/ext/bg/info.html b/ext/bg/info.html index fc5db6e5..5e8b6e38 100644 --- a/ext/bg/info.html +++ b/ext/bg/info.html @@ -4,13 +4,13 @@ Yomichan Info - - - - - - - + + + + + + + diff --git a/ext/bg/legal.html b/ext/bg/legal.html index 3a829abb..a8aca897 100644 --- a/ext/bg/legal.html +++ b/ext/bg/legal.html @@ -4,13 +4,13 @@ Yomichan Legal - - - - - - - + + + + + + + diff --git a/ext/bg/permissions.html b/ext/bg/permissions.html index de235eeb..fb900018 100644 --- a/ext/bg/permissions.html +++ b/ext/bg/permissions.html @@ -4,13 +4,13 @@ Yomichan Permissions - - - - - - - + + + + + + + diff --git a/ext/bg/pitch-accents-preview.html b/ext/bg/pitch-accents-preview.html index e22122c2..1232b353 100644 --- a/ext/bg/pitch-accents-preview.html +++ b/ext/bg/pitch-accents-preview.html @@ -4,13 +4,13 @@ Yomichan Pitch Accents Preview - - - - - - - + + + + + + + diff --git a/ext/bg/popup-preview.html b/ext/bg/popup-preview.html index c1ef7ca4..ae10f611 100644 --- a/ext/bg/popup-preview.html +++ b/ext/bg/popup-preview.html @@ -4,13 +4,13 @@ Yomichan Popup Preview - - - - - - - + + + + + + + diff --git a/ext/bg/search.html b/ext/bg/search.html index e5690c8d..152b38e2 100644 --- a/ext/bg/search.html +++ b/ext/bg/search.html @@ -4,13 +4,13 @@ Yomichan Search - - - - - - - + + + + + + + diff --git a/ext/bg/settings.html b/ext/bg/settings.html index 179a2565..e4512e34 100644 --- a/ext/bg/settings.html +++ b/ext/bg/settings.html @@ -4,13 +4,13 @@ Yomichan Options (Old) - - - - - - - + + + + + + + @@ -702,7 +702,7 @@
- +

Dictionaries

@@ -908,7 +908,7 @@
- +

Anki Options

@@ -1264,7 +1264,7 @@ countless hours that I have devoted to this extension.

- +

diff --git a/ext/bg/settings2.html b/ext/bg/settings2.html index 37bb1996..b612e2b6 100644 --- a/ext/bg/settings2.html +++ b/ext/bg/settings2.html @@ -4,13 +4,13 @@ Yomichan Settings - - - - - - - + + + + + + + diff --git a/ext/bg/template-renderer.html b/ext/bg/template-renderer.html index ca03c98d..68cba889 100644 --- a/ext/bg/template-renderer.html +++ b/ext/bg/template-renderer.html @@ -4,13 +4,13 @@ Yomichan Handlebars Sandbox - - - - - - - + + + + + + + diff --git a/ext/bg/welcome.html b/ext/bg/welcome.html index aeebd9dd..c4b475d4 100644 --- a/ext/bg/welcome.html +++ b/ext/bg/welcome.html @@ -4,13 +4,13 @@ Welcome to Yomichan! - - - - - - - + + + + + + + @@ -28,19 +28,19 @@
- Clicking the Yomichan button in the browser bar will open the quick-actions popup. + Clicking the Yomichan button in the browser bar will open the quick-actions popup.
- The cog button will open the Settings page. + The cog button will open the Settings page.
- The magnifying glass button will open the Search page, + The magnifying glass button will open the Search page, enabling text and terms to be looked up using the installed dictionaries. This can even be used in offline mode!
- The question mark button will open the Information page, + The question mark button will open the Information page, which has some helpful information and links about Yomichan.
@@ -71,7 +71,7 @@
- Clicking the speaker button of an entry in the search results + Clicking the speaker button of an entry in the search results will play an audio clip of a term's pronunciation using an online dictionary, if available.
diff --git a/ext/fg/float.html b/ext/fg/float.html index 8b2fb3be..18bf3f5b 100644 --- a/ext/fg/float.html +++ b/ext/fg/float.html @@ -4,13 +4,13 @@ Yomichan Search - - - - - - - + + + + + + + diff --git a/ext/mixed/img/add-term-kana.svg b/ext/images/add-term-kana.svg similarity index 100% rename from ext/mixed/img/add-term-kana.svg rename to ext/images/add-term-kana.svg diff --git a/ext/mixed/img/add-term-kanji.svg b/ext/images/add-term-kanji.svg similarity index 100% rename from ext/mixed/img/add-term-kanji.svg rename to ext/images/add-term-kanji.svg diff --git a/ext/mixed/img/backup.svg b/ext/images/backup.svg similarity index 100% rename from ext/mixed/img/backup.svg rename to ext/images/backup.svg diff --git a/ext/mixed/img/book.svg b/ext/images/book.svg similarity index 100% rename from ext/mixed/img/book.svg rename to ext/images/book.svg diff --git a/ext/mixed/img/checkbox-border.svg b/ext/images/checkbox-border.svg similarity index 100% rename from ext/mixed/img/checkbox-border.svg rename to ext/images/checkbox-border.svg diff --git a/ext/mixed/img/checkbox-check.svg b/ext/images/checkbox-check.svg similarity index 100% rename from ext/mixed/img/checkbox-check.svg rename to ext/images/checkbox-check.svg diff --git a/ext/mixed/img/checkbox-fill.svg b/ext/images/checkbox-fill.svg similarity index 100% rename from ext/mixed/img/checkbox-fill.svg rename to ext/images/checkbox-fill.svg diff --git a/ext/mixed/img/checkmark.svg b/ext/images/checkmark.svg similarity index 100% rename from ext/mixed/img/checkmark.svg rename to ext/images/checkmark.svg diff --git a/ext/mixed/img/clipboard.svg b/ext/images/clipboard.svg similarity index 100% rename from ext/mixed/img/clipboard.svg rename to ext/images/clipboard.svg diff --git a/ext/mixed/img/cog.svg b/ext/images/cog.svg similarity index 100% rename from ext/mixed/img/cog.svg rename to ext/images/cog.svg diff --git a/ext/mixed/img/collapse.svg b/ext/images/collapse.svg similarity index 100% rename from ext/mixed/img/collapse.svg rename to ext/images/collapse.svg diff --git a/ext/mixed/img/cross.svg b/ext/images/cross.svg similarity index 100% rename from ext/mixed/img/cross.svg rename to ext/images/cross.svg diff --git a/ext/mixed/img/entry-current.svg b/ext/images/entry-current.svg similarity index 100% rename from ext/mixed/img/entry-current.svg rename to ext/images/entry-current.svg diff --git a/ext/mixed/img/exclamation-point-short.svg b/ext/images/exclamation-point-short.svg similarity index 100% rename from ext/mixed/img/exclamation-point-short.svg rename to ext/images/exclamation-point-short.svg diff --git a/ext/mixed/img/expand.svg b/ext/images/expand.svg similarity index 100% rename from ext/mixed/img/expand.svg rename to ext/images/expand.svg diff --git a/ext/mixed/img/hamburger-menu.svg b/ext/images/hamburger-menu.svg similarity index 100% rename from ext/mixed/img/hamburger-menu.svg rename to ext/images/hamburger-menu.svg diff --git a/ext/mixed/img/hiragana-a.svg b/ext/images/hiragana-a.svg similarity index 100% rename from ext/mixed/img/hiragana-a.svg rename to ext/images/hiragana-a.svg diff --git a/ext/mixed/img/icon128.png b/ext/images/icon128.png similarity index 100% rename from ext/mixed/img/icon128.png rename to ext/images/icon128.png diff --git a/ext/mixed/img/icon16.png b/ext/images/icon16.png similarity index 100% rename from ext/mixed/img/icon16.png rename to ext/images/icon16.png diff --git a/ext/mixed/img/icon19.png b/ext/images/icon19.png similarity index 100% rename from ext/mixed/img/icon19.png rename to ext/images/icon19.png diff --git a/ext/mixed/img/icon32.png b/ext/images/icon32.png similarity index 100% rename from ext/mixed/img/icon32.png rename to ext/images/icon32.png diff --git a/ext/mixed/img/icon38.png b/ext/images/icon38.png similarity index 100% rename from ext/mixed/img/icon38.png rename to ext/images/icon38.png diff --git a/ext/mixed/img/icon48.png b/ext/images/icon48.png similarity index 100% rename from ext/mixed/img/icon48.png rename to ext/images/icon48.png diff --git a/ext/mixed/img/icon64.png b/ext/images/icon64.png similarity index 100% rename from ext/mixed/img/icon64.png rename to ext/images/icon64.png diff --git a/ext/mixed/img/kebab-menu.svg b/ext/images/kebab-menu.svg similarity index 100% rename from ext/mixed/img/kebab-menu.svg rename to ext/images/kebab-menu.svg diff --git a/ext/mixed/img/key.svg b/ext/images/key.svg similarity index 100% rename from ext/mixed/img/key.svg rename to ext/images/key.svg diff --git a/ext/mixed/img/keyboard.svg b/ext/images/keyboard.svg similarity index 100% rename from ext/mixed/img/keyboard.svg rename to ext/images/keyboard.svg diff --git a/ext/mixed/img/left-chevron.svg b/ext/images/left-chevron.svg similarity index 100% rename from ext/mixed/img/left-chevron.svg rename to ext/images/left-chevron.svg diff --git a/ext/mixed/img/lock.svg b/ext/images/lock.svg similarity index 100% rename from ext/mixed/img/lock.svg rename to ext/images/lock.svg diff --git a/ext/mixed/img/magnifying-glass.svg b/ext/images/magnifying-glass.svg similarity index 100% rename from ext/mixed/img/magnifying-glass.svg rename to ext/images/magnifying-glass.svg diff --git a/ext/mixed/img/material-down-arrow.svg b/ext/images/material-down-arrow.svg similarity index 100% rename from ext/mixed/img/material-down-arrow.svg rename to ext/images/material-down-arrow.svg diff --git a/ext/mixed/img/material-right-arrow.svg b/ext/images/material-right-arrow.svg similarity index 100% rename from ext/mixed/img/material-right-arrow.svg rename to ext/images/material-right-arrow.svg diff --git a/ext/mixed/img/mouse.svg b/ext/images/mouse.svg similarity index 100% rename from ext/mixed/img/mouse.svg rename to ext/images/mouse.svg diff --git a/ext/mixed/img/note-card.svg b/ext/images/note-card.svg similarity index 100% rename from ext/mixed/img/note-card.svg rename to ext/images/note-card.svg diff --git a/ext/mixed/img/palette.svg b/ext/images/palette.svg similarity index 100% rename from ext/mixed/img/palette.svg rename to ext/images/palette.svg diff --git a/ext/bg/img/paypal.gif b/ext/images/paypal.gif similarity index 100% rename from ext/bg/img/paypal.gif rename to ext/images/paypal.gif diff --git a/ext/mixed/img/play-audio.svg b/ext/images/play-audio.svg similarity index 100% rename from ext/mixed/img/play-audio.svg rename to ext/images/play-audio.svg diff --git a/ext/mixed/img/plus-circle-large.svg b/ext/images/plus-circle-large.svg similarity index 100% rename from ext/mixed/img/plus-circle-large.svg rename to ext/images/plus-circle-large.svg diff --git a/ext/mixed/img/plus-circle-small.svg b/ext/images/plus-circle-small.svg similarity index 100% rename from ext/mixed/img/plus-circle-small.svg rename to ext/images/plus-circle-small.svg diff --git a/ext/mixed/img/plus-thick.svg b/ext/images/plus-thick.svg similarity index 100% rename from ext/mixed/img/plus-thick.svg rename to ext/images/plus-thick.svg diff --git a/ext/mixed/img/popup-size.svg b/ext/images/popup-size.svg similarity index 100% rename from ext/mixed/img/popup-size.svg rename to ext/images/popup-size.svg diff --git a/ext/mixed/img/popup.svg b/ext/images/popup.svg similarity index 100% rename from ext/mixed/img/popup.svg rename to ext/images/popup.svg diff --git a/ext/mixed/img/profile.svg b/ext/images/profile.svg similarity index 100% rename from ext/mixed/img/profile.svg rename to ext/images/profile.svg diff --git a/ext/mixed/img/question-mark-circle.svg b/ext/images/question-mark-circle.svg similarity index 100% rename from ext/mixed/img/question-mark-circle.svg rename to ext/images/question-mark-circle.svg diff --git a/ext/mixed/img/question-mark-thick.svg b/ext/images/question-mark-thick.svg similarity index 100% rename from ext/mixed/img/question-mark-thick.svg rename to ext/images/question-mark-thick.svg diff --git a/ext/mixed/img/question-mark.svg b/ext/images/question-mark.svg similarity index 100% rename from ext/mixed/img/question-mark.svg rename to ext/images/question-mark.svg diff --git a/ext/mixed/img/radio-button-dot.svg b/ext/images/radio-button-dot.svg similarity index 100% rename from ext/mixed/img/radio-button-dot.svg rename to ext/images/radio-button-dot.svg diff --git a/ext/mixed/img/radio-button.svg b/ext/images/radio-button.svg similarity index 100% rename from ext/mixed/img/radio-button.svg rename to ext/images/radio-button.svg diff --git a/ext/mixed/img/right-chevron.svg b/ext/images/right-chevron.svg similarity index 100% rename from ext/mixed/img/right-chevron.svg rename to ext/images/right-chevron.svg diff --git a/ext/mixed/img/scanning.svg b/ext/images/scanning.svg similarity index 100% rename from ext/mixed/img/scanning.svg rename to ext/images/scanning.svg diff --git a/ext/mixed/img/sentence-parsing.svg b/ext/images/sentence-parsing.svg similarity index 100% rename from ext/mixed/img/sentence-parsing.svg rename to ext/images/sentence-parsing.svg diff --git a/ext/mixed/img/source-term.svg b/ext/images/source-term.svg similarity index 100% rename from ext/mixed/img/source-term.svg rename to ext/images/source-term.svg diff --git a/ext/mixed/img/speaker.svg b/ext/images/speaker.svg similarity index 100% rename from ext/mixed/img/speaker.svg rename to ext/images/speaker.svg diff --git a/ext/mixed/img/spinner.gif b/ext/images/spinner.gif similarity index 100% rename from ext/mixed/img/spinner.gif rename to ext/images/spinner.gif diff --git a/ext/mixed/img/spinner.svg b/ext/images/spinner.svg similarity index 100% rename from ext/mixed/img/spinner.svg rename to ext/images/spinner.svg diff --git a/ext/mixed/img/text-parsing.svg b/ext/images/text-parsing.svg similarity index 100% rename from ext/mixed/img/text-parsing.svg rename to ext/images/text-parsing.svg diff --git a/ext/mixed/img/translation.svg b/ext/images/translation.svg similarity index 100% rename from ext/mixed/img/translation.svg rename to ext/images/translation.svg diff --git a/ext/mixed/img/up-arrow.svg b/ext/images/up-arrow.svg similarity index 100% rename from ext/mixed/img/up-arrow.svg rename to ext/images/up-arrow.svg diff --git a/ext/mixed/img/view-note.svg b/ext/images/view-note.svg similarity index 100% rename from ext/mixed/img/view-note.svg rename to ext/images/view-note.svg diff --git a/ext/mixed/img/window.svg b/ext/images/window.svg similarity index 100% rename from ext/mixed/img/window.svg rename to ext/images/window.svg diff --git a/ext/mixed/img/yomichan-icon.svg b/ext/images/yomichan-icon.svg similarity index 100% rename from ext/mixed/img/yomichan-icon.svg rename to ext/images/yomichan-icon.svg diff --git a/ext/manifest.json b/ext/manifest.json index 238fabe3..55535feb 100644 --- a/ext/manifest.json +++ b/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" diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css index 6e250aa5..476b2c35 100644 --- a/ext/mixed/css/display.css +++ b/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'); } diff --git a/ext/mixed/css/material.css b/ext/mixed/css/material.css index 365b15ad..1177baa1 100644 --- a/ext/mixed/css/material.css +++ b/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); diff --git a/resources/icons.svg b/resources/icons.svg index 18be3afe..9621d551 100644 --- a/resources/icons.svg +++ b/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"