summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/bg/js/templates.js6
-rw-r--r--ext/mixed/css/display.css12
-rw-r--r--tmpl/terms.html8
3 files changed, 15 insertions, 11 deletions
diff --git a/ext/bg/js/templates.js b/ext/bg/js/templates.js
index 9f72e661..a0b518b2 100644
--- a/ext/bg/js/templates.js
+++ b/ext/bg/js/templates.js
@@ -218,7 +218,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
+ ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.definitionTags : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</div>\n";
},"3":function(container,depth0,helpers,partials,data) {
- return "style=\"display: inline-block;\"";
+ return "class=\"compact-info\"";
},"5":function(container,depth0,helpers,partials,data) {
var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression;
@@ -254,7 +254,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
+ ((stack1 = helpers.each.call(alias1,(depth0 != null ? depth0.glossary : depth0),{"name":"each","hash":{},"fn":container.program(14, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "")
+ "</ul>\n";
},"12":function(container,depth0,helpers,partials,data) {
- return "class=\"compact\"";
+ return "class=\"compact-glossary\"";
},"14":function(container,depth0,helpers,partials,data) {
var stack1, helper, options, buffer =
" <li><span class=\"glossary-item\">";
@@ -274,7 +274,7 @@ templates['terms.html'] = template({"1":function(container,depth0,helpers,partia
if (stack1 != null) { buffer += stack1; }
return buffer + "</div>\n";
},"18":function(container,depth0,helpers,partials,data) {
- return "compact";
+ return "compact-glossary";
},"20":function(container,depth0,helpers,partials,data) {
var stack1;
diff --git a/ext/mixed/css/display.css b/ext/mixed/css/display.css
index b31774f9..eadb9dae 100644
--- a/ext/mixed/css/display.css
+++ b/ext/mixed/css/display.css
@@ -177,21 +177,25 @@ hr {
display: inline-block;
}
+.compact-info {
+ display: inline-block;
+}
+
.glossary ol, .glossary ul {
padding-left: 1.4em;
}
-.glossary ul.compact {
+.glossary ul.compact-glossary {
display: inline;
list-style: none;
padding-left: 0px;
}
-.glossary .compact li {
+.glossary .compact-glossary li {
display: inline;
}
-.glossary .compact li:not(:first-child):before {
+.glossary .compact-glossary li:not(:first-child):before {
content: " | ";
}
@@ -203,7 +207,7 @@ hr {
color: #000;
}
-div.glossary-item.compact {
+div.glossary-item.compact-glossary {
display: inline;
}
diff --git a/tmpl/terms.html b/tmpl/terms.html
index b5b1325d..09441e72 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -1,13 +1,13 @@
{{#*inline "definition"}}
{{#if definitionTags}}
-<div {{#if compactGlossaries}}style="display: inline-block;"{{/if}}>
+<div {{#if compactGlossaries}}class="compact-info"{{/if}}>
{{#each definitionTags}}
<span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
{{/each}}
</div>
{{/if}}
{{#if only}}
-<div {{#if compactGlossaries}}style="display: inline-block;"{{/if}}>
+<div {{#if compactGlossaries}}class="compact-info"{{/if}}>
(
{{~#each only~}}
{{{.}}}{{#unless @last}}, {{/unless}}
@@ -16,13 +16,13 @@
</div>
{{/if}}
{{#if glossary.[1]}}
-<ul {{#if compactGlossaries}}class="compact"{{/if}}>
+<ul {{#if compactGlossaries}}class="compact-glossary"{{/if}}>
{{#each glossary}}
<li><span class="glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
{{/each}}
</ul>
{{else}}
-<div class="glossary-item {{#if compactGlossaries}}compact{{/if}}">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
+<div class="glossary-item {{#if compactGlossaries}}compact-glossary{{/if}}">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
{{/if}}
{{/inline}}