Skip to content

Commit 1e0cc48

Browse files
JayPanozJayPanoz
committed
Add webpub stylesheet
And switch ligatures to global
1 parent 6d4adff commit 1e0cc48

File tree

7 files changed

+88
-4
lines changed

7 files changed

+88
-4
lines changed

‎css/src/ReadiumCSS-after-rtl.css‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
@import "modules/user-settings-submodules/ReadiumCSS-paraSpacing_pref.css";
1414
@import "modules/user-settings-submodules/ReadiumCSS-paraIndent_pref.css";
1515
@import "modules/user-settings-submodules/ReadiumCSS-wordSpacing_pref.css";
16-
@import "modules/user-settings-submodules/ReadiumCSS-arabicLigatures_pref.css";
1716
@import "modules/user-settings-submodules/ReadiumCSS-variableFont_pref.css";
17+
@import "modules/user-settings-submodules/ReadiumCSS-ligatures_pref.css";
1818
@import "modules/user-settings-submodules/ReadiumCSS-imageFilters_pref.css";
1919
@import "modules/ReadiumCSS-fs_normalize.css";
2020
@import "modules/ReadiumCSS-iPadOS_patch.css";

‎css/src/ReadiumCSS-after.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
@import "modules/user-settings-submodules/ReadiumCSS-wordSpacing_pref.css";
1818
@import "modules/user-settings-submodules/ReadiumCSS-letterSpacing_pref.css";
1919
@import "modules/user-settings-submodules/ReadiumCSS-variableFont_pref.css";
20+
@import "modules/user-settings-submodules/ReadiumCSS-ligatures_pref.css";
2021
@import "modules/user-settings-submodules/ReadiumCSS-imageFilters_pref.css";
2122
@import "modules/ReadiumCSS-fs_normalize.css";
2223
@import "modules/ReadiumCSS-iPadOS_patch.css";

‎css/src/ReadiumCSS-webPub.css‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
@import "../ReadiumCSS-config.css";
2+
@import "modules/user-settings-submodules/ReadiumCSS-textAlign_pref.css";
3+
@import "modules/user-settings-submodules/ReadiumCSS-bodyHyphens_pref.css";
4+
@import "modules/user-settings-submodules/ReadiumCSS-fontFamily_pref.css";
5+
@import "modules/user-settings-submodules/ReadiumCSS-a11yFont_pref.css";
6+
@import "modules/user-settings-submodules/ReadiumCSS-webPubZoom_pref.css";
7+
@import "modules/user-settings-submodules/ReadiumCSS-lineHeight_pref.css";
8+
@import "modules/user-settings-submodules/ReadiumCSS-paraSpacing_pref.css";
9+
@import "modules/user-settings-submodules/ReadiumCSS-paraIndent_pref.css";
10+
@import "modules/user-settings-submodules/ReadiumCSS-wordSpacing_pref.css";
11+
@import "modules/user-settings-submodules/ReadiumCSS-letterSpacing_pref.css";
12+
@import "modules/user-settings-submodules/ReadiumCSS-variableFont_pref.css";
13+
@import "modules/user-settings-submodules/ReadiumCSS-ruby_pref.css";
14+
@import "modules/user-settings-submodules/ReadiumCSS-ligatures_pref.css";
15+
@import "modules/ReadiumCSS-iPadOS_patch.css";

‎css/src/modules/user-settings-submodules/ReadiumCSS-fontSize_pref.css‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,31 @@
1414
-webkit-text-size-adjust: var(--USER__fontSize) !important;
1515
}
1616

17+
@supports selector(figure:has(> img)) {
18+
:root[style*="--USER__fontSize"] figure:has(> img),
19+
:root[style*="--USER__fontSize"] figure:has(> video),
20+
:root[style*="--USER__fontSize"] figure:has(> svg),
21+
:root[style*="--USER__fontSize"] figure:has(> canvas),
22+
:root[style*="--USER__fontSize"] figure:has(> iframe),
23+
:root[style*="--USER__fontSize"] figure:has(> audio),
24+
:root[style*="--USER__fontSize"] div:has(> img),
25+
:root[style*="--USER__fontSize"] div:has(> video),
26+
:root[style*="--USER__fontSize"] div:has(> svg),
27+
:root[style*="--USER__fontSize"] div:has(> canvas),
28+
:root[style*="--USER__fontSize"] div:has(> iframe),
29+
:root[style*="--USER__fontSize"] div:has(> audio),
30+
:root[style*="--USER__fontSize"] table {
31+
zoom: calc(100% / var(--USER__fontSize)) !important;
32+
}
33+
34+
:root[style*="--USER__fontSize"] figcaption,
35+
:root[style*="--USER__fontSize"] caption,
36+
:root[style*="--USER__fontSize"] td,
37+
:root[style*="--USER__fontSize"] th {
38+
zoom: var(--USER__fontSize) !important;
39+
}
40+
}
41+
1742
/* Older deprecated implementation for when zoom is not supported
1843
or it is explicitly enabled because you don’t want the new one */
1944

css/src/modules/user-settings-submodules/ReadiumCSS-arabicLigatures_pref.css renamed to css/src/modules/user-settings-submodules/ReadiumCSS-ligatures_pref.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* Readium CSS
22
Ligatures pref
33
4-
A submodule managing ligatures for user settings in the Arabic Script (can help with a11y)
4+
A submodule managing ligatures for user settings
55
Part of “User Overrides Advanced” class – “advanced settings” flag required.
66
77
Repo: https://github.com/readium/css */

‎css/src/modules/user-settings-submodules/ReadiumCSS-webPubZoom_pref.css‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
/* Readium CSS
2+
WebPubZoom pref
3+
4+
A submodule managing zoom for user settings in Web Publications
5+
Part of “User Overrides” class – no flag required.
6+
7+
Repo: https://github.com/readium/css */
8+
9+
:root:not(:--iOS-patch)[style*="--USER__zoom"] body {
10+
zoom: var(--USER__zoom) !important;
11+
}
12+
13+
:root:--iOS-patch[style*="--USER__zoom"] body {
14+
-webkit-text-size-adjust: var(--USER__zoom) !important;
15+
}
16+
17+
@supports selector(figure:has(> img)) {
18+
:root[style*="--USER__zoom"] figure:has(> img),
19+
:root[style*="--USER__zoom"] figure:has(> video),
20+
:root[style*="--USER__zoom"] figure:has(> svg),
21+
:root[style*="--USER__zoom"] figure:has(> canvas),
22+
:root[style*="--USER__zoom"] figure:has(> iframe),
23+
:root[style*="--USER__zoom"] figure:has(> audio),
24+
:root[style*="--USER__zoom"] div:has(> img),
25+
:root[style*="--USER__zoom"] div:has(> video),
26+
:root[style*="--USER__zoom"] div:has(> svg),
27+
:root[style*="--USER__zoom"] div:has(> canvas),
28+
:root[style*="--USER__zoom"] div:has(> iframe),
29+
:root[style*="--USER__zoom"] div:has(> audio),
30+
:root[style*="--USER__zoom"] table {
31+
zoom: calc(100% / var(--USER__zoom)) !important;
32+
}
33+
34+
:root[style*="--USER__zoom"] figcaption,
35+
:root[style*="--USER__zoom"] caption,
36+
:root[style*="--USER__zoom"] td,
37+
:root[style*="--USER__zoom"] th {
38+
zoom: var(--USER__zoom) !important;
39+
}
40+
}
41+
42+
/* We do not have a fallback implementation yet… */

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@readium/css",
33
"description": "A set of reference stylesheets for EPUB Reading Systems",
4-
"version": "2.0.0-beta.20",
4+
"version": "2.0.0-beta.21",
55
"homepage": "https://github.com/readium/css",
66
"license": "BSD-3-Clause",
77
"keywords": [
@@ -45,7 +45,8 @@
4545
"stylelint": "^16.4.0"
4646
},
4747
"scripts": {
48-
"build": "npm run build:ltr && npm run build:rtl && npm run build:cjk && npm run build:vertical && npm run copyPatches",
48+
"build": "npm run build:ltr && npm run build:rtl && npm run build:cjk && npm run build:vertical && npm run build:web && npm run copyPatches",
49+
"build:web": "postcss css/src/ReadiumCSS-webPub.css -o css/dist/webPub/ReadiumCSS-webPub.css",
4950
"build:ltr": "postcss css/src/ReadiumCSS-before.css -o css/dist/ReadiumCSS-before.css && postcss css/src/ReadiumCSS-default.css -o css/dist/ReadiumCSS-default.css && postcss css/src/ReadiumCSS-after.css -o css/dist/ReadiumCSS-after.css",
5051
"build:rtl": "postcss css/src/ReadiumCSS-before-rtl.css -o css/dist/rtl/ReadiumCSS-before.css && postcss css/src/ReadiumCSS-default-rtl.css -o css/dist/rtl/ReadiumCSS-default.css && postcss css/src/ReadiumCSS-after-rtl.css -o css/dist/rtl/ReadiumCSS-after.css",
5152
"build:cjk": "postcss css/src/ReadiumCSS-before-cjk-horizontal.css -o css/dist/cjk-horizontal/ReadiumCSS-before.css && postcss css/src/ReadiumCSS-default-cjk-horizontal.css -o css/dist/cjk-horizontal/ReadiumCSS-default.css && postcss css/src/ReadiumCSS-after-cjk-horizontal.css -o css/dist/cjk-horizontal/ReadiumCSS-after.css",

0 commit comments

Comments
 (0)