Merge branch 'gh-pages' into develop

This commit is contained in:
Bengt Brodersen 2015-11-27 10:29:27 +01:00
commit 11447fa192
4 changed files with 14 additions and 13 deletions

View File

@ -1,6 +1,6 @@
(function() { (function() {
var global = {}; var global = {};
global.version = "4.2.6"; global.version = "4.2.7";
global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer"; global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer";
global.isDev = document.currentScript == null; global.isDev = document.currentScript == null;
global.isProd = !global.isDev; global.isProd = !global.isDev;
@ -333,7 +333,7 @@
// scale // scale
// reset scale // reset scale
jQuery("html", printDocument).css("font-size", scaleRoot +"cm"); jQuery("html", printDocument).css("font-size", "1cm");
jQuery("#styleColumnCount", printDocument).remove(); jQuery("#styleColumnCount", printDocument).remove();
jQuery("#styleRowCount", printDocument).remove(); jQuery("#styleRowCount", printDocument).remove();
@ -458,6 +458,7 @@
writeCookie("card_printer_font_scale", jQuery(this).val()); writeCookie("card_printer_font_scale", jQuery(this).val());
global.settings.scale = jQuery(this).val(); global.settings.scale = jQuery(this).val();
console.log("global.settings.scale: " +global.settings.scale);
redrawCards(); redrawCards();
}); });

View File

@ -51,8 +51,8 @@ body {
} }
.author { .author {
color: DIMGREY; color: DIMGREY;
position: absolute; position: relative;
top: 0.5rem; top: 0.2rem;
left: calc(50% - 2rem); left: calc(50% - 2rem);
font-size: 0.8rem; font-size: 0.8rem;
overflow: visible; overflow: visible;
@ -60,7 +60,7 @@ body {
} }
.author > span:nth-of-type(2) { .author > span:nth-of-type(2) {
position: relative; position: relative;
top: 0.0rem; top: 0.1rem;
left: 0.65rem; left: 0.65rem;
font-size: 0.5em; font-size: 0.5em;
} }

View File

@ -5,6 +5,11 @@
<div class="issue-description"></div> <div class="issue-description"></div>
</div> </div>
<div class="card-header"> <div class="card-header">
<div class="author">
<span>qoomon.com</span>
<br>
<span>©BengtBrodersen</span>
</div>
<div class="issue-id badge"></div> <div class="issue-id badge"></div>
<div class="issue-id-fadeout"></div> <div class="issue-id-fadeout"></div>
<div class="issue-icon badge" type="story"></div> <div class="issue-icon badge" type="story"></div>
@ -24,9 +29,4 @@
</div> </div>
</div> </div>
</div> </div>
<div class="author">
<span>qoomon.com</span>
<br>
<span>©BengtBrodersen</span>
</div>
</div> </div>

View File

@ -13,9 +13,9 @@
</div> </div>
<div id="card-print-dialog-footer"> <div id="card-print-dialog-footer">
<div class="buttons"> <div class="buttons">
<label style="margin-right:10px; padding-right: 3px;"><input id="font-scale-range" type="range" min="0.5" max="2.0" step="0.01" style="width: 100px; position: relative; top: 2px; margin-right:5px;" value="1.0" />Scale</label> <label style="margin-right:10px; padding-right: 3px;"><input id="font-scale-range" type="range" min="0.5" max="1.0" step="0.01" value="1.0" style="width: 100px; position: relative; top: 2px; margin-right:5px;" />Scale</label>
<label style="margin-right:0px;"><input id="rowCount" type="text" class="text" maxlength="1" style="width: 10px;" value="2"/>x</label> <label style="margin-right:0px;"><input id="columnCount" type="text" class="text" maxlength="1" style="width: 10px;" value="1"/>x</label>
<label style="margin-right:10px;"><input id="columnCount" type="text" class="text" maxlength="1" style="width: 10px; margin-right:5px;" value="1"/>Page Grid</label> <label style="margin-right:10px;"><input id="rowCount" type="text" class="text" maxlength="1" style="width: 10px; margin-right:5px;" value="2"/>Page Grid</label>
<label style="margin-right:10px"><input id="single-card-page-checkbox" type="checkbox"/>Single Card Per Page</label> <label style="margin-right:10px"><input id="single-card-page-checkbox" type="checkbox"/>Single Card Per Page</label>
<label style="margin-right:10px"><input id="hide-description-checkbox" type="checkbox"/>Hide Description</label> <label style="margin-right:10px"><input id="hide-description-checkbox" type="checkbox"/>Hide Description</label>
<label style="margin-right:10px"><input id="hide-assignee-checkbox" type="checkbox"/>Hide Assignee</label> <label style="margin-right:10px"><input id="hide-assignee-checkbox" type="checkbox"/>Hide Assignee</label>