Skip to content

Commit 5b8aa61

Browse files
committed
Implement iOSPatch flag
1 parent 1293135 commit 5b8aa61

6 files changed

Lines changed: 27 additions & 6 deletions

File tree

css/ReadiumCSS-config.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@
5050
@custom-selector :--ltr [dir="ltr"];
5151
@custom-selector :--rtl [dir="rtl"];
5252

53-
/* Patch for iPadOS */
53+
/* Patch for iOS and iPadOS */
54+
@custom-selector :--iOS-patch [style*="readium-iOSPatch-on"];
5455
@custom-selector :--ipadOS-patch [style*="readium-iPadOSPatch-on"];

css/dist/ReadiumCSS-after.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,10 +421,14 @@ body{
421421
vertical-align:baseline !important;
422422
}
423423

424-
:root:not([style*="readium-deprecatedFontSize-on"])[style*="--USER__fontSize"] body{
424+
:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"])[style*="--USER__fontSize"] body{
425425
zoom:var(--USER__fontSize) !important;
426426
}
427427

428+
:root[style*="readium-iOSPatch-on"][style*="--USER__fontSize"] body{
429+
-webkit-text-size-adjust:var(--USER__fontSize) !important;
430+
}
431+
428432
@supports not (zoom: 1){
429433

430434
:root[style*="--USER__fontSize"]{

css/dist/cjk-horizontal/ReadiumCSS-after.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,14 @@ body{
349349
font-family:revert !important;
350350
}
351351

352-
:root:not([style*="readium-deprecatedFontSize-on"])[style*="--USER__fontSize"] body{
352+
:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"])[style*="--USER__fontSize"] body{
353353
zoom:var(--USER__fontSize) !important;
354354
}
355355

356+
:root[style*="readium-iOSPatch-on"][style*="--USER__fontSize"] body{
357+
-webkit-text-size-adjust:var(--USER__fontSize) !important;
358+
}
359+
356360
@supports not (zoom: 1){
357361

358362
:root[style*="--USER__fontSize"]{

css/dist/cjk-vertical/ReadiumCSS-after.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -334,10 +334,14 @@ body{
334334
font-family:revert !important;
335335
}
336336

337-
:root:not([style*="readium-deprecatedFontSize-on"])[style*="--USER__fontSize"] body{
337+
:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"])[style*="--USER__fontSize"] body{
338338
zoom:var(--USER__fontSize) !important;
339339
}
340340

341+
:root[style*="readium-iOSPatch-on"][style*="--USER__fontSize"] body{
342+
-webkit-text-size-adjust:var(--USER__fontSize) !important;
343+
}
344+
341345
@supports not (zoom: 1){
342346

343347
:root[style*="--USER__fontSize"]{

css/dist/rtl/ReadiumCSS-after.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,10 +363,14 @@ body{
363363
font-family:revert !important;
364364
}
365365

366-
:root:not([style*="readium-deprecatedFontSize-on"])[style*="--USER__fontSize"] body{
366+
:root:not([style*="readium-deprecatedFontSize-on"]):not([style*="readium-iOSPatch-on"])[style*="--USER__fontSize"] body{
367367
zoom:var(--USER__fontSize) !important;
368368
}
369369

370+
:root[style*="readium-iOSPatch-on"][style*="--USER__fontSize"] body{
371+
-webkit-text-size-adjust:var(--USER__fontSize) !important;
372+
}
373+
370374
@supports not (zoom: 1){
371375

372376
:root[style*="--USER__fontSize"]{

css/src/modules/user-settings-submodules/ReadiumCSS-fontSize_pref.css

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,14 @@
66
77
Repo: https://github.com/readium/css */
88

9-
:root:not(:--deprecated-font-size)[style*="--USER__fontSize"] body {
9+
:root:not(:--deprecated-font-size):not(:--iOS-patch)[style*="--USER__fontSize"] body {
1010
zoom: var(--USER__fontSize) !important;
1111
}
1212

13+
:root:--iOS-patch[style*="--USER__fontSize"] body {
14+
-webkit-text-size-adjust: var(--USER__fontSize) !important;
15+
}
16+
1317
/* Older deprecated implementation for when zoom is not supported
1418
or it is explicitly enabled because you don’t want the new one */
1519

0 commit comments

Comments
 (0)