From 3b83f8b7fef9978b79517aeda95fa89de071ba54 Mon Sep 17 00:00:00 2001 From: Alex Yatskov Date: Sun, 8 Jan 2017 19:03:48 -0800 Subject: styling --- ext/bg/js/templates.js | 101 +++++++++++++++++++++++++++----------------- ext/fg/css/frame.css | 9 ++++ tmpl/kanji-list.html | 3 +- tmpl/kanji.html | 20 ++++----- tmpl/model.html | 2 +- tmpl/term-grouped-list.html | 4 +- tmpl/term-grouped.html | 26 +++++++----- tmpl/term-list.html | 4 +- tmpl/term.html | 20 ++++----- 9 files changed, 113 insertions(+), 76 deletions(-) diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js index 871c5332..42057a49 100644 --- a/ext/bg/js/templates.js +++ b/ext/bg/js/templates.js @@ -34,13 +34,13 @@ templates['dictionary.html'] = template({"1":function(container,depth0,helpers,p templates['kanji.html'] = template({"1":function(container,depth0,helpers,partials,data) { var helper; - return " \n"; },"3":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(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + "\n"; @@ -49,7 +49,7 @@ templates['kanji.html'] = template({"1":function(container,depth0,helpers,partia },"6":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; - return " \n" + return "
    \n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
\n"; + + " \n"; },"9":function(container,depth0,helpers,partials,data) { - return "
  • " + return "
  • " + container.escapeExpression(container.lambda(depth0, depth0)) + "
  • \n"; },"11":function(container,depth0,helpers,partials,data) { var stack1; - return "
    " + return "
    " + container.escapeExpression(container.lambda(((stack1 = (depth0 != null ? depth0.glossary : depth0)) != null ? stack1["0"] : stack1), depth0)) + "
    \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { @@ -103,16 +103,21 @@ templates['kanji-list.html'] = template({"1":function(container,depth0,helpers,p },"2":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; - return ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); -},"4":function(container,depth0,helpers,partials,data) { + return " " + + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(3, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + "\n" + + ((stack1 = container.invokePartial(partials["kanji.html"],depth0,{"name":"kanji.html","hash":{"root":(depths[1] != null ? depths[1].root : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); +},"3":function(container,depth0,helpers,partials,data) { + return "
    "; +},"5":function(container,depth0,helpers,partials,data) { return "

    No results found

    \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; - return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); + return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(5, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); },"usePartial":true,"useData":true,"useDepths":true}); templates['model.html'] = template({"1":function(container,depth0,helpers,partials,data) { - return "
  • " + return "
  • " + container.escapeExpression(container.lambda(depth0, depth0)) + "
  • \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { @@ -169,20 +174,20 @@ templates['term-definition.html'] = template({"1":function(container,depth0,help templates['term-grouped.html'] = template({"1":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; - return " \n \n \n"; },"3":function(container,depth0,helpers,partials,data) { var helper; - return " \n"; },"5":function(container,depth0,helpers,partials,data) { var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = - "
    "; + "
    "; stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper)); if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)} if (stack1 != null) { buffer += stack1; } @@ -195,7 +200,7 @@ templates['term-grouped.html'] = template({"1":function(container,depth0,helpers return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"expression","hash":{},"data":data}) : helper))); },"8":function(container,depth0,helpers,partials,data) { var stack1, helper, options, buffer = - "
    "; + "
    "; stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper)); if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)} if (stack1 != null) { buffer += stack1; } @@ -203,13 +208,13 @@ templates['term-grouped.html'] = template({"1":function(container,depth0,helpers },"10":function(container,depth0,helpers,partials,data) { var stack1; - return "
    \n" + return "
    \n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n"; + + "
    \n"; },"11":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(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") @@ -219,9 +224,19 @@ templates['term-grouped.html'] = template({"1":function(container,depth0,helpers },"14":function(container,depth0,helpers,partials,data) { var stack1; - return "
  • " + return "
      \n" + + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(15, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + "
    \n"; +},"15":function(container,depth0,helpers,partials,data) { + var stack1; + + return "
  • " + ((stack1 = container.invokePartial(partials["term-definition.html"],depth0,{"name":"term-definition.html","data":data,"helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") + "
  • \n"; +},"17":function(container,depth0,helpers,partials,data) { + var stack1; + + return ((stack1 = container.invokePartial(partials["term-definition.html"],((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["0"] : stack1),{"name":"term-definition.html","data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1, alias1=depth0 != null ? depth0 : {}; @@ -232,9 +247,9 @@ templates['term-grouped.html'] = template({"1":function(container,depth0,helpers + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reading : depth0),{"name":"if","hash":{},"fn":container.program(5, data, 0),"inverse":container.program(8, data, 0),"data":data})) != null ? stack1 : "") + "\n" + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.reasons : depth0),{"name":"if","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "\n
    \n
      \n" - + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.definitions : depth0),{"name":"each","hash":{},"fn":container.program(14, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n
    \n
    \n"; + + "\n
    \n" + + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.definitions : depth0)) != null ? stack1["1"] : stack1),{"name":"if","hash":{},"fn":container.program(14, data, 0),"inverse":container.program(17, data, 0),"data":data})) != null ? stack1 : "") + + "
    \n
    \n"; },"usePartial":true,"useData":true}); templates['term-grouped-list.html'] = template({"1":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; @@ -243,32 +258,36 @@ templates['term-grouped-list.html'] = template({"1":function(container,depth0,he },"2":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; - return ((stack1 = container.invokePartial(partials["term-grouped.html"],depth0,{"name":"term-grouped.html","hash":{"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") - + "
    \n"; -},"4":function(container,depth0,helpers,partials,data) { + return " " + + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(3, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + "\n" + + ((stack1 = container.invokePartial(partials["term-grouped.html"],depth0,{"name":"term-grouped.html","hash":{"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); +},"3":function(container,depth0,helpers,partials,data) { + return "
    "; +},"5":function(container,depth0,helpers,partials,data) { return "

    No results found

    \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; - return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); + return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(5, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); },"usePartial":true,"useData":true,"useDepths":true}); templates['term.html'] = template({"1":function(container,depth0,helpers,partials,data) { var helper, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; - return " \n \n \n"; },"3":function(container,depth0,helpers,partials,data) { var helper; - return " \n"; },"5":function(container,depth0,helpers,partials,data) { var stack1, helper, options, alias1=depth0 != null ? depth0 : {}, alias2=helpers.helperMissing, alias3="function", buffer = - "
    "; + "
    "; stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : alias2),(options={"name":"kanjiLinks","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data}),(typeof helper === alias3 ? helper.call(alias1,options) : helper)); if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)} if (stack1 != null) { buffer += stack1; } @@ -281,7 +300,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial return container.escapeExpression(((helper = (helper = helpers.expression || (depth0 != null ? depth0.expression : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},{"name":"expression","hash":{},"data":data}) : helper))); },"8":function(container,depth0,helpers,partials,data) { var stack1, helper, options, buffer = - "
    "; + "
    "; stack1 = ((helper = (helper = helpers.kanjiLinks || (depth0 != null ? depth0.kanjiLinks : depth0)) != null ? helper : helpers.helperMissing),(options={"name":"kanjiLinks","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data}),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : {},options) : helper)); if (!helpers.kanjiLinks) { stack1 = helpers.blockHelperMissing.call(depth0,stack1,options)} if (stack1 != null) { buffer += stack1; } @@ -289,13 +308,13 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial },"10":function(container,depth0,helpers,partials,data) { var stack1; - return "
    \n" + return "
    \n" + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.reasons : depth0),{"name":"each","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n"; + + "
    \n"; },"11":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(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") @@ -323,13 +342,17 @@ templates['term-list.html'] = template({"1":function(container,depth0,helpers,pa },"2":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; - return ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "") - + "
    \n"; -},"4":function(container,depth0,helpers,partials,data) { + return " " + + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.first),{"name":"unless","hash":{},"fn":container.program(3, data, 0, blockParams, depths),"inverse":container.noop,"data":data})) != null ? stack1 : "") + + "\n" + + ((stack1 = container.invokePartial(partials["term.html"],depth0,{"name":"term.html","hash":{"playback":(depths[1] != null ? depths[1].playback : depths[1]),"addable":(depths[1] != null ? depths[1].addable : depths[1])},"data":data,"indent":" ","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : ""); +},"3":function(container,depth0,helpers,partials,data) { + return "
    "; +},"5":function(container,depth0,helpers,partials,data) { return "

    No results found

    \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) { var stack1; - return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(4, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); + return ((stack1 = helpers["if"].call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.definitions : depth0),{"name":"if","hash":{},"fn":container.program(1, data, 0, blockParams, depths),"inverse":container.program(5, data, 0, blockParams, depths),"data":data})) != null ? stack1 : ""); },"usePartial":true,"useData":true,"useDepths":true}); })(); \ No newline at end of file diff --git a/ext/fg/css/frame.css b/ext/fg/css/frame.css index bb3596dc..d1c3b405 100644 --- a/ext/fg/css/frame.css +++ b/ext/fg/css/frame.css @@ -110,6 +110,15 @@ body { right: 5px; } +hr { + background-color: #fff; + border: none; + border-top: 1px dotted #ccc; + margin-top: 0.8em; + margin-bottom: 0.8em; + height: 1px; +} + /* term styles */ .term-expression { diff --git a/tmpl/kanji-list.html b/tmpl/kanji-list.html index 0ee81463..1df22e68 100644 --- a/tmpl/kanji-list.html +++ b/tmpl/kanji-list.html @@ -1,6 +1,7 @@ {{#if definitions}} {{#each definitions}} - {{> kanji.html addable=../addable root=../root}} + {{#unless @first}}
    {{/unless}} + {{> kanji.html addable=../addable root=../root}} {{/each}} {{else}}

    No results found

    diff --git a/tmpl/kanji.html b/tmpl/kanji.html index a14fff78..bb4ce61f 100644 --- a/tmpl/kanji.html +++ b/tmpl/kanji.html @@ -1,7 +1,7 @@
    {{#if addable}} - + {{/if}}
    @@ -13,7 +13,7 @@ Kunyomi: {{#each kunyomi}} - {{.}}{{#unless @last}}, {{/unless}} + {{.}}{{#unless @last}}, {{/unless}} {{/each}} @@ -21,7 +21,7 @@ Onyomi: {{#each onyomi}} - {{.}}{{#unless @last}}, {{/unless}} + {{.}}{{#unless @last}}, {{/unless}} {{/each}} @@ -30,19 +30,19 @@
    {{#each tags}} - {{name}} + {{name}} {{/each}}
    {{#if glossary.[1]}} -
      - {{#each glossary}} -
    1. {{.}}
    2. - {{/each}} -
    +
      + {{#each glossary}} +
    1. {{.}}
    2. + {{/each}} +
    {{else}} -
    {{glossary.[0]}}
    +
    {{glossary.[0]}}
    {{/if}}
    diff --git a/tmpl/model.html b/tmpl/model.html index 94772316..acff44a0 100644 --- a/tmpl/model.html +++ b/tmpl/model.html @@ -9,7 +9,7 @@
    diff --git a/tmpl/term-grouped-list.html b/tmpl/term-grouped-list.html index d927abc4..4bc9406c 100644 --- a/tmpl/term-grouped-list.html +++ b/tmpl/term-grouped-list.html @@ -1,7 +1,7 @@ {{#if definitions}} {{#each definitions}} - {{> term-grouped.html addable=../addable playback=../playback}} -
    + {{#unless @first}}
    {{/unless}} + {{> term-grouped.html addable=../addable playback=../playback}} {{/each}} {{else}}

    No results found

    diff --git a/tmpl/term-grouped.html b/tmpl/term-grouped.html index 0de22bb9..93281ee9 100644 --- a/tmpl/term-grouped.html +++ b/tmpl/term-grouped.html @@ -1,33 +1,37 @@
    {{#if addable}} - - + + {{/if}} {{#if playback}} - + {{/if}}
    {{#if reading}} -
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}{{reading}}
    +
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}{{reading}}
    {{else}} -
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
    +
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
    {{/if}} {{#if reasons}} -
    - {{#each reasons}} - {{.}} {{#unless @last}}«{{/unless}} - {{/each}} -
    +
    + {{#each reasons}} + {{.}} {{#unless @last}}«{{/unless}} + {{/each}} +
    {{/if}}
    + {{#if definitions.[1]}}
      {{#each definitions}} -
    1. {{> term-definition.html}}
    2. +
    3. {{> term-definition.html}}
    4. {{/each}}
    + {{else}} + {{> term-definition.html definitions.[0]}} + {{/if}}
    diff --git a/tmpl/term-list.html b/tmpl/term-list.html index ab03c7c2..1315d132 100644 --- a/tmpl/term-list.html +++ b/tmpl/term-list.html @@ -1,7 +1,7 @@ {{#if definitions}} {{#each definitions}} - {{> term.html addable=../addable playback=../playback}} -
    + {{#unless @first}}
    {{/unless}} + {{> term.html addable=../addable playback=../playback}} {{/each}} {{else}}

    No results found

    diff --git a/tmpl/term.html b/tmpl/term.html index 59ac80df..0e19dbf4 100644 --- a/tmpl/term.html +++ b/tmpl/term.html @@ -1,26 +1,26 @@
    {{#if addable}} - - + + {{/if}} {{#if playback}} - + {{/if}}
    {{#if reading}} -
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}{{reading}}
    +
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}{{reading}}
    {{else}} -
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
    +
    {{#kanjiLinks}}{{expression}}{{/kanjiLinks}}
    {{/if}} {{#if reasons}} -
    - {{#each reasons}} - {{.}} {{#unless @last}}«{{/unless}} - {{/each}} -
    +
    + {{#each reasons}} + {{.}} {{#unless @last}}«{{/unless}} + {{/each}} +
    {{/if}}
    -- cgit v1.2.3