From ceb2c4dcd593989eb209417ea979695fa8d18cd6 Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Thu, 19 Jan 2017 22:22:18 +0000 Subject: font-family --- src/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.scss b/src/main.scss index 9fc3ef2..2fecdec 100644 --- a/src/main.scss +++ b/src/main.scss @@ -100,7 +100,7 @@ article { .tag { font-size: 60%; - font-family: sans-serif; + font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; color: white; text-decoration: none; text-align: center; -- cgit v1.2.3 From b92ce25d590af9d0ce4704eea16c7ded01f1b83f Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Thu, 19 Jan 2017 22:25:37 +0000 Subject: does it upload this time? --- src/main.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.scss b/src/main.scss index 2fecdec..8374eee 100644 --- a/src/main.scss +++ b/src/main.scss @@ -99,7 +99,8 @@ article { margin: 0 auto; .tag { - font-size: 60%; + font-size: 60%; + // this should work! font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; color: white; text-decoration: none; -- cgit v1.2.3 From d00bf3265f192c93b0a15c8ac22cb11f8b10ccb8 Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Thu, 19 Jan 2017 22:43:55 +0000 Subject: added git pull to pre-generate --- bin/pre-generate | 1 + 1 file changed, 1 insertion(+) 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 ) -- cgit v1.2.3 From d0a4964379b5c46df7a8eeaac48123a70e6d74e3 Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Thu, 19 Jan 2017 22:48:21 +0000 Subject: Wrong font-family. --- src/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 { -- cgit v1.2.3 From ca9d37d1d344626707edf483f9a891e6fa3598fb Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Thu, 19 Jan 2017 22:51:15 +0000 Subject: Wrong font-family again. --- src/main.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.scss b/src/main.scss index 990891d..fc0015e 100644 --- a/src/main.scss +++ b/src/main.scss @@ -51,7 +51,7 @@ header { a { padding: 0.2em 1em; font-size: 40px; - + font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; color: GoldenRod; text-decoration: none; -- cgit v1.2.3 From a2ef25d6bea13596d4c25e25cbe11e8d85a47219 Mon Sep 17 00:00:00 2001 From: Andrew Murrell Date: Thu, 19 Jan 2017 22:53:08 +0000 Subject: Wrong font-family again; for real this time. --- src/main.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.scss b/src/main.scss index fc0015e..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; - font-family: Baskerville, "Goudy Old Style", "Palatino", "Book Antiqua", "Warnock Pro", serif; color: GoldenRod; text-decoration: none; @@ -191,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; } -- cgit v1.2.3