From 9516dd3db14f29c8700974fbd4c5694d7207b19e Mon Sep 17 00:00:00 2001
From: Justin Hsu <email@justinh.su>
Date: Thu, 9 Nov 2017 02:45:28 +0000
Subject: [PATCH] Merge publication lists.

---
 content/biblio.md | 8 ++------
 css/style.scss    | 2 +-
 site.hs           | 5 ++---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/content/biblio.md b/content/biblio.md
index 363d673..78c4864 100644
--- a/content/biblio.md
+++ b/content/biblio.md
@@ -6,10 +6,6 @@
 
 \$thesis\$
 
-## Journals and Surveys ##
+## Refereed Publications ##
 
-\$journal\$
-
-## Conferences ##
-
-\$confs\$
+\$pubs\$
diff --git a/css/style.scss b/css/style.scss
index 00777dc..b50a8ea 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -196,7 +196,7 @@ body {
   };
 }
 
-#drafts, #conferences, #journals-and-surveys, #thesis {
+#drafts, #thesis, #refereed-publications {
   padding: $text-pad;
 }
 
diff --git a/site.hs b/site.hs
index d4e0bd9..fb9fbb4 100644
--- a/site.hs
+++ b/site.hs
@@ -14,9 +14,8 @@ config = defaultConfiguration
 --------------------------------------------------------------------------------
 bibHeaders :: [(String, [String])]
 bibHeaders = [ ("draft"  , [ "-c", "$type='UNPUBLISHED'"   ] ) ,
-               ("confs"  , [ "-c", "$type='INPROCEEDINGS'" ] ) ,
-               ("journal", [ "-c", "$type='ARTICLE'"       ] ) ,
-               ("thesis",  [ "-c", "$type='PHDTHESIS'"     ] ) ]
+               ("thesis" , [ "-c", "$type='PHDTHESIS'"     ] ) ,
+               ("pubs"   , [ "-c", "$type='INPROCEEDINGS' or $type='ARTICLE'" ] ) ]
 
 bibSources :: [String]
 bibSources = [ "bibs/header.bib"