From 8438a1fe321772ddba479437db40097e4a208a0b Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Mon, 9 May 2016 19:07:39 -0700 Subject: Custom fonts for Japanese --- ext/bg/js/templates.js | 10 ++++++---- ext/fg/css/frame.css | 10 +++++++--- ext/manifest.json | 7 ++++--- tmpl/header.html | 8 ++++++-- 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 "\n\n \n \n \n \n \n \n \n \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 "

Kunyomi

\n" + return "

Kunyomi

\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 : "") + "

\n"; },"10":function(container,depth0,helpers,partials,data) { var stack1; - return "

Onyomi

\n" + return "

Onyomi

\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 : "") + "

\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 @@ 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}}

Kunyomi

{{#each kunyomi}} {{.}}{{#unless @last}}, {{/unless}} {{/each}} @@ -31,7 +31,7 @@ {{#if onyomi}}

Onyomi

{{#each onyomi}} {{.}}{{#unless @last}}, {{/unless}} {{/each}} -- cgit v1.2.3