From 662a260b5c9fa608c3fca949a7b64b84f0356532 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 14 Dec 2015 18:16:05 +0530
Subject: [PATCH] Use padding instead of margins for page margins in paged mode

---
 resources/compiled_coffeescript.zip         | Bin 104711 -> 104603 bytes
 src/calibre/ebooks/oeb/display/paged.coffee |  10 +++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/compiled_coffeescript.zip b/resources/compiled_coffeescript.zip
index f1d9889985ba14c49259ead20af0290a09d9505b..6d6d44a610b4a63ea6dda92527e80c89f4c87b89 100644
GIT binary patch
delta 2434
zcmb7GZ%k8H6z^$iDOD&)p=t--qOt-7X$vSTY*U9$9q1N~4nj!jA9$4hu@u3efw)EY
zVUoE!d&!)eE}6*|vp65hk|mogS)xuCNtTE(vusQJu%Vk%vk$ttbKfha;LJ7}UhaM8
z-rqgH^E>C<ci^<<$S0ap7fu^84-Kwg>CW@lcPJG6-=t6|*cgLs`rGMN6)9dp52<pg
zUp!JESV^ZhXeAM^k3YJ)JEL7z(&df_;iywb@Q;=b+i1(Mu|OcTq+D8#16*H*8{4Ao
zP9l&R4&o&A-QnB}v@{9L@?PBi)o`n5IdcGvb58Qv;_zReCF}kjS|}+gB7KrWgt%n~
zl8zC4#A2aOjTGhM@it<vttAa1kGE{?=KA`&hOI3Po1d#Ag@r_XWn{ZbO!+KVRgeC3
zScyN*AN{vUL%WrPBcU)pdw01y6M^xe6`|1@>F)GmgxbB{sFg$mxDwZi;m_T`f-geB
z4nlmP2(kQ6N<7jM<|EX&g_EMkCKl4rxzyzy2_0<mVp~Fq4p|8sN^$($;(2^qQ-`Dl
zoj19RPMtGR?da3X{RsrSj9^b7_+<n;BJ3Q^S98iuVr+DWHe*`9AjZ{7=)()uY-}?a
zX#K@S|0OjBFD^_)G_DyPD=>>!E}jST<267%999ybu}jv)a%v_i;Ps&m!7At%mx{#7
z%kOJAG*WT1<BecY;e;Od8`+gcNELIw9Z;o)T^^4RY@<i6KARZ-aCKc`TsmHy7&nib
z=<e~V)pHe`33DRhXJsWJUQe4hE{VkR;rEL)0av6=2#O1@se$HCSRPexCiY3{?VK=X
zAq#t4J)Q$tOYcmW*F2(~;~%v1CszyK%9B?1%+W+sC)d!8lRF9n_(m>hhit1zKn3J9
za5zzdZzfF|9_*%ocze>N%f>M#ekeR$;y7mm3!so5yip=me|fWHM@;ejjeY83D-i;&
zHZS%SA<#Bcbv~>glv#SjYmYWgS+bJlmiiIxpIV}wK8@a<!Y(%Dq}H1&opU8h`2RSC
z&;glhlX&80joLlCmSi^*ATxS&%#J5A=A|buM~Nh2GOn$Ovk$m>TY3afv>jj4hC73F
z%(Eypt{i=M$N1z-naz<(c5qi5T3mg%6lmz)Hf_8$JK4@GST6p4Z>u^-(t*1oMcYcG
z18MX90MCC}k-PV6=O{u~KUhLt54P+1M#)!H61@~JJh-6*C++!T<C#qGg5Kim4!Wa4
zC}?SkwhLW!bSRgpa$o`54`5*@0m|7yC8V*R0IV!s2}@Y964tYj5(qcs(b9bxY*-0}
zY@8eKDIuR$sWVyTYoKE#Dp*FZf0;=y`;08Cf)%)0&uSx})9x*@@bijBK2pKSG~U9b
zQb&@^lMcVKQ#p9RSPq!j8yQfS!fCL6J)U>eU&5B^VLR*7gPD~b0@KK+dN`(H;cRHE
zoI_{kF5%5J+8qg!1m9jO*)7}IWHyvCjRBUj;tgPAXO)o2UNC^3=53iz`<H2$V1RrU
zR6!bjMx82id(VKJO%9k(ufL?z#@Q6HD=ARM{xm?H-y4Zw!tk_DR6r6-9P&#>ZgE0e
zI~Garbnd%?T_{zsyR&opjdbtz2tiM%r_Alca*)kMWX~SF5G{#lnd!?L%(QQViIwL<
zlzos3YnRR~o|#6Js2-MOgdAS*_N2R(_Y+oQ1Pkv_4k?Es+);FGq{j%atIRD(F%(IT
zG4{qt1Q*B_=SZ3fUfrEO>obMD{T4K))a8NvrNZ)Kpk>*Ip&0hFrw_yPDZkX9DSrr)
z=|g;*^5Zs~-ipB!#x0xF8vMXf=<xTmQlU8dCMf<=_OZMnaMSb?I(Cb}nizu^$6U)k
zj=?52$UsX2E*<NNfm52XfgzZ0X>F~juC%w7x7w@A-7Z^orMF^LMTN)Xv9GGGs&YF#
c9+$1vUcQp`Gfar@C}gl}LzpB33>skX-xRg;z5oCK

delta 1712
zcmaKsdrZ?;6vsJ~woqsb^npB-UxAfZ=~^BlU{z4ahyz@vFlboU(H06V)KU<qOwl<O
z=ZxC{j?+z<an5DgRDLSaM38J*#$sX?v!NKD%lu=q%;8)Xox0l=m$^UI<hH+_-#Pc3
z@8_I*_Z}1VkBE*=j>O)7f1sjC9sk0q){qeYN(`aW0ho_}jx<nGKEz`izgO7V<aK)J
zS_NdF{&+U6=miBWb%78KJq4n`OCN$*L2+J?;g`qP&?Ya$@|h>P0qaFF95zY8f+tUM
z__IxpcjVgl#7d+NDW;C5a2BuKVdOL>6Ib0~v+I}FR8^H%ueMaztSINSTF$~Zjn)Y;
z`AuQkDr>Xdw!+!zaaq^v+pTUpXX4WTZA>qb@TX443CcX)4v&uW^mJQYI?mhWvg^3c
z7Q5Z2<9u%RB4D;Sb)2P@tv0q?_V(bnG5C{<Z)-U|bF2>N<0?o+hdF_+S3w$1k4q@3
z8e#<;XTd+lQ)y2JMB`VRvS{av5Gf3Zp&K2b#-3?4_Mc5;!VjEXf`|K-i8#(*7yi<h
z#1~Iggww^1prlJ%APPU6%<|`nCQl)QdU-M)-DX8FVN`7d?dpSAoKBg?*M9pAVClIm
zeCwPR_w-hXS+xvbKL5qJ10t4b)rCY_yd4txZ5R3l61Uac>}=2Rv7FYacr;9<ih?F=
zn5ua4_{mgO%ABLu+1%nwXQ<p<Hka<{NzW{iaDk5n?@ld5eWL=5*k?{t+HK8#_yM(M
zi?h-1hiiXO<M32Czx`quuv&Ir$_T&-Fv+Fge4xUso1&8fjhGA0HCtK(!B5f%rZo(e
z67uj&U%JfSxjD}~vjrW~Wo+NW(=XvGTa}QHU0btb{Y2+n^34_(+YI#+2L83ndWnDu
zrz5X}if+cR7T)+NJKA5c+0e+wAQ;6b+}a|HcC)$a)NxLCvyOAw9X|Z}b_RydByo)H
z{|*V27D6&=XR5K~h!(jkLfkharTsNfC}5kh6QSZ~XAHss29Yz6<{u7;0eGzRpxqB5
zP=a3!dS+GOLAb_7Ja$)u3ob?Bso4e^DuhJ*v`;SX4u&yI&&XLW7By!vTllqibAWF5
zvZMIf@6XYaA~uZU_cVOwy_G@<6RzXdIc>fcJi1VY@7}kE`4iE#7|>$!1C#o{i2THi
zjWkgSNuds7&~MegG^{=#l^UO7`RjvQp}44i0e|JuVW6@|Pz;WNcJLPHNez%kD*@(H
zD?qvbDT>Yj#L{=b^z6upqQ3yrC?%A6l!ihQSwdkkKD$MOk7~p;844M+L<y02?O^z5
zf&dOi;5*s``aTMN3{;Pel^QIroQE^z5_%|w65QApPB&$cfFHE!=nWavfrT#1KtmI|
zAZavC4#NULx7CZK^(q>Tg$7!d199}c0@A5V0UCU;MnRt|Aem0fKt@*;umI2R7UNQ(
zm^SYK38|H!C9@nNAQL}&sHM$HsFL|-hg~=RQ>5d1aF;0#v+8Ady*Hf1Dp1eUWUO<x
z+d9_in;cGd;c@L<E>|YEaU;f5Zle<_@UbE@)v%l${$d(dLm2XA6|;@1Aw%x(OJ0C?
zAOTLitQdW)hF$?~TP+_wlmHvnOP{*SNk0G$f@AZ6VvyZ4`v)L5Y&H)<D3KtM?hHUy
zSe=Re-9N}=ng$_DP+bf3cnxbo{~$z*BM?F!g>InpLr_O!1mWnmN@y!V326ydQe-W}
zP~8yhpmBsqa_@#5I!bKTq=zIFIRs^77z8Pe4KhJ@M#6O|#axQ5$x)DRv|Ed;4uh@0
p-c-2AYA_ZS6%`ib=H=!!8H~9$yW!PERysng9Uf%tli9w|`!~|GRagK3

diff --git a/src/calibre/ebooks/oeb/display/paged.coffee b/src/calibre/ebooks/oeb/display/paged.coffee
index 369724f0ae..9a8b9782a8 100644
--- a/src/calibre/ebooks/oeb/display/paged.coffee
+++ b/src/calibre/ebooks/oeb/display/paged.coffee
@@ -211,12 +211,12 @@ class PagedDisplay
         bs.setProperty('overflow', 'visible')
         bs.setProperty('height', this.current_page_height + 'px')
         bs.setProperty('width', (window.innerWidth - 2*sm)+'px')
-        bs.setProperty('margin-top', this.effective_margin_top + 'px')
-        bs.setProperty('margin-bottom', this.effective_margin_bottom+'px')
-        bs.setProperty('margin-left', sm+'px')
-        bs.setProperty('margin-right', sm+'px')
+        bs.setProperty('padding-top', this.effective_margin_top + 'px')
+        bs.setProperty('padding-bottom', this.effective_margin_bottom+'px')
+        bs.setProperty('padding-left', sm+'px')
+        bs.setProperty('padding-right', sm+'px')
         for edge in ['left', 'right', 'top', 'bottom']
-            bs.setProperty('padding-'+edge, '0px')
+            bs.setProperty('margin-'+edge, '0px')
             bs.setProperty('border-'+edge+'-width', '0px')
         bs.setProperty('min-width', '0')
         bs.setProperty('max-width', 'none')