Fixes #58

Waxolunist · Jun 20, 2014 · a5422d8 · a5422d8
1 parent f29c826
commit a5422d8
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/src/templates/blockquote.hbs b/src/templates/blockquote.hbs
@@ -1,5 +1,5 @@
 <li>
-  <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="formatBlock" data-wysihtml5-command-value="blockquote" data-wysihtml5-display-format-name="false" tabindex="-1">
+  <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="formatBlock" data-wysihtml5-command-value="blockquote" data-wysihtml5-display-format-name="false" tabindex="-1">
     {{#if options.toolbar.fa}} 
       <span class="fa fa-quote-left"></span>
     {{else}}

diff --git a/src/templates/color.hbs b/src/templates/color.hbs
@@ -1,5 +1,5 @@
 <li class="dropdown">
-  <a class="btn btn-default dropdown-toggle {{#if options.size}}btn-{{options.size}}{{/if}}" data-toggle="dropdown" tabindex="-1">
+  <a class="btn btn-default dropdown-toggle {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}}" data-toggle="dropdown" tabindex="-1">
     <span class="current-color">{{locale.colours.black}}</span>
     <b class="caret"></b>
   </a>

diff --git a/src/templates/emphasis.hbs b/src/templates/emphasis.hbs
@@ -1,10 +1,10 @@
 <li>
   <div class="btn-group">
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="bold" title="CTRL+B" tabindex="-1">{{locale.emphasis.bold}}</a>
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="italic" title="CTRL+I" tabindex="-1">{{locale.emphasis.italic}}</a>
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="underline" title="CTRL+U" tabindex="-1">{{locale.emphasis.underline}}</a>
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="bold" title="CTRL+B" tabindex="-1">{{locale.emphasis.bold}}</a>
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="italic" title="CTRL+I" tabindex="-1">{{locale.emphasis.italic}}</a>
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="underline" title="CTRL+U" tabindex="-1">{{locale.emphasis.underline}}</a>
     {{#if options.toolbar.emphasis.small}}
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="small" title="CTRL+S" tabindex="-1">{{locale.emphasis.small}}</a>
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="small" title="CTRL+S" tabindex="-1">{{locale.emphasis.small}}</a>
     {{/if}}
   </div>
 </li>
diff --git a/src/templates/font-styles.hbs b/src/templates/font-styles.hbs
@@ -1,5 +1,5 @@
 <li class="dropdown">
-  <a class="btn btn-default dropdown-toggle {{#if options.size}}btn-{{options.size}}{{/if}}" data-toggle="dropdown">
+  <a class="btn btn-default dropdown-toggle {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}}" data-toggle="dropdown">
     {{#if options.toolbar.fa}}
       <span class="fa fa-font"></span>
     {{else}}

diff --git a/src/templates/html.hbs b/src/templates/html.hbs
@@ -1,6 +1,6 @@
 <li>
   <div class="btn-group">
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-action="change_view" title="{{locale.html.edit}}" tabindex="-1">
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-action="change_view" title="{{locale.html.edit}}" tabindex="-1">
       {{#if options.toolbar.fa}}
         <span class="fa fa-pencil"></span>
       {{else}}

diff --git a/src/templates/image.hbs b/src/templates/image.hbs
@@ -16,7 +16,7 @@
       </div>
     </div>
   </div>
-  <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="insertImage" title="{{locale.image.insert}}" tabindex="-1">
+  <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="insertImage" title="{{locale.image.insert}}" tabindex="-1">
     {{#if options.toolbar.fa}}
       <span class="fa fa-file-image-o"></span>
     {{else}}

diff --git a/src/templates/link.hbs b/src/templates/link.hbs
@@ -17,7 +17,7 @@
       </div>
     </div>
   </div>
-  <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="createLink" title="{{locale.link.insert}}" tabindex="-1">
+  <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="createLink" title="{{locale.link.insert}}" tabindex="-1">
     {{#if options.toolbar.fa}}
       <span class="fa fa-share-square-o"></span>
     {{else}}

diff --git a/src/templates/lists.hbs b/src/templates/lists.hbs
@@ -1,27 +1,27 @@
 <li>
   <div class="btn-group">
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="insertUnorderedList" title="{{locale.lists.unordered}}" tabindex="-1">
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="insertUnorderedList" title="{{locale.lists.unordered}}" tabindex="-1">
     {{#if options.toolbar.fa}}
       <span class="fa fa-list-ul"></span>
     {{else}}
       <span class="glyphicon glyphicon-list"></span>
     {{/if}}
     </a>
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="insertOrderedList" title="{{locale.lists.ordered}}" tabindex="-1">
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="insertOrderedList" title="{{locale.lists.ordered}}" tabindex="-1">
     {{#if options.toolbar.fa}}
       <span class="fa fa-list-ol"></span>
     {{else}}
       <span class="glyphicon glyphicon-th-list"></span>
     {{/if}}
     </a>
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="Outdent" title="{{locale.lists.outdent}}" tabindex="-1">
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="Outdent" title="{{locale.lists.outdent}}" tabindex="-1">
     {{#if options.toolbar.fa}}
       <span class="fa fa-outdent"></span>
     {{else}}
       <span class="glyphicon glyphicon-indent-right"></span>
     {{/if}}
     </a>
-    <a class="btn {{#if options.size}}btn-{{options.size}}{{/if}} btn-default" data-wysihtml5-command="Indent" title="{{locale.lists.indent}}" tabindex="-1">
+    <a class="btn {{#if options.toolbar.size}}btn-{{options.toolbar.size}}{{/if}} btn-default" data-wysihtml5-command="Indent" title="{{locale.lists.indent}}" tabindex="-1">
     {{#if options.toolbar.fa}}
       <span class="fa fa-indent"></span>
     {{else}}