GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-25 01:06:35 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' of https://github.com/dae/anki

Browse source
This commit is contained in:
Soren I. Bjornstad 2014-09-27 10:18:10 -05:00
commit a430803774
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
anki/collection.py
View file

@ -700,6 +700,7 @@ select id from notes where mid not in """ + ids2str(self.models.ids()))
if t['did'] == "None": if t['did'] == "None":
t['did'] = None t['did'] = None
problems.append(_("Fixed AnkiDroid deck override bug.")) problems.append(_("Fixed AnkiDroid deck override bug."))
self.models.save(m)
if m['type'] == MODEL_STD: if m['type'] == MODEL_STD:
# model with missing req specification # model with missing req specification
if 'req' not in m: if 'req' not in m:

4
aqt/utils.py
View file

@ -331,6 +331,10 @@ def mungeQA(col, txt):
txt = stripSounds(txt) txt = stripSounds(txt)
# osx webkit doesn't understand font weight 600 # osx webkit doesn't understand font weight 600
txt = re.sub("font-weight: *600", "font-weight:bold", txt) txt = re.sub("font-weight: *600", "font-weight:bold", txt)
if isMac:
# custom fonts cause crashes on osx at the moment
txt = txt.replace("font-face", "invalid")
return txt return txt
def applyStyles(widget): def applyStyles(widget):