Styling

4 files changed, 31 insertions, 30 deletions

diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 7a1dcf28..341610ca 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -34,19 +34,17 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + 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)))
     + "</div>\n";
 },"5":function(container,depth0,helpers,partials,data) {
-    var stack1, helper, alias1=depth0 != null ? depth0 : {};
+    var stack1;
 
   return "<div class=\"rules\">\n"
-    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "    &laquo;\n    "
-    + container.escapeExpression(((helper = (helper = helpers.source || (depth0 != null ? depth0.source : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(alias1,{"name":"source","hash":{},"data":data}) : helper)))
-    + "\n</div>\n";
+    + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.rules : depth0),{"name":"each","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+    + "</div>\n";
 },"6":function(container,depth0,helpers,partials,data) {
     var stack1;
 
-  return "    "
+  return "    <span class=\"rule\">"
     + container.escapeExpression(container.lambda(depth0, depth0))
-    + " "
+    + "</span> "
     + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(7, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n";
 },"7":function(container,depth0,helpers,partials,data) {
@@ -58,15 +56,10 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + ((stack1 = helpers.each.call(depth0 != null ? depth0 : {},(depth0 != null ? depth0.tags : depth0),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "</div>\n";
 },"10":function(container,depth0,helpers,partials,data) {
-    var stack1;
-
-  return "    "
+    return "    <span class=\"tag\">"
     + container.escapeExpression(container.lambda(depth0, depth0))
-    + ((stack1 = helpers.unless.call(depth0 != null ? depth0 : {},(data && data.last),{"name":"unless","hash":{},"fn":container.program(11, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
-    + "\n";
-},"11":function(container,depth0,helpers,partials,data) {
-    return ",";
-},"13":function(container,depth0,helpers,partials,data) {
+    + "</span>\n";
+},"12":function(container,depth0,helpers,partials,data) {
     return "        <li><span>"
     + container.escapeExpression(container.lambda(depth0, depth0))
     + "</span></li>\n";
@@ -79,7 +72,7 @@ templates['term.html'] = template({"1":function(container,depth0,helpers,partial
     + "\n"
     + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.tags : depth0),{"name":"if","hash":{},"fn":container.program(9, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "\n<div class=\"glossary\">\n    <ol>\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 : "")
+    + ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(12, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
     + "    </ol>\n</div>\n";
 },"useData":true});
 })();
\ No newline at end of file
diff --git a/ext/fg/css/client.css b/ext/fg/css/client.css
index e55ce2fd..0262e820 100644
--- a/ext/fg/css/client.css
+++ b/ext/fg/css/client.css
@@ -18,13 +18,11 @@
 
 iframe.yomichan-popup {
     all:              initial;
-    background-color: #fff;
     border:           1px solid #999;
     box-shadow:       0 0 10px rgba(0, 0, 0, .5);
     height:           300px;
     width:            500px;
     resize:           both;
-    overflow-y:       auto;
     position:         fixed;
     visibility:       hidden;
     z-index:          256;
diff --git a/ext/fg/css/popup.css b/ext/fg/css/popup.css
index cef0a994..76c2589a 100644
--- a/ext/fg/css/popup.css
+++ b/ext/fg/css/popup.css
@@ -18,14 +18,16 @@
 
 body {
     background-color: #fff;
-    color:            #000;
-    font-family:      sans-serif;
-    font-size:        12pt;
+    color:            #333;
+    font-family:      helvetica neue,helvetica,arial,sans-serif;
+    font-size:        14px;
+    line-height:      1.42857143;
+    overflow-y:       auto;
 }
 
 .expression {
     font-family: serif;
-    font-size:   18pt;
+    font-size:   24px;
     display:     inline-block;
 }
 
@@ -34,12 +36,22 @@ body {
     display: inline-block;
 }
 
-.tags {
-    color: #777;
+.tag {
+    background-color: #777;
+    border-radius:    0.25em;
+    color:            #fff;
+    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;
 }
 
-.glossary {
-    font-size:   12pt;
+ol {
+    padding-left: 1.2em;
 }
 
 li {
diff --git a/util/tmpl/term.html b/util/tmpl/term.html
index 870b463c..6894dde3 100644
--- a/util/tmpl/term.html
+++ b/util/tmpl/term.html
@@ -7,17 +7,15 @@
 {{#if rules}}
 <div class="rules">
     {{#each rules}}
-    {{.}} {{#unless @last}}&laquo;{{/unless}}
+    <span class="rule">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
     {{/each}}
-    &laquo;
-    {{source}}
 </div>
 {{/if}}
 
 {{#if tags}}
 <div class="tags">
     {{#each tags}}
-    {{.}}{{#unless @last}},{{/unless}}
+    <span class="tag">{{.}}</span>
     {{/each}}
 </div>
 {{/if}}