Update iBooks OS X following 10.11.4

FriendsOfEpub · Mar 28, 2016 · ef27713 · ef27713
1 parent 61bcd44
commit ef27713
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 18 deletions.
diff --git a/ReadingSystems/iBooks/OS X/FontPresets.plist b/ReadingSystems/iBooks/OS X/FontPresets.plist
@@ -87,7 +87,7 @@
 			<key>fontFamily</key>
 			<string>Athelas</string>
 			<key>postscriptBoldName</key>
-			<string>Helvetica</string>
+			<string>Athelas-Bold</string>
 			<key>settings</key>
 			<array>
 				<dict>
@@ -168,7 +168,7 @@
 			<key>fontFamily</key>
 			<string>Charter</string>
 			<key>postscriptBoldName</key>
-			<string>Helvetica</string>
+			<string>Charter-Bold</string>
 			<key>settings</key>
 			<array>
 				<dict>
@@ -577,7 +577,7 @@
 			<key>fontFamily</key>
 			<string>Seravek</string>
 			<key>postscriptBoldName</key>
-			<string>Helvetica</string>
+			<string>Seravek-Bold</string>
 			<key>settings</key>
 			<array>
 				<dict>

diff --git a/ReadingSystems/iBooks/OS X/user_stylesheet_flowable.css.tmpl b/ReadingSystems/iBooks/OS X/user_stylesheet_flowable.css.tmpl
@@ -34,40 +34,61 @@
 
 /* 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;
     }
     :root[__ibooks_internal_theme={{.css_themeIdentifier}}] svg|text {
     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 */