\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0),"inverse":container.program(4, data, 0),"data":data})) != null ? stack1 : "")
+ "\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "\n"
+ ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
- + "\n
\n
\n"
+ + "\n \n
\n"
+ ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(13, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "
\n
\n
\n";
},"useData":true});
diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css
index bb0b3abf..39e6475b 100644
--- a/ext/fg/css/frame.css
+++ b/ext/fg/css/frame.css
@@ -16,6 +16,8 @@
* along with this program. If not, see
.
*/
+/* common styles */
+
body {
background-color: #fff;
color: #333;
@@ -26,35 +28,18 @@ body {
padding: 5px;
}
-.term {
- font-family: serif;
- font-size: 24px;
- display: inline-block;
-}
-
-.term a {
- border-bottom: 1px #777 dashed;
- color: #333;
- text-decoration: none;
-}
-
-.rules {
- color: #777;
- display: inline-block;
-}
-
.tag {
- border-radius: 0.25em;
- color: #fff;
- cursor: default;
- display: inline;
- font-size: 75%;
- font-weight: 700;
- line-height: 1;
- padding: 0.2em 0.6em 0.3em;
- text-align: center;
- vertical-align: baseline;
- white-space: nowrap;
+ border-radius: 0.25em;
+ color: #fff;
+ cursor: default;
+ display: inline;
+ font-size: 75%;
+ font-weight: 700;
+ line-height: 1;
+ padding: 0.2em 0.6em 0.3em;
+ text-align: center;
+ vertical-align: baseline;
+ white-space: nowrap;
}
.tag-default {
@@ -73,18 +58,39 @@ body {
background-color: #0275d8;
}
-ol {
+/* term styles */
+
+.term-expression {
+ display: inline-block;
+ font-family: serif;
+ font-size: 24px;
+}
+
+.term-expression a {
+ border-bottom: 1px #777 dashed;
+ color: #333;
+ text-decoration: none;
+}
+
+.term-rules {
+ color: #777;
+ display: inline-block;
+}
+
+.term-glossary ol {
padding-left: 1.2em;
}
-li {
+.term-glossary li {
color: #777;
}
-li span {
+.term-glossary li span {
color: #000;
}
+/* kanji styles */
+
.kanji-glyph {
float: left;
font-family: "KanjiStrokeOrders";
diff --git a/util/tmpl/term.html b/util/tmpl/term.html
index 00a9d156..0daf9f49 100644
--- a/util/tmpl/term.html
+++ b/util/tmpl/term.html
@@ -1,12 +1,12 @@
-
+
{{#if reading}}
-
{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
+
{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
{{else}}
-
{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
+
{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
{{/if}}
{{#if rules}}
-
+
{{#each rules}}
{{.}} {{#unless @last}}«{{/unless}}
{{/each}}
@@ -14,14 +14,14 @@
{{/if}}
{{#if tags}}
-