Merge remote-tracking branch 'origin/master'

# Conflicts:
#	generator/js/cards.js

generator/css/cards.css

 .card {
     border: 2mm solid;
-    border-radius: 4px;
     box-sizing: border-box;
     position: relative;
     display: flex;
     flex-direction: column;
     font-family: 'Noto Sans', 'Myriad Pro', Calibri, Helvetica, Arial, sans-serif;
     font-size: 8pt;
+    overflow: hidden;
+}
+
+.card.rounded-corners {
+    border-radius: 4px;
 }
 
 .card-content-container {
     line-height: 18px;
     margin-bottom: 0.0em;
 }
+.card-inline-icon {
+    background-size: auto 80%;
+    background-repeat: no-repeat;
+    background-position: center center;
+    position: relative;
+    border-radius: 2mm;
+}
+
+.card-inline-icon.align-left {
+}
+
+.card-inline-icon.align-right {
+    margin-right: 0px;
+}
+
+.card-inline-icon.align-center {
+    left: 50%;
+}
+
 .card-property-line {
     text-indent: -1em;
     margin-left: 1em;

generator/generate.html

                             </select>
                         </div>
                     </div>
+                    <div class="form-group">
+                        <label for="rounded-corners" class="col-sm-4 control-label">Corners</label>
+                        <div class="col-sm-8">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" checked id="rounded-corners" data-option="rounded_corners" value="1"> Rounded card corners
+                                </label>
+                            </div>
+                        </div>
+                    </div>
                     <div class="form-group">
                         <label for="foreground-color" class="col-sm-4 control-label">Front color</label>
                         <div class="col-sm-8">

generator/js/cards.js

         card_arrangement: "doublesided",
         card_size: "25x35",
         card_count: null,
-        icon_inline: true
+        icon_inline: true,
+        rounded_corners: true
     };
 }
 
     return '<div class="card-element card-subtitle">' + subtitle + '</div>';
 }
 
+function card_element_inline_icon(params, card_data, options) {
+    var icon = params[0] || "";
+    var size = params[1] || "40";
+    var align = params[2] || "center";
+    var margin_left = 0;
+    var color = card_data_color_front(card_data, options);
+    if(align == "center") {
+        margin_left = (size/-2) + 'px';
+    }
+    else if (align == 'right') {
+        margin_left = 'auto';
+    }
+    return '<div class="card-element card-inline-icon align-' + align + ' icon-' + icon + '" style ="height:' + size + 'px; width: ' + size + 'px; margin-left: ' + margin_left + '; background-color: ' + color + '"></div>';
+}
+
 function card_element_picture(params, card_data, options) {
     var url = params[0] || "";
-	var height = params[1] || "";
+    var height = params[1] || "";
     return '<div class="card-element card-picture" style ="background-image: url(&quot;' + url + '&quot;); background-size: contain; background-position: center;background-repeat: no-repeat; height:' + height + 'px"></div>';
 }
 
     fill: card_element_fill,
     section: card_element_section,
     disabled: card_element_empty,
-	picture: card_element_picture
+    picture: card_element_picture,
+    icon: card_element_inline_icon
 };
 
 // ============================================================================
     var style_color = card_generate_color_style(color, options);
 
     var result = "";
-    result += '<div class="card card-size-' + options.card_size + '" ' + style_color + '>';
+    result += '<div class="card card-size-' + options.card_size + ' ' + (options.rounded_corners ? 'rounded-corners' : '') + '" ' + style_color + '>';
     result += card_element_icon(data, options);
     result += card_element_title(data, options);
     result += card_generate_contents(data.contents, data, options);
 	var icon = card_data_icon_back(data, options);
 
     var result = "";
-    result += '<div class="card card-size-' + options.card_size + '" ' + style_color + '>';
+    console.log('options.rounded_corners', options.rounded_corners);
+    result += '<div class="card card-size-' + options.card_size + ' ' + (options.rounded_corners ? 'rounded-corners' : '') + '" ' + style_color + '>';
     result += '  <div class="card-back" ' + background_style + '>';
 	if (!url)
 	{

generator/js/ui.js

 
 function ui_change_option() {
     var property = $(this).attr("data-option");
-    var value = $(this).val();
+    var value
+    if($(this).attr('type') == 'checkbox') {
+        value = $(this).is(':checked');
+    }
+    else {
+        value = $(this).val();
+    }
     card_options[property] = value;
     ui_render_selected_card();
-
 }
 
 function ui_change_card_title() {
     $("#card-arrangement").change(ui_change_option);
     $("#card-size").change(ui_change_option);
     $("#background-color").change(ui_change_option);
+    $("#rounded-corners").change(ui_change_option);
 
     $("#default-color").change(ui_change_default_color);
     $("#default-icon").change(ui_change_default_icon);