From efb9f7f789bf80892805cfaca86bae6a541cc855 Mon Sep 17 00:00:00 2001 From: Jiminy Panoz Date: Thu, 7 Nov 2024 15:26:29 +0100 Subject: [PATCH 1/3] Change text-size-adjust to none --- css/dist/ReadiumCSS-after.css | 8 +++++--- css/dist/ReadiumCSS-before.css | 2 +- css/dist/ReadiumCSS-default.css | 2 +- css/dist/cjk-horizontal/ReadiumCSS-after.css | 8 +++++--- css/dist/cjk-horizontal/ReadiumCSS-before.css | 2 +- css/dist/cjk-horizontal/ReadiumCSS-default.css | 2 +- css/dist/cjk-vertical/ReadiumCSS-after.css | 8 +++++--- css/dist/cjk-vertical/ReadiumCSS-before.css | 2 +- css/dist/cjk-vertical/ReadiumCSS-default.css | 2 +- css/dist/rtl/ReadiumCSS-after.css | 8 +++++--- css/dist/rtl/ReadiumCSS-before.css | 2 +- css/dist/rtl/ReadiumCSS-default.css | 2 +- css/src/modules/ReadiumCSS-pagination-vertical.css | 6 +++++- css/src/modules/ReadiumCSS-pagination.css | 6 +++++- package.json | 2 +- 15 files changed, 39 insertions(+), 23 deletions(-) diff --git a/css/dist/ReadiumCSS-after.css b/css/dist/ReadiumCSS-after.css index 5b9090a..56e6b66 100644 --- a/css/dist/ReadiumCSS-after.css +++ b/css/dist/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -51,8 +51,8 @@ padding:0 !important; margin:0 !important; font-size:100% !important; - - -webkit-text-size-adjust:100%; + -webkit-text-size-adjust:none; + text-size-adjust:none; box-sizing:border-box; -webkit-touch-callout:none; } @@ -407,6 +407,8 @@ body{ } :root[style*="--USER__fontSize"]{ + -webkit-text-size-adjust:none; + zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/ReadiumCSS-before.css b/css/dist/ReadiumCSS-before.css index 2c16fe3..9df3908 100644 --- a/css/dist/ReadiumCSS-before.css +++ b/css/dist/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/ReadiumCSS-default.css b/css/dist/ReadiumCSS-default.css index e9918d4..a0e5f02 100644 --- a/css/dist/ReadiumCSS-default.css +++ b/css/dist/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-horizontal/ReadiumCSS-after.css b/css/dist/cjk-horizontal/ReadiumCSS-after.css index 4871a21..04dd820 100644 --- a/css/dist/cjk-horizontal/ReadiumCSS-after.css +++ b/css/dist/cjk-horizontal/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -51,8 +51,8 @@ padding:0 !important; margin:0 !important; font-size:100% !important; - - -webkit-text-size-adjust:100%; + -webkit-text-size-adjust:none; + text-size-adjust:none; box-sizing:border-box; -webkit-touch-callout:none; } @@ -309,6 +309,8 @@ body{ } :root[style*="--USER__fontSize"]{ + -webkit-text-size-adjust:none; + zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/cjk-horizontal/ReadiumCSS-before.css b/css/dist/cjk-horizontal/ReadiumCSS-before.css index b4bfa36..5e5c9b5 100644 --- a/css/dist/cjk-horizontal/ReadiumCSS-before.css +++ b/css/dist/cjk-horizontal/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-horizontal/ReadiumCSS-default.css b/css/dist/cjk-horizontal/ReadiumCSS-default.css index 2e0bc2c..2b78188 100644 --- a/css/dist/cjk-horizontal/ReadiumCSS-default.css +++ b/css/dist/cjk-horizontal/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-vertical/ReadiumCSS-after.css b/css/dist/cjk-vertical/ReadiumCSS-after.css index 638645f..6bc1af4 100644 --- a/css/dist/cjk-vertical/ReadiumCSS-after.css +++ b/css/dist/cjk-vertical/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -50,8 +50,8 @@ padding:0 !important; margin:0 !important; font-size:100% !important; - - -webkit-text-size-adjust:100%; + -webkit-text-size-adjust:none; + text-size-adjust:none; box-sizing:border-box; hanging-punctuation:last allow-end; @@ -296,6 +296,8 @@ body{ } :root[style*="--USER__fontSize"]{ + -webkit-text-size-adjust:none; + zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/cjk-vertical/ReadiumCSS-before.css b/css/dist/cjk-vertical/ReadiumCSS-before.css index 12633a4..76d7351 100644 --- a/css/dist/cjk-vertical/ReadiumCSS-before.css +++ b/css/dist/cjk-vertical/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-vertical/ReadiumCSS-default.css b/css/dist/cjk-vertical/ReadiumCSS-default.css index d9513f9..930f3c7 100644 --- a/css/dist/cjk-vertical/ReadiumCSS-default.css +++ b/css/dist/cjk-vertical/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/rtl/ReadiumCSS-after.css b/css/dist/rtl/ReadiumCSS-after.css index 7594380..3f1df53 100644 --- a/css/dist/rtl/ReadiumCSS-after.css +++ b/css/dist/rtl/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -51,8 +51,8 @@ padding:0 !important; margin:0 !important; font-size:100% !important; - - -webkit-text-size-adjust:100%; + -webkit-text-size-adjust:none; + text-size-adjust:none; box-sizing:border-box; -webkit-touch-callout:none; } @@ -322,6 +322,8 @@ body{ } :root[style*="--USER__fontSize"]{ + -webkit-text-size-adjust:none; + zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/rtl/ReadiumCSS-before.css b/css/dist/rtl/ReadiumCSS-before.css index b4bfa36..5e5c9b5 100644 --- a/css/dist/rtl/ReadiumCSS-before.css +++ b/css/dist/rtl/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/rtl/ReadiumCSS-default.css b/css/dist/rtl/ReadiumCSS-default.css index 03f9e7d..7f25277 100644 --- a/css/dist/rtl/ReadiumCSS-default.css +++ b/css/dist/rtl/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.5) + * Readium CSS (v. 2.0.0-alpha.6) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/src/modules/ReadiumCSS-pagination-vertical.css b/css/src/modules/ReadiumCSS-pagination-vertical.css index 66b2d25..fdca457 100644 --- a/css/src/modules/ReadiumCSS-pagination-vertical.css +++ b/css/src/modules/ReadiumCSS-pagination-vertical.css @@ -74,7 +74,11 @@ -moz-column-fill: auto; column-fill: auto; - -webkit-text-size-adjust: 100%; + /* This is needed so that zoom (used in the new implementation of font-size) + can work as expect on iPadOS. Indeed, it disables the desktop-class interference + that is explained here: https://stackoverflow.com/questions/59000766/css-zoom-does-not-work-ipad-os-v13-latest-safari/64998974#64998974 */ + -webkit-text-size-adjust: none; + text-size-adjust: none; /* The reason why we don’t force -webkit-column-axis is that it switches the column-box model to a paged overflow model. In other words, columns become useless, the sizing of the :root itself will be used for pagination */ diff --git a/css/src/modules/ReadiumCSS-pagination.css b/css/src/modules/ReadiumCSS-pagination.css index 99c49f5..029d906 100644 --- a/css/src/modules/ReadiumCSS-pagination.css +++ b/css/src/modules/ReadiumCSS-pagination.css @@ -81,7 +81,11 @@ -moz-column-fill: auto; column-fill: auto; - -webkit-text-size-adjust: 100%; + /* This is needed so that zoom (used in the new implementation of font-size) + can work as expect on iPadOS. Indeed, it disables the desktop-class interference + that is explained here: https://stackoverflow.com/questions/59000766/css-zoom-does-not-work-ipad-os-v13-latest-safari/64998974#64998974 */ + -webkit-text-size-adjust: none; + text-size-adjust: none; } body { diff --git a/package.json b/package.json index 0ed376d..c5fbf34 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "readium-css", "description": "A set of reference stylesheets for EPUB Reading Systems", - "version": "2.0.0-alpha.5", + "version": "2.0.0-alpha.6", "homepage": "https://github.com/readium/readium-css", "license": "BSD-3-Clause", "keywords": [ From 1c1d3efa78a80fd4a92297745c839e15548d707b Mon Sep 17 00:00:00 2001 From: Jiminy Panoz Date: Tue, 17 Dec 2024 10:45:40 +0100 Subject: [PATCH 2/3] Bump version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c5fbf34..06ef58a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "readium-css", "description": "A set of reference stylesheets for EPUB Reading Systems", - "version": "2.0.0-alpha.6", + "version": "2.0.0-alpha.9", "homepage": "https://github.com/readium/readium-css", "license": "BSD-3-Clause", "keywords": [ From 6cc5a45b200abe6e66c74fd4322e83a5e1650c7c Mon Sep 17 00:00:00 2001 From: Jiminy Panoz Date: Tue, 17 Dec 2024 10:47:28 +0100 Subject: [PATCH 3/3] Build to avoid conflicts --- css/dist/ReadiumCSS-after.css | 4 +--- css/dist/ReadiumCSS-before.css | 2 +- css/dist/ReadiumCSS-default.css | 2 +- css/dist/cjk-horizontal/ReadiumCSS-after.css | 4 +--- css/dist/cjk-horizontal/ReadiumCSS-before.css | 2 +- css/dist/cjk-horizontal/ReadiumCSS-default.css | 2 +- css/dist/cjk-vertical/ReadiumCSS-after.css | 4 +--- css/dist/cjk-vertical/ReadiumCSS-before.css | 2 +- css/dist/cjk-vertical/ReadiumCSS-default.css | 2 +- css/dist/rtl/ReadiumCSS-after.css | 4 +--- css/dist/rtl/ReadiumCSS-before.css | 2 +- css/dist/rtl/ReadiumCSS-default.css | 2 +- 12 files changed, 12 insertions(+), 20 deletions(-) diff --git a/css/dist/ReadiumCSS-after.css b/css/dist/ReadiumCSS-after.css index 56e6b66..dd2f813 100644 --- a/css/dist/ReadiumCSS-after.css +++ b/css/dist/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -407,8 +407,6 @@ body{ } :root[style*="--USER__fontSize"]{ - -webkit-text-size-adjust:none; - zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/ReadiumCSS-before.css b/css/dist/ReadiumCSS-before.css index 9df3908..3a44a34 100644 --- a/css/dist/ReadiumCSS-before.css +++ b/css/dist/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/ReadiumCSS-default.css b/css/dist/ReadiumCSS-default.css index a0e5f02..4f071d8 100644 --- a/css/dist/ReadiumCSS-default.css +++ b/css/dist/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-horizontal/ReadiumCSS-after.css b/css/dist/cjk-horizontal/ReadiumCSS-after.css index 04dd820..a599bf9 100644 --- a/css/dist/cjk-horizontal/ReadiumCSS-after.css +++ b/css/dist/cjk-horizontal/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -309,8 +309,6 @@ body{ } :root[style*="--USER__fontSize"]{ - -webkit-text-size-adjust:none; - zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/cjk-horizontal/ReadiumCSS-before.css b/css/dist/cjk-horizontal/ReadiumCSS-before.css index 5e5c9b5..c066283 100644 --- a/css/dist/cjk-horizontal/ReadiumCSS-before.css +++ b/css/dist/cjk-horizontal/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-horizontal/ReadiumCSS-default.css b/css/dist/cjk-horizontal/ReadiumCSS-default.css index 2b78188..eed078e 100644 --- a/css/dist/cjk-horizontal/ReadiumCSS-default.css +++ b/css/dist/cjk-horizontal/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-vertical/ReadiumCSS-after.css b/css/dist/cjk-vertical/ReadiumCSS-after.css index 6bc1af4..5db771b 100644 --- a/css/dist/cjk-vertical/ReadiumCSS-after.css +++ b/css/dist/cjk-vertical/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -296,8 +296,6 @@ body{ } :root[style*="--USER__fontSize"]{ - -webkit-text-size-adjust:none; - zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/cjk-vertical/ReadiumCSS-before.css b/css/dist/cjk-vertical/ReadiumCSS-before.css index 76d7351..5d41850 100644 --- a/css/dist/cjk-vertical/ReadiumCSS-before.css +++ b/css/dist/cjk-vertical/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/cjk-vertical/ReadiumCSS-default.css b/css/dist/cjk-vertical/ReadiumCSS-default.css index 930f3c7..9a3da7a 100644 --- a/css/dist/cjk-vertical/ReadiumCSS-default.css +++ b/css/dist/cjk-vertical/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/rtl/ReadiumCSS-after.css b/css/dist/rtl/ReadiumCSS-after.css index 3f1df53..a2e182b 100644 --- a/css/dist/rtl/ReadiumCSS-after.css +++ b/css/dist/rtl/ReadiumCSS-after.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the @@ -322,8 +322,6 @@ body{ } :root[style*="--USER__fontSize"]{ - -webkit-text-size-adjust:none; - zoom:var(--USER__fontSize) !important; } diff --git a/css/dist/rtl/ReadiumCSS-before.css b/css/dist/rtl/ReadiumCSS-before.css index 5e5c9b5..c066283 100644 --- a/css/dist/rtl/ReadiumCSS-before.css +++ b/css/dist/rtl/ReadiumCSS-before.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the diff --git a/css/dist/rtl/ReadiumCSS-default.css b/css/dist/rtl/ReadiumCSS-default.css index 7f25277..887b56e 100644 --- a/css/dist/rtl/ReadiumCSS-default.css +++ b/css/dist/rtl/ReadiumCSS-default.css @@ -1,5 +1,5 @@ /* - * Readium CSS (v. 2.0.0-alpha.6) + * Readium CSS (v. 2.0.0-alpha.9) * Developers: Jiminy Panoz * Copyright (c) 2017. Readium Foundation. All rights reserved. * Use of this source code is governed by a BSD-style license which is detailed in the