Skip to content

Commit 60db098

Browse files
JayPanozJayPanoz
authored
Merge pull request #173 from readium/beta-11
Beta 11: - Remove line-height compensation for a11y fonts and normalise - iPadOS Patch to fix zoom issues with desktop-class interventions
2 parents eddbd17 + 1f27f45 commit 60db098

34 files changed

Lines changed: 433 additions & 59 deletions

‎css/ReadiumCSS-config.css‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,7 @@
4545

4646
/* Direction i.e. ltr and rtl */
4747
@custom-selector :--ltr [dir="ltr"];
48-
@custom-selector :--rtl [dir="rtl"];
48+
@custom-selector :--rtl [dir="rtl"];
49+
50+
/* Patch for iPadOS */
51+
@custom-selector :--ipadOS-patch [style*="readium-iPadOSPatch-on"];

‎css/dist/ReadiumCSS-after.css‎

Lines changed: 64 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the
@@ -362,45 +362,38 @@ body{
362362

363363
:root[style*="readium-font-on"][style*="AccessibleDfA"]{
364364
font-family:AccessibleDfA, Verdana, Tahoma, "Trebuchet MS", sans-serif !important;
365-
--RS__lineHeightCompensation:1.167;
366365
}
367366

368367
:root[style*="readium-font-on"][style*="IA Writer Duospace"]{
369368
font-family:"IA Writer Duospace", Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, monospace !important;
370-
--RS__lineHeightCompensation:1.167;
371-
}
372-
373-
:root[style*="readium-font-on"][style*="readium-a11y-on"]{
374-
font-family:var(--USER__fontFamily) !important;
375-
--RS__lineHeightCompensation:1.167;
376369
}
377370

378371
:root[style*="readium-font-on"][style*="AccessibleDfA"],:root[style*="readium-font-on"][style*="IA Writer Duospace"],
379-
:root[style*="readium-font-on"][style*="readium-a11y-on"]{
372+
:root[style*="readium-a11y-on"]{
380373
font-style:normal !important;
381374
font-weight:normal !important;
382375
}
383376

384377
:root[style*="readium-font-on"][style*="AccessibleDfA"] *:not(code):not(var):not(kbd):not(samp),:root[style*="readium-font-on"][style*="IA Writer Duospace"] *:not(code):not(var):not(kbd):not(samp),
385-
:root[style*="readium-font-on"][style*="readium-a11y-on"] *:not(code):not(var):not(kbd):not(samp){
378+
:root[style*="readium-a11y-on"] *:not(code):not(var):not(kbd):not(samp){
386379
font-family:inherit !important;
387380
font-style:inherit !important;
388381
font-weight:inherit !important;
389382
}
390383

391384
:root[style*="readium-font-on"][style*="AccessibleDfA"] *,:root[style*="readium-font-on"][style*="IA Writer Duospace"] *,
392-
:root[style*="readium-font-on"][style*="readium-a11y-on"] *{
385+
:root[style*="readium-a11y-on"] *{
393386
text-decoration:none !important;
394387
font-variant-caps:normal !important;
395388
font-variant-numeric:normal !important;
396389
font-variant-position:normal !important;
397390
}
398391

399392
:root[style*="readium-font-on"][style*="AccessibleDfA"] sup,:root[style*="readium-font-on"][style*="IA Writer Duospace"] sup,
400-
:root[style*="readium-font-on"][style*="readium-a11y-on"] sup,
393+
:root[style*="readium-a11y-on"] sup,
401394
:root[style*="readium-font-on"][style*="AccessibleDfA"] sub,
402395
:root[style*="readium-font-on"][style*="IA Writer Duospace"] sub,
403-
:root[style*="readium-font-on"][style*="readium-a11y-on"] sub{
396+
:root[style*="readium-a11y-on"] sub{
404397
font-size:1rem !important;
405398
vertical-align:baseline !important;
406399
}
@@ -598,4 +591,62 @@ body{
598591
:root[style*="readium-normalize-on"][style*="--USER__typeScale"] h3{
599592
font-size:calc(1rem * var(--USER__typeScale)) !important;
600593
}
594+
}
595+
596+
:root[style*="readium-iPadOSPatch-on"] body{
597+
-webkit-text-size-adjust:none;
598+
}
599+
600+
:root[style*="readium-iPadOSPatch-on"] p,
601+
:root[style*="readium-iPadOSPatch-on"] h1,
602+
:root[style*="readium-iPadOSPatch-on"] h2,
603+
:root[style*="readium-iPadOSPatch-on"] h3,
604+
:root[style*="readium-iPadOSPatch-on"] h4,
605+
:root[style*="readium-iPadOSPatch-on"] h5,
606+
:root[style*="readium-iPadOSPatch-on"] h6,
607+
:root[style*="readium-iPadOSPatch-on"] li,
608+
:root[style*="readium-iPadOSPatch-on"] th,
609+
:root[style*="readium-iPadOSPatch-on"] td,
610+
:root[style*="readium-iPadOSPatch-on"] dt,
611+
:root[style*="readium-iPadOSPatch-on"] dd,
612+
:root[style*="readium-iPadOSPatch-on"] pre,
613+
:root[style*="readium-iPadOSPatch-on"] address,
614+
:root[style*="readium-iPadOSPatch-on"] details,
615+
:root[style*="readium-iPadOSPatch-on"] summary,
616+
:root[style*="readium-iPadOSPatch-on"] figcaption,
617+
:root[style*="readium-iPadOSPatch-on"] div:not(:has(p, h1, h2, h3, h4, h5, h6, li, th, td, dt, dd, pre, address, aside, details, figcaption, summary)),
618+
:root[style*="readium-iPadOSPatch-on"] aside:not(:has(p, h1, h2, h3, h4, h5, h6, li, th, td, dt, dd, pre, address, aside, details, figcaption, summary)){
619+
-webkit-text-zoom:reset;
620+
}
621+
622+
:root[style*="readium-iPadOSPatch-on"] abbr,
623+
:root[style*="readium-iPadOSPatch-on"] b,
624+
:root[style*="readium-iPadOSPatch-on"] bdi,
625+
:root[style*="readium-iPadOSPatch-on"] bdo,
626+
:root[style*="readium-iPadOSPatch-on"] cite,
627+
:root[style*="readium-iPadOSPatch-on"] code,
628+
:root[style*="readium-iPadOSPatch-on"] dfn,
629+
:root[style*="readium-iPadOSPatch-on"] em,
630+
:root[style*="readium-iPadOSPatch-on"] i,
631+
:root[style*="readium-iPadOSPatch-on"] kbd,
632+
:root[style*="readium-iPadOSPatch-on"] mark,
633+
:root[style*="readium-iPadOSPatch-on"] q,
634+
:root[style*="readium-iPadOSPatch-on"] rp,
635+
:root[style*="readium-iPadOSPatch-on"] rt,
636+
:root[style*="readium-iPadOSPatch-on"] ruby,
637+
:root[style*="readium-iPadOSPatch-on"] s,
638+
:root[style*="readium-iPadOSPatch-on"] samp,
639+
:root[style*="readium-iPadOSPatch-on"] small,
640+
:root[style*="readium-iPadOSPatch-on"] span,
641+
:root[style*="readium-iPadOSPatch-on"] strong,
642+
:root[style*="readium-iPadOSPatch-on"] sub,
643+
:root[style*="readium-iPadOSPatch-on"] sup,
644+
:root[style*="readium-iPadOSPatch-on"] time,
645+
:root[style*="readium-iPadOSPatch-on"] u,
646+
:root[style*="readium-iPadOSPatch-on"] var{
647+
-webkit-text-zoom:normal;
648+
}
649+
650+
:root[style*="readium-iPadOSPatch-on"] p:not(:has(b, cite, em, i, q, s, small, span, strong)):first-line{
651+
-webkit-text-zoom:normal;
601652
}

‎css/dist/ReadiumCSS-before.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the

‎css/dist/ReadiumCSS-default.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the

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

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the
@@ -501,4 +501,62 @@ body{
501501
:root[style*="readium-normalize-on"][style*="--USER__typeScale"] h3{
502502
font-size:calc(1rem * var(--USER__typeScale)) !important;
503503
}
504+
}
505+
506+
:root[style*="readium-iPadOSPatch-on"] body{
507+
-webkit-text-size-adjust:none;
508+
}
509+
510+
:root[style*="readium-iPadOSPatch-on"] p,
511+
:root[style*="readium-iPadOSPatch-on"] h1,
512+
:root[style*="readium-iPadOSPatch-on"] h2,
513+
:root[style*="readium-iPadOSPatch-on"] h3,
514+
:root[style*="readium-iPadOSPatch-on"] h4,
515+
:root[style*="readium-iPadOSPatch-on"] h5,
516+
:root[style*="readium-iPadOSPatch-on"] h6,
517+
:root[style*="readium-iPadOSPatch-on"] li,
518+
:root[style*="readium-iPadOSPatch-on"] th,
519+
:root[style*="readium-iPadOSPatch-on"] td,
520+
:root[style*="readium-iPadOSPatch-on"] dt,
521+
:root[style*="readium-iPadOSPatch-on"] dd,
522+
:root[style*="readium-iPadOSPatch-on"] pre,
523+
:root[style*="readium-iPadOSPatch-on"] address,
524+
:root[style*="readium-iPadOSPatch-on"] details,
525+
:root[style*="readium-iPadOSPatch-on"] summary,
526+
:root[style*="readium-iPadOSPatch-on"] figcaption,
527+
:root[style*="readium-iPadOSPatch-on"] div:not(:has(p, h1, h2, h3, h4, h5, h6, li, th, td, dt, dd, pre, address, aside, details, figcaption, summary)),
528+
:root[style*="readium-iPadOSPatch-on"] aside:not(:has(p, h1, h2, h3, h4, h5, h6, li, th, td, dt, dd, pre, address, aside, details, figcaption, summary)){
529+
-webkit-text-zoom:reset;
530+
}
531+
532+
:root[style*="readium-iPadOSPatch-on"] abbr,
533+
:root[style*="readium-iPadOSPatch-on"] b,
534+
:root[style*="readium-iPadOSPatch-on"] bdi,
535+
:root[style*="readium-iPadOSPatch-on"] bdo,
536+
:root[style*="readium-iPadOSPatch-on"] cite,
537+
:root[style*="readium-iPadOSPatch-on"] code,
538+
:root[style*="readium-iPadOSPatch-on"] dfn,
539+
:root[style*="readium-iPadOSPatch-on"] em,
540+
:root[style*="readium-iPadOSPatch-on"] i,
541+
:root[style*="readium-iPadOSPatch-on"] kbd,
542+
:root[style*="readium-iPadOSPatch-on"] mark,
543+
:root[style*="readium-iPadOSPatch-on"] q,
544+
:root[style*="readium-iPadOSPatch-on"] rp,
545+
:root[style*="readium-iPadOSPatch-on"] rt,
546+
:root[style*="readium-iPadOSPatch-on"] ruby,
547+
:root[style*="readium-iPadOSPatch-on"] s,
548+
:root[style*="readium-iPadOSPatch-on"] samp,
549+
:root[style*="readium-iPadOSPatch-on"] small,
550+
:root[style*="readium-iPadOSPatch-on"] span,
551+
:root[style*="readium-iPadOSPatch-on"] strong,
552+
:root[style*="readium-iPadOSPatch-on"] sub,
553+
:root[style*="readium-iPadOSPatch-on"] sup,
554+
:root[style*="readium-iPadOSPatch-on"] time,
555+
:root[style*="readium-iPadOSPatch-on"] u,
556+
:root[style*="readium-iPadOSPatch-on"] var{
557+
-webkit-text-zoom:normal;
558+
}
559+
560+
:root[style*="readium-iPadOSPatch-on"] p:not(:has(b, cite, em, i, q, s, small, span, strong)):first-line{
561+
-webkit-text-zoom:normal;
504562
}

‎css/dist/cjk-horizontal/ReadiumCSS-before.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the

‎css/dist/cjk-horizontal/ReadiumCSS-default.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the

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

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the
@@ -489,4 +489,62 @@ body{
489489
:root[style*="readium-normalize-on"][style*="--USER__typeScale"] h3{
490490
font-size:calc(1rem * var(--USER__typeScale)) !important;
491491
}
492+
}
493+
494+
:root[style*="readium-iPadOSPatch-on"] body{
495+
-webkit-text-size-adjust:none;
496+
}
497+
498+
:root[style*="readium-iPadOSPatch-on"] p,
499+
:root[style*="readium-iPadOSPatch-on"] h1,
500+
:root[style*="readium-iPadOSPatch-on"] h2,
501+
:root[style*="readium-iPadOSPatch-on"] h3,
502+
:root[style*="readium-iPadOSPatch-on"] h4,
503+
:root[style*="readium-iPadOSPatch-on"] h5,
504+
:root[style*="readium-iPadOSPatch-on"] h6,
505+
:root[style*="readium-iPadOSPatch-on"] li,
506+
:root[style*="readium-iPadOSPatch-on"] th,
507+
:root[style*="readium-iPadOSPatch-on"] td,
508+
:root[style*="readium-iPadOSPatch-on"] dt,
509+
:root[style*="readium-iPadOSPatch-on"] dd,
510+
:root[style*="readium-iPadOSPatch-on"] pre,
511+
:root[style*="readium-iPadOSPatch-on"] address,
512+
:root[style*="readium-iPadOSPatch-on"] details,
513+
:root[style*="readium-iPadOSPatch-on"] summary,
514+
:root[style*="readium-iPadOSPatch-on"] figcaption,
515+
:root[style*="readium-iPadOSPatch-on"] div:not(:has(p, h1, h2, h3, h4, h5, h6, li, th, td, dt, dd, pre, address, aside, details, figcaption, summary)),
516+
:root[style*="readium-iPadOSPatch-on"] aside:not(:has(p, h1, h2, h3, h4, h5, h6, li, th, td, dt, dd, pre, address, aside, details, figcaption, summary)){
517+
-webkit-text-zoom:reset;
518+
}
519+
520+
:root[style*="readium-iPadOSPatch-on"] abbr,
521+
:root[style*="readium-iPadOSPatch-on"] b,
522+
:root[style*="readium-iPadOSPatch-on"] bdi,
523+
:root[style*="readium-iPadOSPatch-on"] bdo,
524+
:root[style*="readium-iPadOSPatch-on"] cite,
525+
:root[style*="readium-iPadOSPatch-on"] code,
526+
:root[style*="readium-iPadOSPatch-on"] dfn,
527+
:root[style*="readium-iPadOSPatch-on"] em,
528+
:root[style*="readium-iPadOSPatch-on"] i,
529+
:root[style*="readium-iPadOSPatch-on"] kbd,
530+
:root[style*="readium-iPadOSPatch-on"] mark,
531+
:root[style*="readium-iPadOSPatch-on"] q,
532+
:root[style*="readium-iPadOSPatch-on"] rp,
533+
:root[style*="readium-iPadOSPatch-on"] rt,
534+
:root[style*="readium-iPadOSPatch-on"] ruby,
535+
:root[style*="readium-iPadOSPatch-on"] s,
536+
:root[style*="readium-iPadOSPatch-on"] samp,
537+
:root[style*="readium-iPadOSPatch-on"] small,
538+
:root[style*="readium-iPadOSPatch-on"] span,
539+
:root[style*="readium-iPadOSPatch-on"] strong,
540+
:root[style*="readium-iPadOSPatch-on"] sub,
541+
:root[style*="readium-iPadOSPatch-on"] sup,
542+
:root[style*="readium-iPadOSPatch-on"] time,
543+
:root[style*="readium-iPadOSPatch-on"] u,
544+
:root[style*="readium-iPadOSPatch-on"] var{
545+
-webkit-text-zoom:normal;
546+
}
547+
548+
:root[style*="readium-iPadOSPatch-on"] p:not(:has(b, cite, em, i, q, s, small, span, strong)):first-line{
549+
-webkit-text-zoom:normal;
492550
}

‎css/dist/cjk-vertical/ReadiumCSS-before.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the

‎css/dist/cjk-vertical/ReadiumCSS-default.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Readium CSS (v. 2.0.0-beta.10)
2+
* Readium CSS (v. 2.0.0-beta.11)
33
* Developers: Jiminy Panoz
44
* Copyright (c) 2017. Readium Foundation. All rights reserved.
55
* Use of this source code is governed by a BSD-style license which is detailed in the

0 commit comments

Comments
 (0)