Merge pull request #199 from readium/normalize-fix

JayPanoz · web-flow · commit 6d4adffaddcd · 2025-10-31T12:51:04.000+01:00
Normalize fix
diff --git a/css/dist/ReadiumCSS-after.css b/css/dist/ReadiumCSS-after.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
@@ -214,7 +214,7 @@ body{
 }
 
 :root[style*="--USER__textAlign"] body,
-:root[style*="--USER__textAlign"] p:not(blockquote p):not(figcaption p):not(hgroup p),
+:root[style*="--USER__textAlign"] p:not([class*="title"]):not(blockquote p):not(figcaption p):not(header p):not(hgroup p):not(div:has(+ *) > h1 + p):not(div:has(+ *) > p:has(+ h1)),
 :root[style*="--USER__textAlign"] li,
 :root[style*="--USER__textAlign"] dd{
   text-align:var(--USER__textAlign) !important;
@@ -265,15 +265,15 @@ body{
   font-weight:normal !important;
 }
 
-:root[style*="AccessibleDfA"] *:not(code):not(var):not(kbd):not(samp),:root[style*="IA Writer Duospace"] *:not(code):not(var):not(kbd):not(samp),
-:root[style*="readium-a11y-on"] *:not(code):not(var):not(kbd):not(samp){
+:root[style*="AccessibleDfA"] body *:not(code):not(var):not(kbd):not(samp),:root[style*="IA Writer Duospace"] body *:not(code):not(var):not(kbd):not(samp),
+:root[style*="readium-a11y-on"] body *:not(code):not(var):not(kbd):not(samp){
   font-family:inherit !important;
   font-style:inherit !important;
   font-weight:inherit !important;
 }
 
-:root[style*="AccessibleDfA"] *,:root[style*="IA Writer Duospace"] *,
-:root[style*="readium-a11y-on"] *{
+:root[style*="AccessibleDfA"] body *,:root[style*="IA Writer Duospace"] body *,
+:root[style*="readium-a11y-on"] body *{
   text-decoration:none !important;
   font-variant-caps:normal !important;
   font-variant-numeric:normal !important;
diff --git a/css/dist/ReadiumCSS-before.css b/css/dist/ReadiumCSS-before.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/ReadiumCSS-default.css b/css/dist/ReadiumCSS-default.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git 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-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git 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-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git 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-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git 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-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git 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-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git 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-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/rtl/ReadiumCSS-after.css b/css/dist/rtl/ReadiumCSS-after.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
@@ -214,7 +214,7 @@ body{
 }
 
 :root[style*="--USER__textAlign"] body,
-:root[style*="--USER__textAlign"] p:not(blockquote p):not(figcaption p):not(hgroup p),
+:root[style*="--USER__textAlign"] p:not([class*="title"]):not(blockquote p):not(figcaption p):not(header p):not(hgroup p):not(div:has(+ *) > h1 + p):not(div:has(+ *) > p:has(+ h1)),
 :root[style*="--USER__textAlign"] li,
 :root[style*="--USER__textAlign"] dd{
   text-align:var(--USER__textAlign) !important;
diff --git a/css/dist/rtl/ReadiumCSS-before.css b/css/dist/rtl/ReadiumCSS-before.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/dist/rtl/ReadiumCSS-default.css b/css/dist/rtl/ReadiumCSS-default.css
@@ -1,5 +1,5 @@
 /*!
- * Readium CSS v.2.0.0-beta.19
+ * Readium CSS v.2.0.0-beta.20
  * Copyright (c) 2017–2025. Readium Foundation. All rights reserved.
  * Use of this source code is governed by a BSD-style license which is detailed in the
  * LICENSE file present in the project repository where this source code is maintained.
diff --git a/css/src/modules/user-settings-submodules/ReadiumCSS-a11yFont_pref.css b/css/src/modules/user-settings-submodules/ReadiumCSS-a11yFont_pref.css
@@ -27,16 +27,16 @@
 }
 
 /* Targeting everything except code. Note that Open Dyslexic has a monospaced font for code */
-:root:--a11y-font *:not(code):not(var):not(kbd):not(samp),
-:root:--a11y-normalize *:not(code):not(var):not(kbd):not(samp) {
+:root:--a11y-font body *:not(code):not(var):not(kbd):not(samp),
+:root:--a11y-normalize body *:not(code):not(var):not(kbd):not(samp) {
   font-family: inherit !important;
   font-weight: inherit !important;
   font-style: inherit !important;
 }
 
 /* Normalizing text-decoration, subs and sups */
-:root:--a11y-font *,
-:root:--a11y-normalize * {
+:root:--a11y-font body *,
+:root:--a11y-normalize body * {
   text-decoration: none !important;
   font-variant-caps: normal !important;
   font-variant-position: normal !important;
diff --git a/css/src/modules/user-settings-submodules/ReadiumCSS-textAlign_pref.css b/css/src/modules/user-settings-submodules/ReadiumCSS-textAlign_pref.css
@@ -11,7 +11,7 @@
 }
 
 :root[style*="--USER__textAlign"] body,
-:root[style*="--USER__textAlign"] p:not(blockquote p):not(figcaption p):not(hgroup p),
+:root[style*="--USER__textAlign"] p:not([class*="title"]):not(blockquote p):not(figcaption p):not(header p):not(hgroup p):not(div:has(+ *) > h1 + p):not(div:has(+ *) > p:has(+ h1)),
 :root[style*="--USER__textAlign"] li,
 :root[style*="--USER__textAlign"] dd {
   text-align: var(--USER__textAlign) !important;
diff --git 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-beta.19",
+  "version": "2.0.0-beta.20",
   "homepage": "https://github.com/readium/css",
   "license": "BSD-3-Clause",
   "keywords": [
@@ -52,7 +52,7 @@
     "build:vertical": "postcss css/src/ReadiumCSS-before-cjk-vertical.css -o css/dist/cjk-vertical/ReadiumCSS-before.css && postcss css/src/ReadiumCSS-default-cjk-vertical.css -o css/dist/cjk-vertical/ReadiumCSS-default.css && postcss css/src/ReadiumCSS-after-cjk-vertical.css -o css/dist/cjk-vertical/ReadiumCSS-after.css",
     "copyPatches": "copyfiles -u 2 css/src/ReadiumCSS-ebpaj_fonts_patch.css 'css/src/android-fonts-patch/android-fonts-patch.css' css/dist",
     "start": "node \"./server.js\"",
-    "test": "npm run build && npm start & backstop test && pkill -9 -f \"node ./server.js\" && echo '\nVisual Regression testing has been completed.\n'",
+    "test": "npm run build && (npm start & for i in {1..10}; do if curl -s http://localhost:8000 >/dev/null; then backstop test; pkill -f \"node ./server.js\"; echo '\\nVisual Regression testing has been completed.\\n'; exit 0; fi; sleep 1; done; echo 'Failed to start server'; exit 1)",
     "test:ref": "npm start & backstop reference && pkill -9 -f \"node ./server.js\" && echo '\nVisual Regression references have been generated.\n'",
     "test:approve": "backstop approve"
   }
