Correct scrollPadding attr selectors

JayPanoz · JayPanoz · commit 283c07a3995b · 2025-06-30T15:43:24.000+02:00
Oversight on my part since the attribute selector was checking root contains at least one occurrence of value within the string, which means setting any value would accidentaly enable global scrollPadding with an undefined value. This would consequently override pageGutter for instance.
Switched to whitespace-separated list of words, one of which is exactly value.
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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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,23 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style*="--RS__scrollPadding"] 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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,23 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style*="--RS__scrollPadding"] 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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,23 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style*="--RS__scrollPadding"] 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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,23 @@ body{
   }
 }
 
-:root[style*="readium-scroll-on"][style*="--RS__scrollPadding"] 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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.15)
+ * Readium CSS (v. 2.0.0-beta.16)
  * 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
@@ -11,24 +11,24 @@
 
 /* Shorthand */
 
-:root:--scroll-view[style*="--RS__scrollPadding"] body {
+: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/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.15",
+  "version": "2.0.0-beta.16",
   "homepage": "https://github.com/readium/css",
   "license": "BSD-3-Clause",
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Readium CSS (v. 2.0.0-beta.15)`
	`2`	`+ * Readium CSS (v. 2.0.0-beta.16)`
`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,23 @@ body{`
`117`	`117`	`}`
`118`	`118`	`}`
`119`	`119`
`120`		`-:root[style="readium-scroll-on"][style="--RS__scrollPadding"] body{`
	`120`	`+:root[style*="readium-scroll-on"][style~="--RS__scrollPadding"] body{`
`121`	`121`	`padding:var(--RS__scrollPadding) !important;`
`122`	`122`	`}`
`123`	`123`
`124`		`-:root[style="readium-scroll-on"][style="--RS__scrollPaddingTop"] body{`
	`124`	`+:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingTop"] body{`
`125`	`125`	`padding-top:var(--RS__scrollPaddingTop) !important;`
`126`	`126`	`}`
`127`	`127`
`128`		`-:root[style="readium-scroll-on"][style="--RS__scrollPaddingBottom"] body{`
	`128`	`+:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingBottom"] body{`
`129`	`129`	`padding-bottom:var(--RS__scrollPaddingBottom) !important;`
`130`	`130`	`}`
`131`	`131`
`132`		`-:root[style="readium-scroll-on"][style="--RS__scrollPaddingLeft"] body{`
	`132`	`+:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingLeft"] body{`
`133`	`133`	`padding-left:var(--RS__scrollPaddingLeft) !important;`
`134`	`134`	`}`
`135`	`135`
`136`		`-:root[style="readium-scroll-on"][style="--RS__scrollPaddingRight"] body{`
	`136`	`+:root[style*="readium-scroll-on"][style~="--RS__scrollPaddingRight"] body{`
`137`	`137`	`padding-right:var(--RS__scrollPaddingRight) !important;`
`138`	`138`	`}`
`139`	`139`