More UI tweaks

generator/generate.html

@@ -83,18 +83,18 @@
                 <h3>Default values</h3>
                 <form role="form" class="form-horizontal">
                     <div class="form-group">
-                        <label for="small-icons" class="col-sm-3 control-label">Icon</label>
-                        <div class="col-sm-9">
+                        <label for="small-icons" class="col-sm-2 control-label">Icon</label>
+                        <div class="col-sm-10">
                             <div class="checkbox">
                                 <label>
-                                    <input type="checkbox" checked id="small-icons"> Use small icons on the front
+                                    <input type="checkbox" checked id="small-icons"> Use small front icons
                                 </label>
                             </div>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="default-color" class="col-sm-3 control-label">Color</label>
-                        <div class="col-sm-9">
+                        <label for="default-color" class="col-sm-2 control-label">Color</label>
+                        <div class="col-sm-10">
                             <div class="input-group">
                                 <select id="default_color_selector" class="colorselector-data"></select>
                                 <input type="text" id="default-color" class="form-control" placeholder="Card color" data-property="color">
@@ -102,14 +102,8 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label"></label>
-                        <div class="col-sm-9">
-                            <button type="button" class="btn btn-primary btn-block" id="button-apply-color">Apply color to all cards</button>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="default-icon" class="col-sm-3 control-label">Icon</label>
-                        <div class="col-sm-9">
+                        <label for="default-icon" class="col-sm-2 control-label">Icon</label>
+                        <div class="col-sm-10">
                             <div class="input-group">
                                 <span class="input-group-btn">
                                     <button class="btn btn-default icon-select-button" type="button">Search</button>
@@ -119,28 +113,30 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label"></label>
-                        <div class="col-sm-9">
-                            <button type="button" class="btn btn-primary btn-block" id="button-apply-icon">Apply icon to all cards</button>
+                        <label for="default-title-size" class="col-sm-2 control-label">Title</label>
+                        <div class="col-sm-10">
+                            <select class="form-control" id="default-title-size">
+                                <option value="big">big font</option>
+                                <option value="normal" selected>normal font</option>
+                                <option value="small">small font</option>
+                                <option value="tiny">tiny font</option>
+                            </select>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label class="col-sm-3 control-label"></label>
-                        <div class="col-sm-9">
-                            <button type="button" class="btn btn-primary btn-block" id="button-apply-icon-back">Apply icon to all backs</button>
+                        <div class="col-sm-6">
+                            <button type="button" class="btn btn-primary btn-block" id="button-apply-color">Apply color</button>
+                        </div>
+                        <div class="col-sm-6">
+                            <button type="button" class="btn btn-primary btn-block" id="button-apply-font">Apply title font</button>
                         </div>
                     </div>
                     <div class="form-group">
-                        <label for="default-title-size" class="col-sm-3 control-label">Title</label>
-                        <div class="col-sm-9">
-                            <div class="input-group">
-                                <select class="form-control" id="default-title-size">
-                                    <option value="big">big font</option>
-                                    <option value="normal" selected>normal font</option>
-                                    <option value="small">small font</option>
-                                    <option value="tiny">tiny font</option>
-                                </select>
-                            </div>
+                        <div class="col-sm-6">
+                            <button type="button" class="btn btn-primary btn-block" id="button-apply-icon">Apply icon</button>
+                        </div>
+                        <div class="col-sm-6">
+                            <button type="button" class="btn btn-primary btn-block" id="button-apply-icon-back">Apply back icon</button>
                         </div>
                     </div>
                 </form>

generator/js/ui.js

@@ -84,7 +84,7 @@ function ui_delete_card() {
 }
 
 function ui_update_card_list() {
-    $("#total_card_count").text("Deck contains " + card_data.length + " cards.");
+    $("#total_card_count").text("Deck contains " + card_data.length + " unique cards.");
 
     $('#selected-card').empty();
     for (var i = 0; i < card_data.length; ++i) {