diff options
| -rw-r--r-- | ext/bg/js/templates.js | 10 | ||||
| -rw-r--r-- | ext/fg/css/frame.css | 10 | ||||
| -rw-r--r-- | ext/manifest.json | 7 | ||||
| -rw-r--r-- | tmpl/header.html | 8 | ||||
| -rw-r--r-- | tmpl/kanji.html | 4 |
5 files changed, 25 insertions, 14 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 1ed644a1..b56995e3 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -10,9 +10,11 @@ templates['footer.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; - return "<!DOCTYPE html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\">\n <title></title>\n <style>\n @font-face {\n font-family: \"KanjiStrokeOrders\";\n src: url(\"" + return "<!DOCTYPE html>\n<html lang=\"en\">\n <head>\n <meta charset=\"UTF-8\">\n <title></title>\n <style>\n @font-face {\n font-family: kanji-stroke-orders;\n src: url('" + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) - + "/ttf/kanji-stroke-orders.ttf\");\n }\n </style>\n <link rel=\"stylesheet\" href=\"" + + "/ttf/kanji-stroke-orders.ttf');\n }\n @font-face {\n font-family: vl-gothic-regular;\n src: url('" + + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) + + "/ttf/vl-gothic-regular.ttf');\n }\n </style>\n <link rel=\"stylesheet\" href=\"" + alias4(((helper = (helper = helpers.root || (depth0 != null ? depth0.root : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"root","hash":{},"data":data}) : helper))) + "/css/frame.css\">\n </head>\n <body>\n"; },"useData":true}); @@ -48,13 +50,13 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia },"8":function(container,depth0,helpers,partials,data) { var stack1; - return " <dt>Kunyomi</dt>\n <dd>\n" + return " <dt>Kunyomi</dt>\n <dd class=\"kanji-reading\">\n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + " </dd>\n"; },"10":function(container,depth0,helpers,partials,data) { var stack1; - return " <dt>Onyomi</dt>\n <dd>\n" + return " <dt>Onyomi</dt>\n <dd class=\"kanji-reading\">\n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + " </dd>\n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) { diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css index a06dab0c..d8e6dd7b 100644 --- a/ext/fg/css/frame.css +++ b/ext/fg/css/frame.css @@ -21,7 +21,7 @@ body { background-color: #fff; color: #333; - font-family: helvetica neue,helvetica,arial,sans-serif; + font-family: helvetica neue, helvetica, arial, sans-serif; font-size: 14px; line-height: 1.42857143; overflow-y: auto; @@ -82,7 +82,7 @@ body { .term-expression { display: inline-block; - font-family: serif; + font-family: vl-gothic-regular; font-size: 24px; } @@ -113,13 +113,17 @@ body { .kanji-glyph { float: left; - font-family: 'KanjiStrokeOrders'; + font-family: kanji-stroke-orders; font-size: 140px; line-height: 140px; padding: 0.01em; vertical-align: top; } +.kanji-reading { + font-family: vl-gothic-regular; +} + .kanji-info { display: block; overflow: hidden; diff --git a/ext/manifest.json b/ext/manifest.json index a5ced735..b6175551 100644 --- a/ext/manifest.json +++ b/ext/manifest.json @@ -23,11 +23,12 @@ "web_accessible_resources": [ "fg/css/frame.css", - "fg/js/frame.js", - "fg/ttf/kanji-stroke-orders.ttf", "fg/img/add_expression.png", + "fg/img/add_kanji.png", "fg/img/add_reading.png", - "fg/img/add_kanji.png" + "fg/js/frame.js", + "fg/ttf/kanji-stroke-orders.ttf", + "fg/ttf/vl-gothic-regular.ttf" ], "content_scripts": [{ diff --git a/tmpl/header.html b/tmpl/header.html index 2256b08a..b7fad070 100644 --- a/tmpl/header.html +++ b/tmpl/header.html @@ -5,8 +5,12 @@ <title></title> <style> @font-face { - font-family: "KanjiStrokeOrders"; - src: url("{{root}}/ttf/kanji-stroke-orders.ttf"); + font-family: kanji-stroke-orders; + src: url('{{root}}/ttf/kanji-stroke-orders.ttf'); + } + @font-face { + font-family: vl-gothic-regular; + src: url('{{root}}/ttf/vl-gothic-regular.ttf'); } </style> <link rel="stylesheet" href="{{root}}/css/frame.css"> diff --git a/tmpl/kanji.html b/tmpl/kanji.html index 7a5affb7..2c9db99a 100644 --- a/tmpl/kanji.html +++ b/tmpl/kanji.html @@ -22,7 +22,7 @@ {{#if kunyomi}} <dt>Kunyomi</dt> - <dd> + <dd class="kanji-reading"> {{#each kunyomi}} {{.}}{{#unless @last}}, {{/unless}} {{/each}} @@ -31,7 +31,7 @@ {{#if onyomi}} <dt>Onyomi</dt> - <dd> + <dd class="kanji-reading"> {{#each onyomi}} {{.}}{{#unless @last}}, {{/unless}} {{/each}} |