Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Fix viewer controls not using system UI font

Browse Source
This commit is contained in:
Kovid Goyal 2020-01-01 10:45:37 +05:30
parent b966cdcef7
commit 3bcf55d571
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
resources/content-server/reset.css
View File

@ -1,8 +1,17 @@
/* /*
* Reset CSS to suppress cross-browser differences * Reset CSS to suppress cross-browser differences
*/ */
html, body, div, span, object, iframe, html, body {
margin:0;
padding:0;
border:0;
outline:0;
vertical-align:baseline;
background:transparent;
}
div, span, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
abbr, address, cite, code, abbr, address, cite, code,
del, dfn, em, img, ins, kbd, q, samp, del, dfn, em, img, ins, kbd, q, samp,
@ -11,7 +20,7 @@ b, i,
dl, dt, dd, ol, ul, li, dl, dt, dd, ol, ul, li,
fieldset, form, label, legend, fieldset, form, label, legend,
table, caption, tbody, tfoot, thead, tr, th, td, table, caption, tbody, tfoot, thead, tr, th, td,
article, aside, canvas, details, figcaption, figure, article, aside, canvas, details, figcaption, figure,
footer, header, hgroup, menu, nav, section, summary, footer, header, hgroup, menu, nav, section, summary,
time, mark, audio, video { time, mark, audio, video {
margin:0; margin:0;
@ -25,11 +34,10 @@ time, mark, audio, video {
body { body {
line-height:1.2; line-height:1.2;
font-family:sans-serif;
} }
article,aside,details,figcaption,figure, article,aside,details,figcaption,figure,
footer,header,hgroup,menu,nav,section { footer,header,hgroup,menu,nav,section {
display:block; display:block;
} }
@ -69,7 +77,7 @@ table {
hr { hr {
display:block; display:block;
height:1px; height:1px;
border:0; border:0;
border-top:1px solid currentColor; border-top:1px solid currentColor;
margin:1em 0; margin:1em 0;
padding:0; padding:0;

5
src/calibre/gui2/viewer/web_view.py
View File

@ -535,9 +535,12 @@ class WebView(RestartingWebEngineView):
def on_bridge_ready(self): def on_bridge_ready(self):
f = QApplication.instance().font() f = QApplication.instance().font()
fi = QFontInfo(f) fi = QFontInfo(f)
family = f.family()
if family in ('.AppleSystemUIFont', 'MS Shell Dlg 2'):
family = 'system-ui'
ui_data = { ui_data = {
'all_font_families': QFontDatabase().families(), 'all_font_families': QFontDatabase().families(),
'ui_font_family': f.family(), 'ui_font_family': family,
'ui_font_sz': '{}px'.format(fi.pixelSize()), 'ui_font_sz': '{}px'.format(fi.pixelSize()),
'show_home_page_on_ready': self.show_home_page_on_ready, 'show_home_page_on_ready': self.show_home_page_on_ready,
'system_colors': system_colors(), 'system_colors': system_colors(),