From 2797ad6638d5a5b12e90c8ad1c3132cd5a10ad29 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 17:12:33 +0100 Subject: [PATCH 1/3] no message --- bookmarklet.js | 13 ++++++++----- card.css | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 3835581..9d421fb 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -6,7 +6,7 @@ // YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard var global = {}; - global.version = "4.3.0"; + global.version = "4.3.1"; global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer"; global.isDev = document.currentScript == null; global.isProd = !global.isDev; @@ -378,10 +378,13 @@ var scaleHeight = cardMaxHeight / cardMinHeight ; var scale = Math.min(scaleWidth, scaleHeight, 1); - // scale down only - if (scale < 1) { - jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm"); - } + console.log("scaleRoot: " + scaleRoot + " scale: " + scale); + console.log("scaleWidth: " + scaleWidth + " scaleHeight: " + scaleHeight); + + + // scale + jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm"); + // size diff --git a/card.css b/card.css index 18ba7f8..e7afd60 100644 --- a/card.css +++ b/card.css @@ -73,10 +73,20 @@ body { width: 100%; padding: 0.5rem; min-width: 14.5rem; - min-height: 12.5rem; - border-color: LightGray; - border-style: dotted; - border-width: 0.03cm; + min-height: 8.65rem; + overflow: visible; +} +.card::after { + overflow: visible; + position: absolute; + top: 0rem; + left: 0rem; + content: ""; + width: calc(100% - 0.06cm); + height: calc(100% - 0.06cm); + border-color: LightGray; + border-style: dashed; + border-width: 0.06cm; } .card-content { position: relative; From ac2d6c8498b8605cd68412490a34743b810e6212 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 17:59:38 +0100 Subject: [PATCH 2/3] no message --- bookmarklet.js | 15 ++++++++++----- printPreview.html | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/bookmarklet.js b/bookmarklet.js index 9d421fb..b76d1d1 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -353,7 +353,14 @@ var printDocument = printWindow.document; var settings = global.settings; - var scaleRoot = settings.scale; + + var scaleRoot; + if(settings.scale < 0) { + scaleRoot = 1.0 / (1.0 - (settings.scale * 2.0)); + } else { + scaleRoot = 1.0 * (1.0 + (settings.scale * 2.0)); + } + var rowCount = settings.rowCount; var columnCount = settings.colCount; @@ -381,25 +388,23 @@ console.log("scaleRoot: " + scaleRoot + " scale: " + scale); console.log("scaleWidth: " + scaleWidth + " scaleHeight: " + scaleHeight); - // scale jQuery("html", printDocument).css("font-size", ( scaleRoot * scale ) + "cm"); - // size // size horizontal var style = document.createElement('style'); style.id = 'styleColumnCount'; style.type = 'text/css'; - style.innerHTML = ".card { width: calc( 100% / " + columnCount + " - 0.001px ); }" + style.innerHTML = ".card { width: calc( 100% / " + columnCount + " ); }" jQuery("head", printDocument).append(style); // size horizontal var style = document.createElement('style'); style.id = 'styleRowCount'; style.type = 'text/css'; - style.innerHTML = ".card { height: calc( 100% / " + rowCount + " - 0.001px ); }" + style.innerHTML = ".card { height: calc( 100% / " + rowCount + " ); }" jQuery("head", printDocument).append(style); } diff --git a/printPreview.html b/printPreview.html index bfda7cb..b59d8f5 100644 --- a/printPreview.html +++ b/printPreview.html @@ -18,7 +18,7 @@
x
Page Grid
-
Scale
+
Scale
Single Card Per Page
Hide Description
Hide Assignee
From 2d7656ba00140fb5e5014134a65d9e45fc8ca633 Mon Sep 17 00:00:00 2001 From: Bengt Brodersen Date: Fri, 27 Nov 2015 17:59:54 +0100 Subject: [PATCH 3/3] no message --- bookmarklet.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bookmarklet.js b/bookmarklet.js index b76d1d1..3477d46 100644 --- a/bookmarklet.js +++ b/bookmarklet.js @@ -6,7 +6,7 @@ // YouTrack: http://qoomon.myjetbrains.com/youtrack/dashboard var global = {}; - global.version = "4.3.1"; + global.version = "4.3.2"; global.issueTrackingUrl = "https://github.com/qoomon/Jira-Issue-Card-Printer"; global.isDev = document.currentScript == null; global.isProd = !global.isDev;