From 7872c7fac206776b40ddf65cbaac85e2b06b744b Mon Sep 17 00:00:00 2001
From: Scott Kensell <scott.kensell@prezi.com>
Date: Wed, 4 Jun 2014 16:13:33 +0200
Subject: Prefer Avenir Next font and add aboutlink and tagline to left.

---
 SoMA2/static/css/main.css  | 19 ++++++++++++++++---
 SoMA2/templates/base.html  | 20 +++++++++++++++++---
 SoMA2/templates/index.html |  2 +-
 3 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/SoMA2/static/css/main.css b/SoMA2/static/css/main.css
index 1a62b4f..99bef82 100644
--- a/SoMA2/static/css/main.css
+++ b/SoMA2/static/css/main.css
@@ -30,7 +30,7 @@ h1, h2, h3, h4, h5, h6 {
 	/* font-weight: 400; */
 	line-height: 1.1;
 	margin-bottom: .8em;
-    font-family: Helvetica, sans-serif;
+    font-family: 'Avenir Next', sans-serif;
 }
 
 h3, h4, h5, h6 { margin-top: .8em; }
@@ -91,10 +91,20 @@ ol {
 
 .LaunchyardDetail p {
 	margin:0;
-    margin-bottom: 3em;
+    /* margin-bottom: 1em; */
 	text-align: center;
 	font-size:.9em;
 }
+.LaunchyardDetail p#sitetagline {
+    font-style: italic;
+    margin-bottom: 3em;
+}
+.LaunchyardDetail a#aboutlink {
+    font-size: 0.95em;
+    font-family: 'Avenir Next', sans-serif;
+    /* font-weight: bold; */
+}
+
 .LaunchyardDetail ul {
     list-style: none;
     margin:0;
@@ -102,7 +112,7 @@ ol {
 }
 .LaunchyardDetail li {
     font-size: 0.95em;
-    font-family: Helvetica, sans-serif;
+    font-family: 'Avenir Next', sans-serif;
     font-weight: 700;
     color: #333;
     margin-bottom: 0.5em;
@@ -440,6 +450,9 @@ li:last-child .hentry, #content > .hentry {border: 0; margin: 0;}
 .entry-title a:link, .entry-title a:visited {text-decoration: none; color: #333;}
 .entry-title a:visited {background-color: #fff;}
 .entry-content blockquote {font-size: 1.5em; margin: 10px 20px; }
+.entry-content li {font-size: 1.6em;}
+#featured .body li {font-size: 1.6em;}
+#featured .body blockquote {font-size: 1.5em; margin: 10px 20px; }
 
 .hentry .post-info * {font-style: normal;}
 
diff --git a/SoMA2/templates/base.html b/SoMA2/templates/base.html
index 102feeb..c2a3f7b 100644
--- a/SoMA2/templates/base.html
+++ b/SoMA2/templates/base.html
@@ -33,12 +33,26 @@
   <!-- <header id="banner" class="body"> -->
   <!--               <h1><a href="{{ SITEURL }}/"><img src="http://www.launchyard.com/images/logo.png" />{% if SITESUBTITLE %}<strong>{{ SITESUBTITLE }}</strong>{% endif %}</a></h1> -->
   <!--       </header> --> 
-<!-- /#banner -->
+
   <div class="LaunchyardDetail">
-    <p>
+    <!-- <p> -->
     <!-- <img src="{{ SITEURL }}/theme/images/blue-pin.png" width="100" height="100" alt="Graph icon"> -->
-    </p>
+    <!-- </p> -->
     <p><a id="sitesubtitle" href="{{ SITEURL }}/">{% if SITESUBTITLE %}{{ SITESUBTITLE }}{% endif %}</a></p>
+    {% if SITETAGLINE %}<p id="sitetagline">{{ SITETAGLINE }}</p>{% endif %}
+    <p><a id="aboutlink" href="{{ SITEURL }}/pages/about.html">about</a></p>
+
+    <!-- <ul> -->
+    <!--   <li><a href="{{ SITEURL }}/pages/about.html">about</a></li> -->
+      <!-- <li><a href="{{ SITEURL }}/pages/about.html">articles</a></li> -->
+<!-- {% if articles %} -->
+<!--         <br/> -->
+<!--         <br/> -->
+<!--     {% for article in articles %} -->        
+<!--       <li><a href="">{{ article.title }}</a></li> -->
+<!--     {% endfor %} -->
+<!-- {% endif %} -->
+    <!-- </ul> -->
 
     <!-- This belongs in the about page -->
       <!-- {% for name, link in SOCIAL %} -->
diff --git a/SoMA2/templates/index.html b/SoMA2/templates/index.html
index 4f35eee..1a15916 100644
--- a/SoMA2/templates/index.html
+++ b/SoMA2/templates/index.html
@@ -10,7 +10,7 @@
                 <div class="body">
                     <article>
                         <h1 class="entry-title"><a href="{{ SITEURL }}/{{ article.url }}">{{ article.title }}</a></h1>
-                        {% include 'article_infos.html' %}{{ article.content }}
+                        {% include 'article_infos.html' %}{{ article.summary }}
                     </article>
 		{% if loop.last and (articles_page.has_previous() or not articles_page.has_previous() and loop.length > 1) %} 
                     {% include 'pagination.html' %}
-- 
cgit v1.1