Merge branch 'master' of ssh://git.andrewdm.me/~git/www

2 files changed, 7 insertions, 5 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/src/main.scss b/src/main.scss
index 9fc3ef2..1ce7c8d 100644
--- a/src/main.scss
+++ b/src/main.scss
@@ -1,6 +1,7 @@
 body {
 	margin: 0;
 	padding: 0;
+	font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif;
 }
 
 header {
@@ -51,7 +52,6 @@ header {
 		a {
 			padding: 0.2em 1em;
 			font-size: 40px;
-
 			color: GoldenRod;
 			text-decoration: none;
 
@@ -99,8 +99,9 @@ article {
 	margin: 0 auto;
 
 	.tag {
-		font-size: 60%;
-		font-family: sans-serif;
+	        font-size: 60%;
+	    // this should work!
+		font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif;
 		color: white;
 		text-decoration: none;
 		text-align: center;
@@ -159,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 {
@@ -190,7 +191,7 @@ body.dnd {
 			border: 1pt solid #AEBDCC;
 			background-color: #F3F5F7;
 			padding: 5pt;
-			font-family: courier, monospace;
+			//font-family: courier, monospace;
 			font-size: 90%;
 			overflow:auto;
 		}