Merge branch 'gh-pages' into develop

This commit is contained in:
Bengt Brodersen 2015-12-01 17:11:09 +01:00
commit 6b61082f8c
4 changed files with 19 additions and 18 deletions

BIN
CardExample.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 99 KiB

View File

@ -6,7 +6,7 @@
// YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard // YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard
var global = {}; var global = {};
global.version = "4.3.3"; global.version = "4.3.5";
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;
@ -165,7 +165,7 @@
function loadSettings(){ function loadSettings(){
var settings = global.settings = global.settings || {}; var settings = global.settings = global.settings || {};
settings.scale = parseFloat(readCookie("card_printer_scale")) || 1.0; settings.scale = parseFloat(readCookie("card_printer_scale")) || 0.0;
settings.rowCount = parseInt(readCookie("card_printer_row_count2")) || 2; settings.rowCount = parseInt(readCookie("card_printer_row_count2")) || 2;
settings.colCount = parseInt(readCookie("card_printer_column_count")) || 1; settings.colCount = parseInt(readCookie("card_printer_column_count")) || 1;
@ -344,7 +344,7 @@
var style = document.createElement('style'); var style = document.createElement('style');
style.id = 'styleSingleCardPage'; style.id = 'styleSingleCardPage';
style.type = 'text/css'; style.type = 'text/css';
style.innerHTML = ".card { page-break-after: always; float: none; }" style.innerHTML = ".card { page-break-after: always; float: none; margin-bottom: 0.5cm}"
jQuery("head", printDocument).append(style); jQuery("head", printDocument).append(style);
} }
} }

View File

@ -14,6 +14,7 @@ body {
margin: 0rem; margin: 0rem;
max-height: 100%; max-height: 100%;
max-width: 100%; max-width: 100%;
overflow: visible;
} }
.badge, .shadow { .badge, .shadow {
border-style: solid; border-style: solid;
@ -79,14 +80,14 @@ body {
.card::after { .card::after {
overflow: visible; overflow: visible;
position: absolute; position: absolute;
top: 0rem; top: -0.015rem;
left: 0rem; left: -0.015rem;
content: ""; content: "";
width: calc(100% - 0.06cm); width: calc(100% - 0.015cm);
height: calc(100% - 0.06cm); height: calc(100% - 0.015cm);
border-color: LightGray; border-color: LightGray;
border-style: dashed; border-style: dashed;
border-width: 0.06cm; border-width: 0.03cm;
} }
.card-content { .card-content {
position: relative; position: relative;
@ -244,7 +245,7 @@ body {
height: 2.2rem; height: 2.2rem;
border-radius: 50%; border-radius: 50%;
background-color: WHITESMOKE; background-color: WHITESMOKE;
//background-image: url(https://qoomon.github.io/Jira-Issue-Card-Printer/resources/icons/Person.png); background-image: url(https://www.colourbox.com/preview/10714847-evil-christmas-elf.jpg);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;
background-size: cover; background-size: cover;
@ -274,13 +275,12 @@ body {
line-height: 0.55rem; line-height: 0.55rem;
} }
.issue-epic-id { .issue-epic-id {
font-size: 0.5rem; font-size: 0.6rem;
font-weight: bold; font-weight: bold;
max-width: 1rem; max-width: 1rem;
} }
.issue-epic-name { .issue-epic-name {
margin-left: 0.1rem; font-size: 0.55rem;
font-size: 0.6rem;
font-weight: bold; font-weight: bold;
} }
.issue-due-date-box { .issue-due-date-box {
@ -326,5 +326,6 @@ body {
} }
.card { .card {
page-break-inside: avoid; page-break-inside: avoid;
margin: 0.0mm;
} }
} }

View File

@ -24,7 +24,7 @@
<div class="issue-attachment badge"></div> <div class="issue-attachment badge"></div>
<div class="issue-assignee badge"></div> <div class="issue-assignee badge"></div>
<div class="issue-epic-box badge"> <div class="issue-epic-box badge">
<span class="issue-epic-id"></span> <span class="issue-epic-id"></span><br>
<span class="issue-epic-name"></span> <span class="issue-epic-name"></span>
</div> </div>
</div> </div>