diff options
| -rwxr-xr-x | bin/pre-generate | 1 | ||||
| -rw-r--r-- | out/main.css | 2 | ||||
| -rw-r--r-- | src/main.scss | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/bin/pre-generate b/bin/pre-generate index ece3385..e5f8f5e 100755 --- a/bin/pre-generate +++ b/bin/pre-generate @@ -28,6 +28,7 @@ if [[ $branch == master ]]; then git checkout pre-generated.tmp git merge --no-edit -s ours pre-generated git checkout pre-generated + git pull git merge pre-generated.tmp git branch -d pre-generated.tmp ) diff --git a/out/main.css b/out/main.css index 2d09e56..a54ba87 100644 --- a/out/main.css +++ b/out/main.css @@ -121,7 +121,7 @@ body.dnd { background-size: 100%; /* This bit mostly taken from the defaults of org-mode export */ } body.dnd article { - font-family: Times, serif; + font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; font-size: 12pt; } body.dnd article table { border-spacing: 0; } diff --git a/src/main.scss b/src/main.scss index 8374eee..990891d 100644 --- a/src/main.scss +++ b/src/main.scss @@ -160,7 +160,7 @@ body.dnd { /* This bit mostly taken from the defaults of org-mode export */ article { - font-family: Times, serif; + font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; font-size: 12pt; table { |