Skip to content

Commit 921885b

Browse files
committed
Merge branch 'develop' into resolve-gutter-scroll
2 parents 185762c + a3c1b62 commit 921885b

43 files changed

Lines changed: 206 additions & 1348 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

_includes/toc.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<li><a href="CSS09-default_fonts.html">Typefaces and font-stacks</a></li>
1212
<li><a href="CSS10-libre_fonts.html">Open Source and Libre Fonts We Can Recommend</a></li>
1313
<li><a href="CSS10b-variable_fonts.html">Variable fonts</a></li>
14+
<li><a href="CSS10c-custom_fonts.html">Using custom fonts with Readium CSS</a></li>
1415
<li><a href="CSS11-overrides_classification.html">User Overrides’ Classification</a></li>
1516
<li><a href="CSS12-user_prefs.html">User Settings and Themes</a></li>
1617
<li><a href="CSS13-a11y_settings_baseline.html">Baseline for a11y-related user settings</a></li>

css/ReadiumCSS-config.css

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@
3838
/* Accessibility normalization */
3939
@custom-selector :--a11y-normalize [style*="readium-a11y-on"];
4040

41-
/* Accessibility font. You can add selectors, using “, ” as a separator, if you have multiple fonts */
42-
@custom-selector :--a11y-font [style*="AccessibleDfA"], [style*="IA Writer Duospace"];
43-
4441
/* Direction i.e. ltr and rtl */
4542
@custom-selector :--ltr [dir="ltr"];
4643
@custom-selector :--rtl [dir="rtl"];

css/dist/ReadiumCSS-after.css

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -262,43 +262,28 @@ body{
262262
font-family:revert !important;
263263
}
264264

265-
:root[style*="AccessibleDfA"]{
266-
font-family:AccessibleDfA, Verdana, Tahoma, "Trebuchet MS", sans-serif !important;
267-
}
268-
269-
:root[style*="IA Writer Duospace"]{
270-
font-family:"IA Writer Duospace", Menlo, "DejaVu Sans Mono", "Bitstream Vera Sans Mono", Courier, monospace !important;
271-
}
272-
273-
:root[style*="AccessibleDfA"],:root[style*="IA Writer Duospace"],
274265
:root[style*="readium-a11y-on"]{
275266
font-style:normal !important;
276267
font-weight:normal !important;
277268
}
278269

279-
:root[style*="AccessibleDfA"] body *:not(code):not(var):not(kbd):not(samp),:root[style*="IA Writer Duospace"] body *:not(code):not(var):not(kbd):not(samp),
280270
:root[style*="readium-a11y-on"] body *:not(code):not(var):not(kbd):not(samp){
281271
font-family:inherit !important;
282272
font-style:inherit !important;
283273
font-weight:inherit !important;
284274
}
285275

286-
:root[style*="AccessibleDfA"] body *:not(a),:root[style*="IA Writer Duospace"] body *:not(a),
287276
:root[style*="readium-a11y-on"] body *:not(a){
288277
text-decoration:none !important;
289278
}
290279

291-
:root[style*="AccessibleDfA"] body *,:root[style*="IA Writer Duospace"] body *,
292280
:root[style*="readium-a11y-on"] body *{
293281
font-variant-caps:normal !important;
294282
font-variant-numeric:normal !important;
295283
font-variant-position:normal !important;
296284
}
297285

298-
:root[style*="AccessibleDfA"] sup,:root[style*="IA Writer Duospace"] sup,
299286
:root[style*="readium-a11y-on"] sup,
300-
:root[style*="AccessibleDfA"] sub,
301-
:root[style*="IA Writer Duospace"] sub,
302287
:root[style*="readium-a11y-on"] sub{
303288
font-size:1rem !important;
304289
vertical-align:baseline !important;

css/dist/ReadiumCSS-before.css

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -225,34 +225,6 @@ math{
225225
--RS__lineHeightCompensation:1.167;
226226
}
227227

228-
@font-face{
229-
font-family:AccessibleDfA;
230-
font-style:normal;
231-
font-weight:normal;
232-
src:local("AccessibleDfA"), url("fonts/AccessibleDfA-Regular.woff2") format("woff2"), url("fonts/AccessibleDfA-Regular.woff") format("woff");
233-
}
234-
235-
@font-face{
236-
font-family:AccessibleDfA;
237-
font-style:normal;
238-
font-weight:bold;
239-
src:local("AccessibleDfA"), url("fonts/AccessibleDfA-Bold.woff2") format("woff2");
240-
}
241-
242-
@font-face{
243-
font-family:AccessibleDfA;
244-
font-style:italic;
245-
font-weight:normal;
246-
src:local("AccessibleDfA"), url("fonts/AccessibleDfA-Italic.woff2") format("woff2");
247-
}
248-
249-
@font-face{
250-
font-family:"IA Writer Duospace";
251-
font-style:normal;
252-
font-weight:normal;
253-
src:local("iAWriterDuospace-Regular"), url("fonts/iAWriterDuospace-Regular.ttf") format("truetype");
254-
}
255-
256228
body{
257229
widows:2;
258230
orphans:2;

css/dist/android-fonts-patch/ReadMe.md

Lines changed: 0 additions & 22 deletions
This file was deleted.

css/dist/android-fonts-patch/android-fonts-patch.css

Lines changed: 0 additions & 136 deletions
This file was deleted.

0 commit comments

Comments
 (0)