Move namespaces to a new module so that they are imported in all 3 dist stylesheets

JayPanoz · JayPanoz · commit 09399fc636f6 · 2020-04-21T17:20:47.000+02:00
The assumption is that we’re making life a little bit easier for
implementers who want to add styles for epub:type and customise
ReadiumCSS.
diff --git a/css/src/ReadiumCSS-after-cjk-horizontal.css b/css/src/ReadiumCSS-after-cjk-horizontal.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-pagination.css";
 @import "modules/ReadiumCSS-scroll.css";
 @import "modules/ReadiumCSS-night_mode.css";
diff --git a/css/src/ReadiumCSS-after-cjk-vertical.css b/css/src/ReadiumCSS-after-cjk-vertical.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-pagination-vertical.css";
 @import "modules/ReadiumCSS-scroll-vertical.css";
 @import "modules/ReadiumCSS-night_mode.css";
diff --git a/css/src/ReadiumCSS-after-rtl.css b/css/src/ReadiumCSS-after-rtl.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-pagination.css";
 @import "modules/ReadiumCSS-scroll.css";
 @import "modules/ReadiumCSS-night_mode.css";
diff --git a/css/src/ReadiumCSS-after.css b/css/src/ReadiumCSS-after.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-pagination.css";
 @import "modules/ReadiumCSS-scroll.css";
 @import "modules/ReadiumCSS-night_mode.css";
diff --git a/css/src/ReadiumCSS-before-cjk-horizontal.css b/css/src/ReadiumCSS-before-cjk-horizontal.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-base.css";
 @import "modules/ReadiumCSS-day_mode.css";
 /* @import "modules/ReadiumCSS-fonts.css"; */
diff --git a/css/src/ReadiumCSS-before-cjk-vertical.css b/css/src/ReadiumCSS-before-cjk-vertical.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-base.css";
 @import "modules/ReadiumCSS-day_mode.css";
 /* @import "modules/ReadiumCSS-fonts.css"; */
diff --git a/css/src/ReadiumCSS-before-rtl.css b/css/src/ReadiumCSS-before-rtl.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-base.css";
 @import "modules/ReadiumCSS-day_mode.css";
 /* @import "modules/ReadiumCSS-fonts.css"; */
diff --git a/css/src/ReadiumCSS-before.css b/css/src/ReadiumCSS-before.css
@@ -1,4 +1,5 @@
 @import "../ReadiumCSS-config.css";
+@import "modules/ReadiumCSS-namespaces.css";
 @import "modules/ReadiumCSS-base.css";
 @import "modules/ReadiumCSS-day_mode.css";
 @import "modules/ReadiumCSS-fonts.css";
diff --git a/css/src/ReadiumCSS-default-cjk-horizontal.css b/css/src/ReadiumCSS-default-cjk-horizontal.css
@@ -1,3 +1,5 @@
+@import "modules/ReadiumCSS-namespaces.css";
+
 /* Readium CSS
    Default module for CJK horizontal writing
 
diff --git a/css/src/ReadiumCSS-default-cjk-vertical.css b/css/src/ReadiumCSS-default-cjk-vertical.css
@@ -1,3 +1,5 @@
+@import "modules/ReadiumCSS-namespaces.css";
+
 /* Readium CSS
    Default module for CJK vertical writing
 
diff --git a/css/src/ReadiumCSS-default-rtl.css b/css/src/ReadiumCSS-default-rtl.css
@@ -1,3 +1,5 @@
+@import "modules/ReadiumCSS-namespaces.css";
+
 /* Readium CSS
    Default module for RTL scripts
 
diff --git a/css/src/ReadiumCSS-default.css b/css/src/ReadiumCSS-default.css
@@ -1,3 +1,5 @@
+@import "modules/ReadiumCSS-namespaces.css";
+
 /* Readium CSS
    Default module
 
diff --git a/css/src/modules/ReadiumCSS-base.css b/css/src/modules/ReadiumCSS-base.css
@@ -5,11 +5,6 @@
 
    Repo: https://github.com/readium/readium-css */
 
-@namespace url("http://www.w3.org/1999/xhtml");
-@namespace epub url("http://www.idpf.org/2007/ops");
-@namespace m url("http://www.w3.org/1998/Math/MathML/");
-@namespace svg url("http://www.w3.org/2000/svg");
-
 /* Define viewport, HTML5-style */
 @-ms-viewport {
   width: device-width;
diff --git a/css/src/modules/ReadiumCSS-namespaces.css b/css/src/modules/ReadiumCSS-namespaces.css
@@ -0,0 +1,11 @@
+/* Readium CSS
+   Namespaces module
+
+   Namespaces to import in all 3 dist stylesheets
+
+   Repo: https://github.com/readium/readium-css */
+
+@namespace url("http://www.w3.org/1999/xhtml");
+@namespace epub url("http://www.idpf.org/2007/ops");
+@namespace m url("http://www.w3.org/1998/Math/MathML/");
+@namespace svg url("http://www.w3.org/2000/svg");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@import "../ReadiumCSS-config.css";`
	`2`	`+@import "modules/ReadiumCSS-namespaces.css";`
`2`	`3`	`@import "modules/ReadiumCSS-pagination.css";`
`3`	`4`	`@import "modules/ReadiumCSS-scroll.css";`
`4`	`5`	`@import "modules/ReadiumCSS-night_mode.css";`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+@import "modules/ReadiumCSS-namespaces.css";`
	`2`	`+`
`1`	`3`	`/* Readium CSS`
`2`	`4`	`Default module for CJK horizontal writing`
`3`	`5`