Move submod theming into customColors

JayPanoz · JayPanoz · commit e32a06ea9cb4 · 2025-06-19T14:55:59.000+02:00
diff --git a/css/src/ReadiumCSS-after-cjk-horizontal.css b/css/src/ReadiumCSS-after-cjk-horizontal.css
@@ -6,7 +6,6 @@
 @import "modules/ReadiumCSS-sepia_mode.css";
 @import "modules/ReadiumCSS-os_a11y.css";
 @import "modules/user-settings-submodules/ReadiumCSS-customColors_pref.css";
-@import "modules/user-settings-submodules/ReadiumCSS-theming.css";
 @import "modules/user-settings-submodules/ReadiumCSS-colNumber_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-lineLength_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-fontFamily_pref.css";
diff --git a/css/src/ReadiumCSS-after-cjk-vertical.css b/css/src/ReadiumCSS-after-cjk-vertical.css
@@ -6,7 +6,6 @@
 @import "modules/ReadiumCSS-sepia_mode.css";
 @import "modules/ReadiumCSS-os_a11y.css";
 @import "modules/user-settings-submodules/ReadiumCSS-customColors_pref.css";
-@import "modules/user-settings-submodules/ReadiumCSS-theming.css";
 @import "modules/user-settings-submodules/ReadiumCSS-lineLength-vertical_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-fontFamily_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-fontSize_pref.css";
diff --git a/css/src/ReadiumCSS-after-rtl.css b/css/src/ReadiumCSS-after-rtl.css
@@ -6,7 +6,6 @@
 @import "modules/ReadiumCSS-sepia_mode.css";
 @import "modules/ReadiumCSS-os_a11y.css";
 @import "modules/user-settings-submodules/ReadiumCSS-customColors_pref.css";
-@import "modules/user-settings-submodules/ReadiumCSS-theming.css";
 @import "modules/user-settings-submodules/ReadiumCSS-colNumber_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-lineLength_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-textAlign_pref.css";
diff --git a/css/src/ReadiumCSS-after.css b/css/src/ReadiumCSS-after.css
@@ -6,7 +6,6 @@
 @import "modules/ReadiumCSS-sepia_mode.css";
 @import "modules/ReadiumCSS-os_a11y.css";
 @import "modules/user-settings-submodules/ReadiumCSS-customColors_pref.css";
-@import "modules/user-settings-submodules/ReadiumCSS-theming.css";
 @import "modules/user-settings-submodules/ReadiumCSS-colNumber_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-lineLength_pref.css";
 @import "modules/user-settings-submodules/ReadiumCSS-textAlign_pref.css";
diff --git a/css/src/modules/user-settings-submodules/ReadiumCSS-customColors_pref.css b/css/src/modules/user-settings-submodules/ReadiumCSS-customColors_pref.css
@@ -29,4 +29,30 @@
 :root[style*="--USER__textColor"] svg text {
   fill: currentColor !important;
   stroke: none !important;
+}
+
+/* Color of links (:link + :visited) */
+
+:root[style*="--USER__linkColor"] a:link,
+:root[style*="--USER__linkColor"] a:link * {
+  color: var(--USER__linkColor) !important;
+}
+   
+:root[style*="--USER__visitedColor"] a:visited,
+:root[style*="--USER__visitedColor"] a:visited * {
+  color: var(--USER__visitedColor) !important;
+}
+
+/* Color of ::selection */
+/* This differs from the implementation inherited in (default) day mode 
+   as it is using !important and will override authors’ styles. */
+
+:root[style*="--USER__selectionBackgroundColor"][style*="--USER__selectionTextColor"] ::-moz-selection {
+  background-color: var(--USER__selectionBackgroundColor) !important;
+  color: var(--USER__selectionTextColor) !important;
+}
+
+:root[style*="--USER__selectionBackgroundColor"][style*="--USER__selectionTextColor"] ::selection {
+  background-color: var(--USER__selectionBackgroundColor) !important;
+  color: var(--USER__selectionTextColor) !important;
 }
diff --git a/css/src/modules/user-settings-submodules/ReadiumCSS-theming.css b/css/src/modules/user-settings-submodules/ReadiumCSS-theming.css
diff --git a/docs/CSS06-stylesheets_order.md b/docs/CSS06-stylesheets_order.md
@@ -48,9 +48,8 @@ The following modules must be appended after the author’s stylesheets (`Readiu
 3. `ReadiumCSS-scroll.css` (or `ReadiumCSS-scroll-vertical.css` for CJK – vertical writing mode)
 4. `ReadiumCSS-night_mode.css`
 5. `ReadiumCSS-sepia_mode.css`
-6. `ReadiumCSS-theming.css`
-7. `ReadiumCSS-os_a11y.css`
-8. User settings:
+6. `ReadiumCSS-os_a11y.css`
+7. User settings:
     1. `ReadiumCSS-colNumber_pref.css` (does not apply to CJK – vertical writing mode)
     2. `ReadiumCSS-lineLength_pref.css` (or `ReadiumCSS-lineLength-vertical_pref.css` for CJK – vertical writing mode)
     3. `ReadiumCSS-customColors_pref.css`
diff --git a/docs/ReadiumCSS_docs/OEBPS/Text/Section-006.xhtml b/docs/ReadiumCSS_docs/OEBPS/Text/Section-006.xhtml
@@ -89,8 +89,6 @@
 
         <li><code>ReadiumCSS-sepia_mode.css</code></li>
 
-        <li><code>ReadiumCSS-theming.css</code></li>
-
         <li><code>ReadiumCSS-os_a11y.css</code></li>
 
         <li>User settings: 
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.13",
+  "version": "2.0.0-beta.14",
   "homepage": "https://github.com/readium/css",
   "license": "BSD-3-Clause",
   "keywords": [

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@readium/css",`
`3`	`3`	`"description": "A set of reference stylesheets for EPUB Reading Systems",`
`4`		`- "version": "2.0.0-beta.13",`
	`4`	`+ "version": "2.0.0-beta.14",`
`5`	`5`	`"homepage": "https://github.com/readium/css",`
`6`	`6`	`"license": "BSD-3-Clause",`
`7`	`7`	`"keywords": [`