Merge pull request #170 from readium/advancedFlag-removal

Advanced flag removal

Author: JayPanoz

css/ReadiumCSS-config.css

@@ -18,8 +18,8 @@
 /* Font-family override */
 @custom-selector :--font-override [style*="readium-font-on"];
 
-/* Advanced settings */
-@custom-selector :--advanced-settings [style*="readium-advanced-on"];
+/* Font-size normalization for engines that don’t support zoom */
+@custom-selector :--fs-normalize [style*="readium-normalize-on"];
 
 /* Reading Modes */
 @custom-selector :--sepia-mode [style*="readium-sepia-on"];

css/dist/ReadiumCSS-after.css

@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.6)
+ * Readium CSS (v. 2.0.0-beta.7)
  * 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
@@ -320,52 +320,33 @@ body{
     max-width:var(--USER__lineLength) !important;
   }
 
-:root[style*="readium-advanced-on"][style*="--USER__textAlign"]{
+:root[style*="--USER__textAlign"]{
   text-align:var(--USER__textAlign);
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__textAlign"] body,
-:root[style*="readium-advanced-on"][style*="--USER__textAlign"] *:not(blockquote):not(figcaption) p,
-:root[style*="readium-advanced-on"][style*="--USER__textAlign"] li{
+:root[style*="--USER__textAlign"] body,
+:root[style*="--USER__textAlign"] p:not(blockquote p):not(figcaption p):not(hgroup p),
+:root[style*="--USER__textAlign"] li,
+:root[style*="--USER__textAlign"] dd{
   text-align:var(--USER__textAlign) !important;
   -moz-text-align-last:auto !important;
   -epub-text-align-last:auto !important;
   text-align-last:auto !important;
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__textAlign: justify"] body,
-:root[style*="readium-advanced-on"][style*="--USER__textAlign:justify"] body{
-  -webkit-hyphens:auto;
-  -moz-hyphens:auto;
-  -ms-hyphens:auto;
-  -epub-hyphens:auto;
-  hyphens:auto;
-}
-
-:root[style*="readium-advanced-on"][style*="--USER__textAlign: left"] body,
-:root[style*="readium-advanced-on"][style*="--USER__textAlign:left"] body,
-:root[style*="readium-advanced-on"][style*="--USER__textAlign: right"] body,
-:root[style*="readium-advanced-on"][style*="--USER__textAlign:right"] body{
-  -webkit-hyphens:none;
-  -moz-hyphens:none;
-  -ms-hyphens:none;
-  -epub-hyphens:none;
-  hyphens:none;
-}
-
-:root[style*="readium-advanced-on"][style*="--USER__bodyHyphens"]{
+:root[style*="--USER__bodyHyphens"]{
   -webkit-hyphens:var(--USER__bodyHyphens) !important;
   -moz-hyphens:var(--USER__bodyHyphens) !important;
   -ms-hyphens:var(--USER__bodyHyphens) !important;
   -epub-hyphens:var(--USER__bodyHyphens) !important;
   hyphens:var(--USER__bodyHyphens) !important;
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__bodyHyphens"] body,
-:root[style*="readium-advanced-on"][style*="--USER__bodyHyphens"] p,
-:root[style*="readium-advanced-on"][style*="--USER__bodyHyphens"] li,
-:root[style*="readium-advanced-on"][style*="--USER__bodyHyphens"] div,
-:root[style*="readium-advanced-on"][style*="--USER__bodyHyphens"] dd{
+:root[style*="--USER__bodyHyphens"] body,
+:root[style*="--USER__bodyHyphens"] p,
+:root[style*="--USER__bodyHyphens"] li,
+:root[style*="--USER__bodyHyphens"] div,
+:root[style*="--USER__bodyHyphens"] dd{
   -webkit-hyphens:inherit;
   -moz-hyphens:inherit;
   -ms-hyphens:inherit;
@@ -437,52 +418,56 @@ body{
   }
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__lineHeight"]{
+:root[style*="--USER__lineHeight"]{
   line-height:var(--USER__lineHeight) !important;
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__lineHeight"] body,
-:root[style*="readium-advanced-on"][style*="--USER__lineHeight"] p,
-:root[style*="readium-advanced-on"][style*="--USER__lineHeight"] li,
-:root[style*="readium-advanced-on"][style*="--USER__lineHeight"] div{
+:root[style*="--USER__lineHeight"] body,
+:root[style*="--USER__lineHeight"] p,
+:root[style*="--USER__lineHeight"] li,
+:root[style*="--USER__lineHeight"] div{
   line-height:inherit;
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__paraSpacing"] p{
+:root[style*="--USER__paraSpacing"] p{
   margin-top:var(--USER__paraSpacing) !important;
   margin-bottom:var(--USER__paraSpacing) !important;
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__paraIndent"] p{
+:root[style*="--USER__paraIndent"] p{
   text-indent:var(--USER__paraIndent) !important;
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__paraIndent"] p *,
-:root[style*="readium-advanced-on"][style*="--USER__paraIndent"] p:first-letter{
+:root[style*="--USER__paraIndent"] p *,
+:root[style*="--USER__paraIndent"] p:first-letter{
   text-indent:0 !important;
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] h1,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] h2,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] h3,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] h4,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] h5,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] h6,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] p,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] li,
-:root[style*="readium-advanced-on"][style*="--USER__wordSpacing"] div{
+:root[style*="--USER__wordSpacing"] h1,
+:root[style*="--USER__wordSpacing"] h2,
+:root[style*="--USER__wordSpacing"] h3,
+:root[style*="--USER__wordSpacing"] h4,
+:root[style*="--USER__wordSpacing"] h5,
+:root[style*="--USER__wordSpacing"] h6,
+:root[style*="--USER__wordSpacing"] p,
+:root[style*="--USER__wordSpacing"] li,
+:root[style*="--USER__wordSpacing"] div,
+:root[style*="--USER__wordSpacing"] dt,
+:root[style*="--USER__wordSpacing"] dd{
   word-spacing:var(--USER__wordSpacing);
 }
 
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] h1,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] h2,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] h3,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] h4,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] h5,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] h6,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] p,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] li,
-:root[style*="readium-advanced-on"][style*="--USER__letterSpacing"] div{
+:root[style*="--USER__letterSpacing"] h1,
+:root[style*="--USER__letterSpacing"] h2,
+:root[style*="--USER__letterSpacing"] h3,
+:root[style*="--USER__letterSpacing"] h4,
+:root[style*="--USER__letterSpacing"] h5,
+:root[style*="--USER__letterSpacing"] h6,
+:root[style*="--USER__letterSpacing"] p,
+:root[style*="--USER__letterSpacing"] li,
+:root[style*="--USER__letterSpacing"] div,
+:root[style*="--USER__letterSpacing"] dt,
+:root[style*="--USER__letterSpacing"] dd{
   letter-spacing:var(--USER__letterSpacing);
   font-variant:none;
 }
@@ -562,57 +547,57 @@ body{
 
 @supports not (zoom: 1){
 
-  :root[style*="readium-advanced-on"]{
+  :root[style*="readium-normalize-on"]{
     --USER__typeScale:1.2;
   }
 
-  :root[style*="readium-advanced-on"] p,
-  :root[style*="readium-advanced-on"] li,
-  :root[style*="readium-advanced-on"] div,
-  :root[style*="readium-advanced-on"] pre,
-  :root[style*="readium-advanced-on"] dd{
+  :root[style*="readium-normalize-on"] p,
+  :root[style*="readium-normalize-on"] li,
+  :root[style*="readium-normalize-on"] div,
+  :root[style*="readium-normalize-on"] pre,
+  :root[style*="readium-normalize-on"] dd{
     font-size:1rem !important;
   }
 
-  :root[style*="readium-advanced-on"] h1{
+  :root[style*="readium-normalize-on"] h1{
     font-size:1.75rem !important;
     font-size:calc(((1rem * var(--USER__typeScale)) * var(--USER__typeScale)) * var(--USER__typeScale)) !important;
   }
 
-  :root[style*="readium-advanced-on"] h2{
+  :root[style*="readium-normalize-on"] h2{
     font-size:1.5rem !important;
     font-size:calc((1rem * var(--USER__typeScale)) * var(--USER__typeScale)) !important;
   }
 
-  :root[style*="readium-advanced-on"] h3{
+  :root[style*="readium-normalize-on"] h3{
     font-size:1.25rem !important;
     font-size:calc(1rem * var(--USER__typeScale)) !important;
   }
 
-  :root[style*="readium-advanced-on"] h4,
-  :root[style*="readium-advanced-on"] h5,
-  :root[style*="readium-advanced-on"] h6{
+  :root[style*="readium-normalize-on"] h4,
+  :root[style*="readium-normalize-on"] h5,
+  :root[style*="readium-normalize-on"] h6{
     font-size:1rem !important;
   }
 
-  :root[style*="readium-advanced-on"] small{
+  :root[style*="readium-normalize-on"] small{
     font-size:smaller !important;
   }
 
-  :root[style*="readium-advanced-on"] sub,
-  :root[style*="readium-advanced-on"] sup{
+  :root[style*="readium-normalize-on"] sub,
+  :root[style*="readium-normalize-on"] sup{
     font-size:67.5% !important;
   }
 
-  :root[style*="readium-advanced-on"][style*="--USER__typeScale"] h1{
+  :root[style*="readium-normalize-on"][style*="--USER__typeScale"] h1{
     font-size:calc(((1rem * var(--USER__typeScale)) * var(--USER__typeScale)) * var(--USER__typeScale)) !important;
   }
 
-  :root[style*="readium-advanced-on"][style*="--USER__typeScale"] h2{
+  :root[style*="readium-normalize-on"][style*="--USER__typeScale"] h2{
     font-size:calc((1rem * var(--USER__typeScale)) * var(--USER__typeScale)) !important;
   }
 
-  :root[style*="readium-advanced-on"][style*="--USER__typeScale"] h3{
+  :root[style*="readium-normalize-on"][style*="--USER__typeScale"] h3{
     font-size:calc(1rem * var(--USER__typeScale)) !important;
   }
 }

css/dist/ReadiumCSS-before.css

@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.6)
+ * Readium CSS (v. 2.0.0-beta.7)
  * 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

css/dist/ReadiumCSS-default.css

@@ -1,5 +1,5 @@
 /*
- * Readium CSS (v. 2.0.0-beta.6)
+ * Readium CSS (v. 2.0.0-beta.7)
  * 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