diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index bbab099c..f9f4e361 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -19,13 +19,13 @@ templates['header.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(c templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) { var stack1; - return "
Meanings
\n
\n" + return "
Meanings
\n
\n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
\n"; + + " \n"; },"2":function(container,depth0,helpers,partials,data) { var stack1; - return " " + return " " + container.escapeExpression(container.lambda(depth0, depth0)) + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n"; @@ -34,27 +34,27 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia },"5":function(container,depth0,helpers,partials,data) { var stack1; - return "
Kunyomi
\n
\n" + return "
Kunyomi
\n
\n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.kunyomi : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
\n"; + + " \n"; },"7":function(container,depth0,helpers,partials,data) { var stack1; - return "
Onyomi
\n
\n" + return "
Onyomi
\n
\n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.onyomi : depth0),{"name":"each","hash":{},"fn":container.program(2, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
\n"; + + " \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : {}; - return "
\n
" + return "
\n
" + container.escapeExpression(((helper = (helper = helpers.character || (depth0 != null ? depth0.character : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"character","hash":{},"data":data}) : helper))) - + "
\n\n
\n" + + "
\n
\n
\n" + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n" + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.kunyomi : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n" + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.onyomi : depth0),{"name":"if","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
\n
\n
\n"; + + " \n
\n\n\n"; },"useData":true}); templates['kanji-link.html'] = template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var helper; diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css index dae244fa..bb0b3abf 100644 --- a/ext/fg/css/frame.css +++ b/ext/fg/css/frame.css @@ -73,17 +73,6 @@ body { background-color: #0275d8; } -.kanji-glyph { - font-family: "KanjiStrokeOrders"; - font-size: 140px; - line-height: 140px; - vertical-align: top; -} - -.kanji-info { - display: inline-block; -} - ol { padding-left: 1.2em; } @@ -96,23 +85,25 @@ li span { color: #000; } -dl { - padding: 0.5em; +.kanji-glyph { + float: left; + font-family: "KanjiStrokeOrders"; + font-size: 140px; + line-height: 140px; + padding: 0.01em; + vertical-align: top; } -dt { - float: left; - clear: left; - width: 100px; - text-align: right; +.kanji-info { + display: block; + overflow: hidden; +} + +.kanji-info dt { font-weight: bold; } -dt:after { - content: ":"; +.kanji-info dd { + margin-left: 1.2em; } -dd { - margin: 0 0 0 110px; - padding: 0 0 0.5em 0; -} diff --git a/util/tmpl/kanji.html b/util/tmpl/kanji.html index b52f29f5..c1883b19 100644 --- a/util/tmpl/kanji.html +++ b/util/tmpl/kanji.html @@ -1,33 +1,34 @@ -
-
{{character}}
+
+
{{character}}
+
+
+ {{#if glossary}} +
Meanings
+
+ {{#each glossary}} + {{.}}{{#unless @last}}, {{/unless}} + {{/each}} +
+ {{/if}} -
- {{#if glossary}} -
Meanings
-
- {{#each glossary}} - {{.}}{{#unless @last}}, {{/unless}} - {{/each}} -
- {{/if}} + {{#if kunyomi}} +
Kunyomi
+
+ {{#each kunyomi}} + {{.}}{{#unless @last}}, {{/unless}} + {{/each}} +
+ {{/if}} - {{#if kunyomi}} -
Kunyomi
-
- {{#each kunyomi}} - {{.}}{{#unless @last}}, {{/unless}} - {{/each}} -
- {{/if}} - - {{#if onyomi}} -
Onyomi
-
- {{#each onyomi}} - {{.}}{{#unless @last}}, {{/unless}} - {{/each}} -
- {{/if}} -
+ {{#if onyomi}} +
Onyomi
+
+ {{#each onyomi}} + {{.}}{{#unless @last}}, {{/unless}} + {{/each}} +
+ {{/if}} +
+