style fixes

2 files changed, 23 insertions, 23 deletions

diff --git a/tmpl/kanji.html b/tmpl/kanji.html
index 3f6d8084..43c57aed 100644
--- a/tmpl/kanji.html
+++ b/tmpl/kanji.html
@@ -1,14 +1,14 @@
 {{#*inline "kanji"}}
-<div class="kanji-definition">
-    <div class="action-bar">
+<p>
+    <div class="actions">
         {{#if addable}}
             <a href="#" title="Add Kanji" class="action-add-note pending disabled" data-mode="kanji" data-index="{{@index}}"><img src="img/add_kanji.png"></a>
         {{/if}}
     </div>
 
-    <div class="kanji-glyph">{{character}}</div>
+    <div class="glyph">{{character}}</div>
 
-    <div class="kanji-reading">
+    <div class="reading">
         <table>
             <tr>
                 <th>Kunyomi:</th>
@@ -29,24 +29,24 @@
         </table>
     </div>
 
-    <div class="kanji-tags">
+    <div>
         {{#each tags}}
-            <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
+            <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
         {{/each}}
     </div>
 
-    <div class="kanji-glossary">
+    <div class="glossary">
         {{#if glossary.[1]}}
-            <ol "kanji-glossary-group">
+            <ol>
                 {{#each glossary}}
-                    <li><span class="kanji-glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
+                    <li><span class="glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
                 {{/each}}
             </ol>
         {{else}}
-            <div class="kanji-glossary-group kanji-glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
+            <div class="glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
         {{/if}}
     </div>
-</div>
+</p>
 {{/inline}}
 
 {{#if definitions}}
diff --git a/tmpl/terms.html b/tmpl/terms.html
index aae365c7..036aa465 100644
--- a/tmpl/terms.html
+++ b/tmpl/terms.html
@@ -1,25 +1,25 @@
 {{#*inline "definition"}}
     {{#if tags}}
-        <div class="term-tags">
+        <div>
             {{#each tags}}
-                <span class="tag tag-{{category}}" title="{{notes}}">{{name}}</span>
+                <span class="label label-default tag-{{category}}" title="{{notes}}">{{name}}</span>
             {{/each}}
         </div>
     {{/if}}
     {{#if glossary.[1]}}
-        <ul class="term-glossary-group">
+        <ul>
             {{#each glossary}}
-                <li><span class="term-glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
+                <li><span class="glossary-item">{{#multiLine}}{{.}}{{/multiLine}}</span></li>
             {{/each}}
         </ul>
     {{else}}
-        <div class="term-glossary-group term-glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
+        <div class="glossary-item">{{#multiLine}}{{glossary.[0]}}{{/multiLine}}</div>
     {{/if}}
 {{/inline}}
 
 {{#*inline "term"}}
-<div class="term-definition">
-    <div class="action-bar">
+<p>
+    <div class="actions">
         {{#if addable}}
             <a href="#" title="Add term as expression" class="action-add-note pending disabled" data-mode="term_kanji" data-index="{{@index}}"><img src="img/add_term_kanji.png"></a>
             <a href="#" title="Add term as reading" class="action-add-note pending disabled" data-mode="term_kana" data-index="{{@index}}"><img src="img/add_term_kana.png"></a>
@@ -30,20 +30,20 @@
     </div>
 
     {{#if reading}}
-        <div class="term-expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>
+        <div class="expression"><ruby>{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}<rt>{{reading}}</rt></ruby></div>
     {{else}}
-        <div class="term-expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
+        <div class="expression">{{#kanjiLinks}}{{expression}}{{/kanjiLinks}}</div>
     {{/if}}
 
     {{#if reasons}}
-        <div class="term-reasons">
+        <div class="reasons">
             {{#each reasons}}
                 <span class="reasons">{{.}}</span> {{#unless @last}}&laquo;{{/unless}}
             {{/each}}
         </div>
     {{/if}}
 
-    <div class="term-glossary">
+    <div class="glossary">
     {{#if grouped}}
         {{#if definitions.[1]}}
         <ol>
@@ -58,7 +58,7 @@
         {{> definition}}
     {{/if}}
     </div>
-</div>
+</p>
 {{/inline}}
 
 {{#if definitions}}