summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Yatskov <alex@foosoft.net>2017-03-04 12:27:05 -0800
committerAlex Yatskov <alex@foosoft.net>2017-03-04 12:27:05 -0800
commit2e7ce451126342a9e77c43e757cd1ffdac00d807 (patch)
tree8b630987309f9391ef22e8461d47a3d765d202c0
parent395af352f0381d43086563aa7d72ac56ac207133 (diff)
file reorg1.0.18
-rw-r--r--ext/bg/background.html24
-rw-r--r--ext/bg/guide.html10
-rw-r--r--ext/bg/js/templates.js8
-rw-r--r--ext/bg/legal.html6
-rw-r--r--ext/bg/options.html22
-rw-r--r--ext/bg/popup.html18
-rw-r--r--ext/bg/search.html16
-rw-r--r--ext/fg/frame.html16
-rw-r--r--ext/fg/img/spinner.gifbin7358 -> 0 bytes
-rw-r--r--ext/manifest.json24
-rw-r--r--ext/mixed/css/frame.css (renamed from ext/fg/css/frame.css)4
-rw-r--r--ext/mixed/img/add_kanji.png (renamed from ext/fg/img/add_kanji.png)bin733 -> 733 bytes
-rw-r--r--ext/mixed/img/add_term_kana.png (renamed from ext/fg/img/add_term_kana.png)bin286 -> 286 bytes
-rw-r--r--ext/mixed/img/add_term_kanji.png (renamed from ext/fg/img/add_term_kanji.png)bin733 -> 733 bytes
-rw-r--r--ext/mixed/img/icon128.png (renamed from ext/img/icon128.png)bin594 -> 594 bytes
-rw-r--r--ext/mixed/img/icon16.png (renamed from ext/img/icon16.png)bin129 -> 129 bytes
-rw-r--r--ext/mixed/img/icon19.png (renamed from ext/img/icon19.png)bin135 -> 135 bytes
-rw-r--r--ext/mixed/img/icon38.png (renamed from ext/img/icon38.png)bin196 -> 196 bytes
-rw-r--r--ext/mixed/img/icon48.png (renamed from ext/img/icon48.png)bin223 -> 223 bytes
-rw-r--r--ext/mixed/img/icon64.png (renamed from ext/img/icon64.png)bin289 -> 289 bytes
-rw-r--r--ext/mixed/img/play_audio.png (renamed from ext/fg/img/play_audio.png)bin610 -> 610 bytes
-rw-r--r--ext/mixed/img/spinner.gif (renamed from ext/bg/img/spinner.gif)bin7358 -> 7358 bytes
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map (renamed from ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot (renamed from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot)bin20127 -> 20127 bytes
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg (renamed from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf (renamed from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf)bin45404 -> 45404 bytes
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff (renamed from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff)bin23424 -> 23424 bytes
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2 (renamed from ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2)bin18028 -> 18028 bytes
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.js (renamed from ext/lib/bootstrap-3.3.7-dist/js/bootstrap.js)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js (renamed from ext/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js)0
-rw-r--r--ext/mixed/lib/bootstrap-3.3.7-dist/js/npm.js (renamed from ext/lib/bootstrap-3.3.7-dist/js/npm.js)0
-rw-r--r--ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css (renamed from ext/lib/bootstrap-toggle/bootstrap-toggle.min.css)0
-rw-r--r--ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js (renamed from ext/lib/bootstrap-toggle/bootstrap-toggle.min.js)0
-rw-r--r--ext/mixed/lib/dexie.min.js (renamed from ext/lib/dexie.min.js)0
-rw-r--r--ext/mixed/lib/handlebars.min.js (renamed from ext/lib/handlebars.min.js)0
-rw-r--r--ext/mixed/lib/jquery-3.1.1.min.js (renamed from ext/lib/jquery-3.1.1.min.js)0
-rw-r--r--ext/mixed/lib/wanakana.min.js (renamed from ext/lib/wanakana.min.js)0
-rw-r--r--ext/mixed/mp3/button.mp3 (renamed from ext/fg/mp3/button.mp3)bin17735 -> 17735 bytes
-rw-r--r--ext/mixed/ttf/kanji-stroke-orders.ttf (renamed from ext/fg/ttf/kanji-stroke-orders.ttf)bin17999116 -> 17999116 bytes
-rw-r--r--ext/mixed/ttf/vl-gothic-regular.ttf (renamed from ext/fg/ttf/vl-gothic-regular.ttf)bin4091660 -> 4091660 bytes
-rw-r--r--tmpl/kanji.html2
-rw-r--r--tmpl/terms.html6
49 files changed, 78 insertions, 78 deletions
diff --git a/ext/bg/background.html b/ext/bg/background.html
index eecadf1e..3c7b0dd9 100644
--- a/ext/bg/background.html
+++ b/ext/bg/background.html
@@ -1,17 +1,17 @@
<!DOCTYPE html>
<html lang="en">
<body>
- <script src="../lib/handlebars.min.js"></script>
- <script src="../lib/dexie.min.js"></script>
- <script src="../lib/wanakana.min.js"></script>
- <script src="js/templates.js"></script>
- <script src="js/gecko.js"></script>
- <script src="js/util.js"></script>
- <script src="js/anki-connect.js"></script>
- <script src="js/anki-null.js"></script>
- <script src="js/database.js"></script>
- <script src="js/deinflector.js"></script>
- <script src="js/translator.js"></script>
- <script src="js/yomichan.js"></script>
+ <script src="/mixed/lib/handlebars.min.js"></script>
+ <script src="/mixed/lib/dexie.min.js"></script>
+ <script src="/mixed/lib/wanakana.min.js"></script>
+ <script src="/bg/js/templates.js"></script>
+ <script src="/bg/js/gecko.js"></script>
+ <script src="/bg/js/util.js"></script>
+ <script src="/bg/js/anki-connect.js"></script>
+ <script src="/bg/js/anki-null.js"></script>
+ <script src="/bg/js/database.js"></script>
+ <script src="/bg/js/deinflector.js"></script>
+ <script src="/bg/js/translator.js"></script>
+ <script src="/bg/js/yomichan.js"></script>
</body>
</html>
diff --git a/ext/bg/guide.html b/ext/bg/guide.html
index 521cec19..2d8c6536 100644
--- a/ext/bg/guide.html
+++ b/ext/bg/guide.html
@@ -3,11 +3,11 @@
<head>
<meta charset="UTF-8">
<title>Welcome to Yomichan!</title>
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
</head>
<body>
- <div class="container">
+ <div class="container-fluid">
<div class="page-header">
<h1>Welcome to Yomichan!</h1>
</div>
@@ -23,10 +23,10 @@
</p>
<ol>
- <li>Click on the <img src="../img/icon16.png" alt> icon in the browser toolbar to open the Yomichan options page.</li>
+ <li>Click on the <img src="/mixed/img/icon16.png" alt> icon in the browser toolbar to open the Yomichan options page.</li>
<li>Import the dictionaries (bundled or custom) you wish to use for term and Kanji searches.</li>
<li>Hold down <kbd>Shift</kbd> (or the middle mouse button) as you hover over text to see term definitions.</li>
- <li>Click on the <img src="../fg/img/play_audio.png" alt> icon to hear the term pronounced by a native speaker (if audio is available).</li>
+ <li>Click on the <img src="/mixed/fg/img/play_audio.png" alt> icon to hear the term pronounced by a native speaker (if audio is available).</li>
<li>Click on Kanji in the definition window to view additional information about that character.</li>
</ol>
</div>
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index f8306b1b..0fa41b36 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -302,7 +302,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia
return " <a href=\"#\" title=\"Add Kanji\" class=\"action-add-note pending disabled\" data-mode=\"kanji\" data-index=\""
+ container.escapeExpression(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper)))
- + "\"><img src=\"/fg/img/add_kanji.png\"></a>\n";
+ + "\"><img src=\"/mixed/img/add_kanji.png\"></a>\n";
},"4":function(container,depth0,helpers,partials,data) {
var stack1;
@@ -459,15 +459,15 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
return " <a href=\"#\" title=\"Add term as expression\" class=\"action-add-note pending disabled\" data-mode=\"term_kanji\" data-index=\""
+ alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
- + "\"><img src=\"/fg/img/add_term_kanji.png\"></a>\n <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term_kana\" data-index=\""
+ + "\"><img src=\"/mixed/img/add_term_kanji.png\"></a>\n <a href=\"#\" title=\"Add term as reading\" class=\"action-add-note pending disabled\" data-mode=\"term_kana\" data-index=\""
+ alias4(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"index","hash":{},"data":data}) : helper)))
- + "\"><img src=\"/fg/img/add_term_kana.png\"></a>\n";
+ + "\"><img src=\"/mixed/img/add_term_kana.png\"></a>\n";
},"15":function(container,depth0,helpers,partials,data) {
var helper;
return " <a href=\"#\" title=\"Play audio\" class=\"action-play-audio\" data-index=\""
+ container.escapeExpression(((helper = (helper = helpers.index || (data && data.index)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"index","hash":{},"data":data}) : helper)))
- + "\"><img src=\"/fg/img/play_audio.png\"></a>\n";
+ + "\"><img src=\"/mixed/img/play_audio.png\"></a>\n";
},"17":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer =
" <div class=\"expression\"><ruby>";
diff --git a/ext/bg/legal.html b/ext/bg/legal.html
index 9be89f72..f3ca4e01 100644
--- a/ext/bg/legal.html
+++ b/ext/bg/legal.html
@@ -3,11 +3,11 @@
<head>
<meta charset="UTF-8">
<title>Yomichan Legal</title>
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
</head>
<body>
- <div class="container">
+ <div class="container-fluid">
<h3>Yomichan License</h3>
<pre>
Copyright (C) 2016 Alex Yatskov
diff --git a/ext/bg/options.html b/ext/bg/options.html
index 7739c540..7d95860b 100644
--- a/ext/bg/options.html
+++ b/ext/bg/options.html
@@ -3,8 +3,8 @@
<head>
<meta charset="UTF-8">
<title>Yomichan Options</title>
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
<style>
#anki-spinner, #anki-general, #anki-error,
#dict-spinner, #dict-error, #dict-warning, #dict-purge-progress, #dict-import-progress,
@@ -75,7 +75,7 @@
<div>
<div>
- <img src="img/spinner.gif" class="pull-right" id="dict-spinner" alt>
+ <img src="/mixed/img/spinner.gif" class="pull-right" id="dict-spinner" alt>
<h3>Dictionaries</h3>
</div>
@@ -223,7 +223,7 @@
improve Yomichan!
</p>
<p>
- <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN"><img src="img/paypal.gif" alt></a>
+ <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=4DBTN9A3CUAFN"><img src="/bg/img/paypal.gif" alt></a>
</p>
</div>
</div>
@@ -233,12 +233,12 @@
</div>
</div>
- <script src="../lib/jquery-3.1.1.min.js"></script>
- <script src="../lib/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
- <script src="../lib/handlebars.min.js"></script>
- <script src="js/templates.js"></script>
- <script src="js/gecko.js"></script>
- <script src="js/util.js"></script>
- <script src="js/options.js"></script>
+ <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+ <script src="/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js"></script>
+ <script src="/mixed/lib/handlebars.min.js"></script>
+ <script src="/bg/js/templates.js"></script>
+ <script src="/bg/js/gecko.js"></script>
+ <script src="/bg/js/util.js"></script>
+ <script src="/bg/js/options.js"></script>
</body>
</html>
diff --git a/ext/bg/popup.html b/ext/bg/popup.html
index 35782b87..388cff9c 100644
--- a/ext/bg/popup.html
+++ b/ext/bg/popup.html
@@ -2,9 +2,9 @@
<html lang="en">
<head>
<meta charset="UTF-8">
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-toggle/bootstrap-toggle.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css">
<style type="text/css">
body {
padding: 10px;
@@ -27,11 +27,11 @@
<button type="button" id="open-help" title="Help" class="btn btn-default btn-xs glyphicon glyphicon-question-sign"></button>
</div>
</p>
- <script src="../lib/jquery-3.1.1.min.js"></script>
- <script src="../lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
- <script src="js/gecko.js"></script>
- <script src="js/util.js"></script>
- <script src="js/options.js"></script>
- <script src="js/popup.js"></script>
+ <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+ <script src="/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js"></script>
+ <script src="/bg/js/gecko.js"></script>
+ <script src="/bg/js/util.js"></script>
+ <script src="/bg/js/options.js"></script>
+ <script src="/bg/js/popup.js"></script>
</body>
</html>
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 0737f99c..7921501b 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -3,9 +3,9 @@
<head>
<meta charset="UTF-8">
<title>Yomichan Search</title>
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
- <link rel="stylesheet" type="text/css" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
- <link rel="stylesheet" type="text/css" href="../fg/css/frame.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" type="text/css" href="/mixed/css/frame.css">
</head>
<body>
<div class="container-fluid">
@@ -19,14 +19,14 @@
</p>
<div id="spinner">
- <img src="img/spinner.gif">
+ <img src="/mixed/img/spinner.gif">
</div>
<div id="content"></div>
</div>
- <script src="../lib/jquery-3.1.1.min.js"></script>
- <script src="js/gecko.js"></script>
- <script src="js/util.js"></script>
- <script src="js/search.js"></script>
+ <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+ <script src="/bg/js/gecko.js"></script>
+ <script src="/bg/js/util.js"></script>
+ <script src="/bg/js/search.js"></script>
</body>
</html>
diff --git a/ext/fg/frame.html b/ext/fg/frame.html
index a5baee98..7fda6991 100644
--- a/ext/fg/frame.html
+++ b/ext/fg/frame.html
@@ -3,14 +3,14 @@
<head>
<meta charset="UTF-8">
<title></title>
- <link rel="stylesheet" href="../lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
- <link rel="stylesheet" href="../lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
- <link rel="stylesheet" href="css/frame.css">
+ <link rel="stylesheet" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css">
+ <link rel="stylesheet" href="/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css">
+ <link rel="stylesheet" href="/mixed/css/frame.css">
</head>
<body>
<div class="container-fluid">
<div id="spinner">
- <img src="img/spinner.gif">
+ <img src="/mixed/img/spinner.gif">
</div>
<div id="content"></div>
@@ -20,10 +20,10 @@
<p>The Yomichan extension has been updated to a new version! In order to continue viewing definitions on this page you must reload this tab or restart your browser.</p>
</div>
- <script src="../lib/jquery-3.1.1.min.js"></script>
- <script src="../lib/wanakana.min.js"></script>
- <script src="js/util.js"></script>
- <script src="js/frame.js"></script>
+ <script src="/mixed/lib/jquery-3.1.1.min.js"></script>
+ <script src="/mixed/lib/wanakana.min.js"></script>
+ <script src="/fg/js/util.js"></script>
+ <script src="/fg/js/frame.js"></script>
</div>
</body>
</html>
diff --git a/ext/fg/img/spinner.gif b/ext/fg/img/spinner.gif
deleted file mode 100644
index 8ed30cb6..00000000
--- a/ext/fg/img/spinner.gif
+++ /dev/null
Binary files differ
diff --git a/ext/manifest.json b/ext/manifest.json
index f4fcccfa..48b15c9d 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -1,12 +1,12 @@
{
"manifest_version": 2,
"name": "Yomichan",
- "version": "1.0.17",
+ "version": "1.0.18",
"description": "Japanese dictionary with Anki integration",
- "icons": {"16": "img/icon16.png", "48": "img/icon48.png", "128": "img/icon128.png"},
+ "icons": {"16": "mixed/img/icon16.png", "48": "mixed/img/icon48.png", "128": "mixed/img/icon128.png"},
"browser_action": {
- "default_icon": {"19": "img/icon19.png", "38": "img/icon38.png"},
+ "default_icon": {"19": "mixed/img/icon19.png", "38": "mixed/img/icon38.png"},
"default_popup": "bg/popup.html"
},
@@ -33,17 +33,17 @@
"storage"
],
"web_accessible_resources": [
- "fg/css/frame.css",
"fg/frame.html",
- "fg/img/add_kanji.png",
- "fg/img/add_term_kana.png",
- "fg/img/add_term_kanji.png",
- "fg/img/play_audio.png",
- "fg/img/spinner.gif",
"fg/js/frame.js",
- "fg/mp3/button.mp3",
- "fg/ttf/kanji-stroke-orders.ttf",
- "fg/ttf/vl-gothic-regular.ttf"
+ "mixed/css/frame.css",
+ "mixed/img/add_kanji.png",
+ "mixed/img/add_term_kana.png",
+ "mixed/img/add_term_kanji.png",
+ "mixed/img/play_audio.png",
+ "mixed/img/spinner.gif",
+ "mixed/mp3/button.mp3",
+ "mixed/ttf/kanji-stroke-orders.ttf",
+ "mixed/ttf/vl-gothic-regular.ttf"
],
"applications": {
"gecko": {
diff --git a/ext/fg/css/frame.css b/ext/mixed/css/frame.css
index e2006328..7d772042 100644
--- a/ext/fg/css/frame.css
+++ b/ext/mixed/css/frame.css
@@ -23,12 +23,12 @@
@font-face {
font-family: kanji-stroke-orders;
- src: url('../ttf/kanji-stroke-orders.ttf');
+ src: url('/mixed/ttf/kanji-stroke-orders.ttf');
}
@font-face {
font-family: vl-gothic-regular;
- src: url('../ttf/vl-gothic-regular.ttf');
+ src: url('/mixed/ttf/vl-gothic-regular.ttf');
}
diff --git a/ext/fg/img/add_kanji.png b/ext/mixed/img/add_kanji.png
index 6332fefe..6332fefe 100644
--- a/ext/fg/img/add_kanji.png
+++ b/ext/mixed/img/add_kanji.png
Binary files differ
diff --git a/ext/fg/img/add_term_kana.png b/ext/mixed/img/add_term_kana.png
index 41ff8335..41ff8335 100644
--- a/ext/fg/img/add_term_kana.png
+++ b/ext/mixed/img/add_term_kana.png
Binary files differ
diff --git a/ext/fg/img/add_term_kanji.png b/ext/mixed/img/add_term_kanji.png
index 6332fefe..6332fefe 100644
--- a/ext/fg/img/add_term_kanji.png
+++ b/ext/mixed/img/add_term_kanji.png
Binary files differ
diff --git a/ext/img/icon128.png b/ext/mixed/img/icon128.png
index c3e5ae64..c3e5ae64 100644
--- a/ext/img/icon128.png
+++ b/ext/mixed/img/icon128.png
Binary files differ
diff --git a/ext/img/icon16.png b/ext/mixed/img/icon16.png
index 10dab78a..10dab78a 100644
--- a/ext/img/icon16.png
+++ b/ext/mixed/img/icon16.png
Binary files differ
diff --git a/ext/img/icon19.png b/ext/mixed/img/icon19.png
index 6fd3132e..6fd3132e 100644
--- a/ext/img/icon19.png
+++ b/ext/mixed/img/icon19.png
Binary files differ
diff --git a/ext/img/icon38.png b/ext/mixed/img/icon38.png
index 719dfbc8..719dfbc8 100644
--- a/ext/img/icon38.png
+++ b/ext/mixed/img/icon38.png
Binary files differ
diff --git a/ext/img/icon48.png b/ext/mixed/img/icon48.png
index da76135b..da76135b 100644
--- a/ext/img/icon48.png
+++ b/ext/mixed/img/icon48.png
Binary files differ
diff --git a/ext/img/icon64.png b/ext/mixed/img/icon64.png
index b47b0bce..b47b0bce 100644
--- a/ext/img/icon64.png
+++ b/ext/mixed/img/icon64.png
Binary files differ
diff --git a/ext/fg/img/play_audio.png b/ext/mixed/img/play_audio.png
index 6056d234..6056d234 100644
--- a/ext/fg/img/play_audio.png
+++ b/ext/mixed/img/play_audio.png
Binary files differ
diff --git a/ext/bg/img/spinner.gif b/ext/mixed/img/spinner.gif
index 8ed30cb6..8ed30cb6 100644
--- a/ext/bg/img/spinner.gif
+++ b/ext/mixed/img/spinner.gif
Binary files differ
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css
index 31d88826..31d88826 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map
index d876f60f..d876f60f 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css
index 5e394019..5e394019 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map
index 94813e90..94813e90 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap-theme.min.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css
index 6167622c..6167622c 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map
index f010c82d..f010c82d 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css
index ed3905e0..ed3905e0 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css
diff --git a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map
index 6c7fa40b..6c7fa40b 100644
--- a/ext/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/css/bootstrap.min.css.map
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot
index b93a4953..b93a4953 100644
--- a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg
index 94fb5490..94fb5490 100644
--- a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.svg
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf
index 1413fc60..1413fc60 100644
--- a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff
index 9e612858..9e612858 100644
--- a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2 b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2
index 64539b54..64539b54 100644
--- a/ext/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/fonts/glyphicons-halflings-regular.woff2
Binary files differ
diff --git a/ext/lib/bootstrap-3.3.7-dist/js/bootstrap.js b/ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.js
index 8a2e99a5..8a2e99a5 100644
--- a/ext/lib/bootstrap-3.3.7-dist/js/bootstrap.js
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.js
diff --git a/ext/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js b/ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js
index 9bcd2fcc..9bcd2fcc 100644
--- a/ext/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/js/bootstrap.min.js
diff --git a/ext/lib/bootstrap-3.3.7-dist/js/npm.js b/ext/mixed/lib/bootstrap-3.3.7-dist/js/npm.js
index bf6aa806..bf6aa806 100644
--- a/ext/lib/bootstrap-3.3.7-dist/js/npm.js
+++ b/ext/mixed/lib/bootstrap-3.3.7-dist/js/npm.js
diff --git a/ext/lib/bootstrap-toggle/bootstrap-toggle.min.css b/ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css
index 0d42ed09..0d42ed09 100644
--- a/ext/lib/bootstrap-toggle/bootstrap-toggle.min.css
+++ b/ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.css
diff --git a/ext/lib/bootstrap-toggle/bootstrap-toggle.min.js b/ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js
index 37113200..37113200 100644
--- a/ext/lib/bootstrap-toggle/bootstrap-toggle.min.js
+++ b/ext/mixed/lib/bootstrap-toggle/bootstrap-toggle.min.js
diff --git a/ext/lib/dexie.min.js b/ext/mixed/lib/dexie.min.js
index 81676ce2..81676ce2 100644
--- a/ext/lib/dexie.min.js
+++ b/ext/mixed/lib/dexie.min.js
diff --git a/ext/lib/handlebars.min.js b/ext/mixed/lib/handlebars.min.js
index cfcd63e9..cfcd63e9 100644
--- a/ext/lib/handlebars.min.js
+++ b/ext/mixed/lib/handlebars.min.js
diff --git a/ext/lib/jquery-3.1.1.min.js b/ext/mixed/lib/jquery-3.1.1.min.js
index 4c5be4c0..4c5be4c0 100644
--- a/ext/lib/jquery-3.1.1.min.js
+++ b/ext/mixed/lib/jquery-3.1.1.min.js
diff --git a/ext/lib/wanakana.min.js b/ext/mixed/lib/wanakana.min.js
index 6c954785..6c954785 100644
--- a/ext/lib/wanakana.min.js
+++ b/ext/mixed/lib/wanakana.min.js
diff --git a/ext/fg/mp3/button.mp3 b/ext/mixed/mp3/button.mp3
index 7a9728d1..7a9728d1 100644
--- a/ext/fg/mp3/button.mp3
+++ b/ext/mixed/mp3/button.mp3
Binary files differ
diff --git a/ext/fg/ttf/kanji-stroke-orders.ttf b/ext/mixed/ttf/kanji-stroke-orders.ttf
index 154fa473..154fa473 100644
--- a/ext/fg/ttf/kanji-stroke-orders.ttf
+++ b/ext/mixed/ttf/kanji-stroke-orders.ttf
Binary files differ
diff --git a/ext/fg/ttf/vl-gothic-regular.ttf b/ext/mixed/ttf/vl-gothic-regular.ttf
index c056caa2..c056caa2 100644
--- a/ext/fg/ttf/vl-gothic-regular.ttf
+++ b/ext/mixed/ttf/vl-gothic-regular.ttf
Binary files differ
diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index fefef9bb..c9e6959d 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -2,7 +2,7 @@
<p>
<div class="actions">
{{#if addable}}
- <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="/fg/img/add_kanji.png"></a>
+ <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="/mixed/img/add_kanji.png"></a>
{{/if}}
</div>
diff --git a/tmpl/terms.html b/tmpl/terms.html
index cb68c74f..923eb14f 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -21,11 +21,11 @@
<p>
<div class="actions">
{{#if addable}}
- <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="/fg/img/add_term_kanji.png"></a>
- <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="/fg/img/add_term_kana.png"></a>
+ <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="/mixed/img/add_term_kanji.png"></a>
+ <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="/mixed/img/add_term_kana.png"></a>
{{/if}}
{{#if playback}}
- <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="/fg/img/play_audio.png"></a>
+ <a href="#" title="Play audio" class="action-play-audio" data-index="{{@index}}"><img src="/mixed/img/play_audio.png"></a>
{{/if}}
</div>