From 54e7d6b85fb421fdccf1689f90ce6a8b07bde2c0 Mon Sep 17 00:00:00 2001 From: Tarun Gupta Date: Mon, 29 Apr 2019 17:57:17 +0530 Subject: [PATCH 1/3] #942 Image and svg's max-width doesn't get set because of verticalPadding --- src/rendition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rendition.js b/src/rendition.js index 4137e92c0..2870322db 100644 --- a/src/rendition.js +++ b/src/rendition.js @@ -939,7 +939,7 @@ class Rendition { let computed = contents.window.getComputedStyle(contents.content, null); let height = (contents.content.offsetHeight - (parseFloat(computed.paddingTop) + parseFloat(computed.paddingBottom))) * .95; - let verticalPadding = parseFloat(computed.verticalPadding); + let verticalPadding = computed.paddingLeft + computed.paddingRight; contents.addStylesheetRules({ "img" : { From 87f5964e09d8dda9767e9475007980f638393e22 Mon Sep 17 00:00:00 2001 From: Tarun Gupta Date: Wed, 29 May 2019 14:27:35 +0530 Subject: [PATCH 2/3] #942 Renamed verticalPadding to horizontalPadding --- src/rendition.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/rendition.js b/src/rendition.js index 2870322db..70e41cadc 100644 --- a/src/rendition.js +++ b/src/rendition.js @@ -939,11 +939,11 @@ class Rendition { let computed = contents.window.getComputedStyle(contents.content, null); let height = (contents.content.offsetHeight - (parseFloat(computed.paddingTop) + parseFloat(computed.paddingBottom))) * .95; - let verticalPadding = computed.paddingLeft + computed.paddingRight; + let horizontalPadding = computed.paddingLeft + computed.paddingRight; contents.addStylesheetRules({ "img" : { - "max-width": (this._layout.columnWidth ? (this._layout.columnWidth - verticalPadding) + "px" : "100%") + "!important", + "max-width": (this._layout.columnWidth ? (this._layout.columnWidth - horizontalPadding) + "px" : "100%") + "!important", "max-height": height + "px" + "!important", "object-fit": "contain", "page-break-inside": "avoid", @@ -951,7 +951,7 @@ class Rendition { "box-sizing": "border-box" }, "svg" : { - "max-width": (this._layout.columnWidth ? (this._layout.columnWidth - verticalPadding) + "px" : "100%") + "!important", + "max-width": (this._layout.columnWidth ? (this._layout.columnWidth - horizontalPadding) + "px" : "100%") + "!important", "max-height": height + "px" + "!important", "page-break-inside": "avoid", "break-inside": "avoid" From ce81e9fcd074dc8144e6a783bcbaa35803b9dae0 Mon Sep 17 00:00:00 2001 From: Tarun Gupta Date: Wed, 5 Jun 2019 19:58:22 +0530 Subject: [PATCH 3/3] #942 Parsed the padding before adding as I found some books where these values are coming in as strings appended with px like "38px" --- src/rendition.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rendition.js b/src/rendition.js index 70e41cadc..557225331 100644 --- a/src/rendition.js +++ b/src/rendition.js @@ -939,7 +939,7 @@ class Rendition { let computed = contents.window.getComputedStyle(contents.content, null); let height = (contents.content.offsetHeight - (parseFloat(computed.paddingTop) + parseFloat(computed.paddingBottom))) * .95; - let horizontalPadding = computed.paddingLeft + computed.paddingRight; + let horizontalPadding = parseFloat(computed.paddingLeft) + parseFloat(computed.paddingRight); contents.addStylesheetRules({ "img" : {