Remove shorthand for scrollPadding

JayPanoz · JayPanoz · commit 1293135a7b5d · 2025-06-30T16:09:04.000+02:00
It will not be used anyway, and is creating unintended side-effects. Adding build to test script because I got caught by the cache in the previous commit…
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.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -117,23 +117,19 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPadding"] body{
-  padding:var(--RS__scrollPadding) !important;
-}
-
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingTop"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingTop"] body{
   padding-top:var(--RS__scrollPaddingTop) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingBottom"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingBottom"] body{
   padding-bottom:var(--RS__scrollPaddingBottom) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingLeft"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingLeft"] body{
   padding-left:var(--RS__scrollPaddingLeft) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingRight"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingRight"] body{
   padding-right:var(--RS__scrollPaddingRight) !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.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -117,23 +117,19 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPadding"] body{
-  padding:var(--RS__scrollPadding) !important;
-}
-
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingTop"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingTop"] body{
   padding-top:var(--RS__scrollPaddingTop) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingBottom"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingBottom"] body{
   padding-bottom:var(--RS__scrollPaddingBottom) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingLeft"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingLeft"] body{
   padding-left:var(--RS__scrollPaddingLeft) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingRight"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingRight"] body{
   padding-right:var(--RS__scrollPaddingRight) !important;
 }
 
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.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -124,23 +124,19 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPadding"] body{
-  padding:var(--RS__scrollPadding) !important;
-}
-
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingTop"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingTop"] body{
   padding-top:var(--RS__scrollPaddingTop) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingBottom"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingBottom"] body{
   padding-bottom:var(--RS__scrollPaddingBottom) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingLeft"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingLeft"] body{
   padding-left:var(--RS__scrollPaddingLeft) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingRight"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingRight"] body{
   padding-right:var(--RS__scrollPaddingRight) !important;
 }
 
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.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -117,23 +117,19 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPadding"] body{
-  padding:var(--RS__scrollPadding) !important;
-}
-
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingTop"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingTop"] body{
   padding-top:var(--RS__scrollPaddingTop) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingBottom"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingBottom"] body{
   padding-bottom:var(--RS__scrollPaddingBottom) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingLeft"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingLeft"] body{
   padding-left:var(--RS__scrollPaddingLeft) !important;
 }
 
-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingRight"] body{
+:root[style*="readium-scroll-on"][style*="--RS__scrollPaddingRight"] body{
   padding-right:var(--RS__scrollPaddingRight) !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.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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
@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.16)
+ * Readium CSS (v. 2.0.0-beta.17)
  * 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-scroll_padding.css b/css/src/modules/ReadiumCSS-scroll_padding.css
@@ -9,26 +9,18 @@
    add it to the html element because it would break 100vh height 
    See https://github.com/readium/css/issues/98 */
 
-/* Shorthand */
-
-:root:--scroll-view[style~="--RS__scrollPadding"] body {
-  padding: var(--RS__scrollPadding) !important;
-}
-
-/* Specific */
-
-:root:--scroll-view[style~="--RS__scrollPaddingTop"] body {
+:root:--scroll-view[style*="--RS__scrollPaddingTop"] body {
   padding-top: var(--RS__scrollPaddingTop) !important;
 }
 
-:root:--scroll-view[style~="--RS__scrollPaddingBottom"] body {
+:root:--scroll-view[style*="--RS__scrollPaddingBottom"] body {
   padding-bottom: var(--RS__scrollPaddingBottom) !important;
 }
 
-:root:--scroll-view[style~="--RS__scrollPaddingLeft"] body {
+:root:--scroll-view[style*="--RS__scrollPaddingLeft"] body {
   padding-left: var(--RS__scrollPaddingLeft) !important;
 }
 
-:root:--scroll-view[style~="--RS__scrollPaddingRight"] body {
+:root:--scroll-view[style*="--RS__scrollPaddingRight"] body {
   padding-right: var(--RS__scrollPaddingRight) !important;
 }
diff --git a/docs/CSS19-api.md b/docs/CSS19-api.md
@@ -299,14 +299,6 @@ The default line-length when none is set by the user. It must be set in `rem` in
 
 * * *
 
-```
---RS__scrollPadding
-```
-
-The `padding` for the `body`.
-
-* * *
-
 ```
 --RS__scrollPaddingTop
 ```
diff --git a/docs/CSS28-migration_guide.md b/docs/CSS28-migration_guide.md
@@ -222,7 +222,6 @@ This can be useful if you want to get around safe area insets, or if you want to
 
 The 5 following custom properties are available:
 
-- `--RS__scrollPadding`
 - `--RS__scrollPaddingTop`
 - `--RS__scrollPaddingBottom`
 - `--RS__scrollPaddingLeft`
diff --git a/docs/ReadiumCSS_docs/OEBPS/Text/Section-019.xhtml b/docs/ReadiumCSS_docs/OEBPS/Text/Section-019.xhtml
@@ -273,12 +273,6 @@
 
         <hr/>
 
-        <pre><code>--RS__scrollPadding</code></pre>
-
-        <p>The <code>padding</code> for the <code>body</code>.</p>
-
-        <hr/>
-
         <pre><code>--RS__scrollPaddingTop</code></pre>
 
         <p>The <code>padding-top</code> for the <code>body</code>.</p>
diff --git a/docs/ReadiumCSS_docs/OEBPS/Text/Section-028.xhtml b/docs/ReadiumCSS_docs/OEBPS/Text/Section-028.xhtml
@@ -269,7 +269,6 @@ const sepiaBackground = sepiaMode.sepiaMode.RS__backgroundColor;</code></pre>
       <p>The 5 following custom properties are available:</p>
 
       <ul>
-        <li><code>--RS__scrollPadding</code></li>
         <li><code>--RS__scrollPaddingTop</code></li>
         <li><code>--RS__scrollPaddingBottom</code></li>
         <li><code>--RS__scrollPaddingLeft</code></li>
diff --git a/package-lock.json b/package-lock.json
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.16",
+  "version": "2.0.0-beta.17",
   "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 start & backstop test && pkill -9 -f \"node ./server.js\" && echo '\nVisual Regression testing has been completed.\n'",
+    "test": "npm run build && npm start & backstop test && pkill -9 -f \"node ./server.js\" && echo '\nVisual Regression testing has been completed.\n'",
     "test:ref": "npm start & backstop reference && pkill -9 -f \"node ./server.js\" && echo '\nVisual Regression references have been generated.\n'",
     "test:approve": "backstop approve"
   }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Readium CSS (v. 2.0.0-beta.16)`
	`2`	`+ * Readium CSS (v. 2.0.0-beta.17)`
`3`	`3`	`* Developers: Jiminy Panoz`
`4`	`4`	`* Copyright (c) 2017. Readium Foundation. All rights reserved.`
`5`	`5`	`* Use of this source code is governed by a BSD-style license which is detailed in the`
`@@ -117,23 +117,19 @@ body{`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`-:root[style*="readium-scroll-on"][style~="--RS__scrollPadding"] body{`
`121`		`- padding:var(--RS__scrollPadding) !important;`
`122`		`-}`
`123`		`-`
`124`		`-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingTop"] body{`
	`120`	`+:root[style="readium-scroll-on"][style="--RS__scrollPaddingTop"] body{`
`125`	`121`	`padding-top:var(--RS__scrollPaddingTop) !important;`
`126`	`122`	`}`
`127`	`123`
`128`		`-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingBottom"] body{`
	`124`	`+:root[style="readium-scroll-on"][style="--RS__scrollPaddingBottom"] body{`
`129`	`125`	`padding-bottom:var(--RS__scrollPaddingBottom) !important;`
`130`	`126`	`}`
`131`	`127`
`132`		`-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingLeft"] body{`
	`128`	`+:root[style="readium-scroll-on"][style="--RS__scrollPaddingLeft"] body{`
`133`	`129`	`padding-left:var(--RS__scrollPaddingLeft) !important;`
`134`	`130`	`}`
`135`	`131`
`136`		`-:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingRight"] body{`
	`132`	`+:root[style="readium-scroll-on"][style="--RS__scrollPaddingRight"] body{`
`137`	`133`	`padding-right:var(--RS__scrollPaddingRight) !important;`
`138`	`134`	`}`
`139`	`135`