diff --git a/ReadingSystems/iBooks/OS X/FontPresets.plist b/ReadingSystems/iBooks/OS X/FontPresets.plist
index 5da43af..0ee26fa 100644
--- a/ReadingSystems/iBooks/OS X/FontPresets.plist
+++ b/ReadingSystems/iBooks/OS X/FontPresets.plist
@@ -87,7 +87,7 @@
fontFamily
Athelas
postscriptBoldName
- Helvetica
+ Athelas-Bold
settings
@@ -168,7 +168,7 @@
fontFamily
Charter
postscriptBoldName
- Helvetica
+ Charter-Bold
settings
@@ -577,7 +577,7 @@
fontFamily
Seravek
postscriptBoldName
- Helvetica
+ Seravek-Bold
settings
diff --git a/ReadingSystems/iBooks/OS X/user_stylesheet_flowable.css.tmpl b/ReadingSystems/iBooks/OS X/user_stylesheet_flowable.css.tmpl
index cc76eac..46c6860 100644
--- a/ReadingSystems/iBooks/OS X/user_stylesheet_flowable.css.tmpl
+++ b/ReadingSystems/iBooks/OS X/user_stylesheet_flowable.css.tmpl
@@ -34,10 +34,11 @@
/* content body */
{{if css_themeShouldInvertContent}}
+
:root[__ibooks_internal_theme={{.css_themeIdentifier}}] {
background-color: {{.css_themeContentBackgroundColor}} !important;
}
- :root[__ibooks_internal_theme={{.css_themeIdentifier}}] * {
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] *:not(a) {
background-color: transparent !important;
color: {{.css_themeContentTextColor}} !important;
}
@@ -45,29 +46,49 @@
fill: {{.css_themeContentTextColor}} !important;
stroke: none !important;
}
+
+ /* Links - colors from theme - always override when inverted */
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a {
+ color: #{{.css_themeLinkColor}} !important;
+ }
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:link,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:visited,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:link *,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:visited * {
+ color: #{{.css_themeLinkColor}} !important;
+ }
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:active,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:active * {
+ color: #{{.css_themeLinkColor}} !important;
+ }
+
{{else}}
+
/* apply body styles to the root too in case the document has no body */
:root[__ibooks_internal_theme={{.css_themeIdentifier}}],
:root[__ibooks_internal_theme={{.css_themeIdentifier}}] body {
background-color: {{.css_themeContentBackgroundColor}};
color: {{.css_themeContentTextColor}};
}
+
+ /* Links - colors from theme - do not override what an author sets */
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a {
+ color: #{{.css_themeLinkColor}};
+ }
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:link,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:visited,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:link *,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:visited * {
+ color: #{{.css_themeLinkColor}};
+ }
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:active,
+ :root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:active * {
+ color: #{{.css_themeLinkColor}};
+ }
+
+
{{end css_themeShouldInvertContent}}
-/* Links - colors from theme */
-:root[__ibooks_internal_theme={{.css_themeIdentifier}}] a {
-color: #{{.css_themeLinkColor}};
-}
-:root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:link,
-:root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:visited,
-:root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:link *,
-:root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:visited * {
-color: #{{.css_themeLinkColor}} !important;
-}
-:root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:active,
-:root[__ibooks_internal_theme={{.css_themeIdentifier}}] a:active * {
-color: #{{.css_themeLinkColor}} !important;
-}
{{end range themes}}
/* End Themes */