diff --git a/web/pdf_page_view.js b/web/pdf_page_view.js index f03a13512b3a2..a7cfe5631af29 100644 --- a/web/pdf_page_view.js +++ b/web/pdf_page_view.js @@ -532,7 +532,6 @@ var PDFPageView = (function PDFPageViewClosure() { // The rendered size of the canvas, relative to the size of canvasWrapper. canvas.style.width = (PRINT_OUTPUT_SCALE * 100) + '%'; - canvas.style.height = (PRINT_OUTPUT_SCALE * 100) + '%'; var cssScale = 'scale(' + (1 / PRINT_OUTPUT_SCALE) + ', ' + (1 / PRINT_OUTPUT_SCALE) + ')'; @@ -541,8 +540,6 @@ var PDFPageView = (function PDFPageViewClosure() { var printContainer = document.getElementById('printContainer'); var canvasWrapper = document.createElement('div'); - canvasWrapper.style.width = viewport.width + 'pt'; - canvasWrapper.style.height = viewport.height + 'pt'; canvasWrapper.appendChild(canvas); printContainer.appendChild(canvasWrapper); diff --git a/web/viewer.css b/web/viewer.css index b7826849f63be..898c7921bc05b 100644 --- a/web/viewer.css +++ b/web/viewer.css @@ -22,12 +22,14 @@ html { height: 100%; + width: 100%; /* Font size is needed to make the activity bar the correct size. */ font-size: 10px; } body { height: 100%; + width: 100%; background-color: #404040; background-image: url(images/texture.png); } @@ -1800,11 +1802,15 @@ html[dir='rtl'] #documentPropertiesOverlay .row > * { body[data-mozPrintCallback] #printContainer { display: block; } + #printContainer { + height: 100%; + } /* wrapper around (scaled) print canvas elements */ #printContainer > div { position: relative; top: 0; left: 0; + height: 100%; overflow: hidden; } #printContainer canvas { diff --git a/web/viewer.js b/web/viewer.js index a478e11e9a774..487d4cb5980ba 100644 --- a/web/viewer.js +++ b/web/viewer.js @@ -1166,10 +1166,6 @@ var PDFViewerApplication = { // Firefox incorrectly reports support for the other value. '@supports ((size:A4) and (size:1pt 1pt)) {' + '@page { size: ' + pageSize.width + 'pt ' + pageSize.height + 'pt;}' + - // The canvas and each ancestor node must have a height of 100% to make - // sure that each canvas is printed on exactly one page. - '#printContainer {height:100%}' + - '#printContainer > div {width:100% !important;height:100% !important;}' + '}'; body.appendChild(this.pageStyleSheet);