Merge remote-tracking branch 'folioreader-origin/master' into dev

hrishikesh-kadam · hrishikesh-kadam · commit 07bee5abb8b1 · 2018-12-10T14:08:35.000+05:30
Fix font-size issue in FolioReader#309
diff --git a/folioreader/src/main/assets/css/Style.css b/folioreader/src/main/assets/css/Style.css
@@ -298,7 +298,6 @@ body {
     hyphens: auto !important;
 }
 p, span, div {
-    font-size: 1rem;
     line-height: 1.5 !important;
 }
 @media only screen and (min-device-width: 600px) {

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,6 @@ body {`
`298`	`298`	`hyphens: auto !important;`
`299`	`299`	`}`
`300`	`300`	`p, span, div {`
`301`		`- font-size: 1rem;`
`302`	`301`	`line-height: 1.5 !important;`
`303`	`302`	`}`
`304`	`303`	`@media only screen and (min-device-width: 600px) {`