Rewrote all sass and reconfigured HTML to use more microformats and

clearer class names

1 files changed, 19 insertions, 25 deletions

diff --git a/design/templates/details/entry.html b/design/templates/details/entry.html
index 393f233..bfbae23 100644
--- a/design/templates/details/entry.html
+++ b/design/templates/details/entry.html
@@ -16,37 +16,31 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
 								
 				
 {% block primary %}		
-    <article role="main" class="h-entry hentry">
-        <header>
-            <h1 class="p-name entry-title">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
-            <time class="dt-published published updated" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
-            <p class="p-author author hide">Scott Gilbertson</p>
-            <aside class="h-adr adr geo bl">
-                {% if object.country.name == "United States" %}<span class="p-locality locality" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/writing/united-states/" title="travel writing from the United States">{{object.state.name}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name}}</a>{%endif%}
-                <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}"></data>
-                <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}"></data>
-                {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
-            </aside>
-        </header>
-        <div class="e-content entry-content post-body{% with object.template_name as t %}{%if t == 0 or t == 2 %}-single{%endif%}{%if t == 1 or t == 3 %}-double{%endif%}{%endwith%}">
+    <main role="main">
+    <article class="h-entry hentry post--article{% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %} post--article--double{%endif%}{%endwith%}">
+            <header class="post--header {% with object.get_template_name_display as t %}{%if t == "double" or t == "double-dark" %}post--header--double{%endif%}{%endwith%}">
+                <h1 class="p-name entry-title post--title">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|widont|safe}}{%endif%}</h1>
+                <time class="dt-published published dt-updated post--date" datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
+                <p class="p-author author hide">Scott Gilbertson</p>
+                <aside class="p-location h-adr adr post--location">
+                    {% if object.country.name == "United States" %}<span class="p-locality locality" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/writing/united-states/" title="travel writing from the United States">{{object.state.name|safe}}</a>, <span class="p-country-name">U.S.</span>{%else%}<span class="p-region">{{object.location.name|smartypants|safe}}</span>, <a class="p-country-name country-name" href="/writing/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name|safe}}</a>{%endif%}
+                    <data itemprop="latitude" class="p-latitude" value="{{object.latitude}}"></data>
+                    <data itemprop="longitude" class="p-longitude" value="{{object.longitude}}"></data>
+                    {%comment%} &nbsp;&nbsp;(<a href="" title="">Map</a>, <a href="" title="">Photos</a>){%endcomment%}
+                </aside>
+            </header>
+        <div class="e-content entry-content post--body post--body--{% with object.template_name as t %}{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%endif%}{%endwith%}">
             {{object.body_html|safe|smartypants|widont}}
-        </div>{%if object.template_name == 1 %}
-        <div class="clearfix"></div>{%endif%}{%if object.template_name == 3 %}<div class="clearfix"></div>{%endif%}
-        {%comment%}
-        <footer id="post-metadata">
-            <h4 class="hide">About {{object.title|smartypants|safe}}</h4>
-            <p>Posted <time datetime="{{object.pub_date|date:'c'}}">{{object.pub_date|date:"F j, Y"}}</time>, from {% if object.country_name == "United States" %}{{object.location_name|smartypants|safe}}, <a href="/writing/united-states/1/" title="travel writing from the United States">{{object.state_name}}</a>{%else%}{{object.location_name|smartypants|safe}}, <a href="/writing/{{object.country_name|slugify}}/1/" title="travel writing from {{object.country_name}}">{{object.country_name}}</a>{%endif%}.
-            Follow along on <a href="http://twitter.com/luxagraf" title="twitter" rel="me">Twitter</a> or by subscribing to the <a href="http://feeds.feedburner.com/luxagraf/blog" title="writing RSS 2.0 feed">RSS Feed</a>. For more about me, see the <a href="/about/" title="about luxagraf">about page</a>. To get in touch please use the <a href="/contact/" title="contact me">contact form</a> or leave a comment below.</p>
-        </footer>
-        {% endcomment %}
+        </div>
+        </article>
         {% with object.get_next_published as next %}
         {% with object.get_previous_published as prev %}
         <nav id="page-navigation">
             <ul>{% if prev%}
-                <li id="next"><span class="bl">Previous:</span> 
+                <li id="prev"><span class="bl">Previous:</span> 
                     <a href="{{ prev.get_absolute_url }}" rel="prev" title=" {{prev.title}}">{{prev.title|safe}}</a>
                 </li>{%endif%}{% if next%}
-                <li id="prev"><span class="bl">Next:</span> 
+                <li id="next"><span class="bl">Next:</span> 
                     <a href="{{ next.get_absolute_url }}" rel="next" title=" {{next.title}}">{{next.title|safe}}</a>
                 </li>{%endif%}
             </ul>
@@ -67,7 +61,7 @@ class="{%if t == 0 or t == 2 %}single{%endif%}{%if t == 1 or t == 3 %}double{%en
             <div id="disqus_thread"></div><script type="text/javascript" src="http://disqus.com/forums/luxagraf/embed.js"></script><noscript><a href="http://luxagraf.disqus.com/?url=ref">View the discussion thread.</a></noscript><a href="http://disqus.com" class="dsq-brlink">blog comments powered by <span class="logo-disqus">Disqus</span></a>
         </section>
         {%endcomment%}
-    </article>
+    </main>
 {% endblock %}
 {% block js %}
 {% with object.template_name as t %}{%if t == 1 or t == 3 %}