From 5f7e5ee1bd82725f6f581896beaa526062ea6452 2017-01-17 01:03:16
From: Nick Seidenman (N6) <n6151h@gmail.com>
Date: 2017-01-17 01:03:16
Subject: [PATCH] Merge branch 'master' into prod

Conflicts:
	fixtures/conference.json
	fixtures/sites.json

---

diff --git a/fixtures/conference.json b/fixtures/conference.json
index 2ce8ce2825ce1bf2c20547786e9340dd051e84af..3ed25def5b7ee40f73305bc4c5a834cb1500f779 100644
--- a/fixtures/conference.json
+++ b/fixtures/conference.json
@@ -6,7 +6,7 @@
             "timezone": "US/Eastern",
             "start_date": "2040-01-01",
             "end_date": "2040-01-04",
-            "title": "PyconAU 2017"
+            "title": "PyCon AU 2017"
         }
     },
     {
diff --git a/pinaxcon/templates/site_base.html b/pinaxcon/templates/site_base.html
index f0b6b8220618cd45dfffb7c84fd3a710391aadac..0b614ed0ca09f55f1b02a8e0e8b84d37ad790b34 100755
--- a/pinaxcon/templates/site_base.html
+++ b/pinaxcon/templates/site_base.html
@@ -27,7 +27,7 @@
       <link rel="stylesheet" href="{% static 'pyconau2017/css/print.css' %}" media="print">
       <link href="{% static 'pyconau2017/css/pyconau.css' %}" rel="stylesheet">
 
-      <link rel="icon" href="{% static 'pycon2017/images/favicon.ico' %}"
+      <link rel="icon" href="{% static 'pyconau2017/images/favicon.png' %}"
 
       <!--Meta tags-->
       <meta name="theme-color" content="#0c486c">
diff --git a/static/src/pyconau2017/css/app.css b/static/src/pyconau2017/css/app.css
index 74397fafb7a3e08389e9974352764eea1b17a471..c48a26cf078fb58283ccb0a2f4632cf102d7517e 100644
--- a/static/src/pyconau2017/css/app.css
+++ b/static/src/pyconau2017/css/app.css
@@ -629,23 +629,9 @@ body {
   }
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-family: "Titillium Web", sans-serif;
-  font-weight: 900;
-  text-transform: uppercase;
-  margin: 0;
-  line-height: 0.9;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
 
 a {
-  color: inherit;
+  color: #337ab7;
   text-decoration: none;
   border-bottom: 1px solid #3ab1c9;
   transition: color 300ms;
diff --git a/static/src/pyconau2017/images/favicon.png b/static/src/pyconau2017/images/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..f0bf13e32dd08903f15f8d287fc84bcb089e3e7e
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000CU000CU0SiMxO#lD@8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10uD(;K~y-6jgw7iQ&A9wzj?WdO+=`bP@9D!VtzChQ$+9&QbcV<
zDm28cA_y+TmAVkRDk9pID?un|>nh+cnw2O>tqTiQY(kBqMWqF4q0}}-@{)1UBz>)K
z(X+bDoS8HC+_{1alCP7d>6iZ@a2%LJbqsi=YGodu$rhYk%dNqtpAAPqww8*f3GgD)
zj!3UqI-YuP;<jspbSCZV>hIbBpcaQfcX|D#=Rl)_FRFSeb-$x^MT72vj<e;z^E1X*
zn(H3y{ES*bkn4!`M$rslJ5_CurM0t34;<T87P$*}tFbU>*ddx<b=B#_*L}ICWS6q3
z!OlK~%Wht{LD9^k#Gf&cQSvQW!;;f$Mr3_u1h@$*?3}!36t+0>6~85Sx`M^;ALiGY
z!h*F2NCKOe=4GO1`@%**s{E7zJhkdZQ|as9J%0*_o~8s)0DU%I^nLkORB3OtTl|Kr
z=(3_wB_qN)fZiR8(?HZQQ5Yl~4U~um>Lxhx!vq(9UziC5UxKuS8tk^^>DGjiI$ISX
zcW?@5c4$ojA=gr&47%6U1Np--s5Cn$HpmN<$!b9aG)c`+)oT(T9$j9Lvh86dyrAc?
z^dzD^pm~YEZNVcEJQ9)k@GWp`n6$q8gmQzGHqFB90pKGd?*Sw>RFK$E{YU=inCA8;
rKrW(k6d{B%f$9_D!&gLBy#eqKUYM<N3ZTF*00000NkvXXu0mjfF7_W(

literal 0
HcmV?d00001