changed essays to allow easier building

10 files changed, 67 insertions, 32 deletions

diff --git a/design/sass/_archives.scss b/design/sass/_archives.scss
index a2caba9..215ff29 100644
--- a/design/sass/_archives.scss
+++ b/design/sass/_archives.scss
@@ -22,6 +22,26 @@
         text-align: left;
     }
 }
+.essay-intro {
+    font-family: $fancy_serif;
+    border-bottom: 3px double #efefef;
+    padding-bottom: 3rem;
+    margin-bottom: 4rem;
+    p {
+        font-style: normal !important;
+        @include fontsize(18);
+        line-height: 1.3;
+        margin-top: 1.2rem !important;
+        &:first-of-type {
+            margin-top: 2rem !important;
+        }
+    }
+    a {
+        text-decoration: underline !important;
+        text-decoration-color: $orange !important;
+
+    }
+}
 
 // container for archive grid items
 .archive-grid {
@@ -39,7 +59,8 @@
 }
 // body class archive, article header (usually inherits h2)
 .archive .post-title {
-    @include fontsize(24);
+    font-family: $fancy_serif;
+    @include fontsize(26);
     line-height: 1.3;
     font-style: italic; 
     margin: .25rem 0 .5rem;
@@ -50,14 +71,17 @@
 // the date and location are small caps 
 .post-date, .post-location {
     @include smcaps;
-    @include fontsize(12);
+    @include fontsize(14);
+    font-weight: bold;
+    color: $secondary-link-color;
     line-height: 1.2;
     text-align: left;
     margin: 0;
 }
 // slightly larger summary than a p in this context
 .post-summary {
-    @include fontsize(15);
+    font-family: $fancy_serif;
+    @include fontsize(16);
     line-height: $archive_p_line_height;
     margin-top: .25rem;
     text-align: left;
@@ -92,7 +116,7 @@
         }
     }
     h2 {
-        font-family: $fancy_headline_font_serif;
+        font-family: $fancy_serif;
         @include fontsize(32);
         margin: 0;
         line-height: 1.1;
@@ -100,7 +124,7 @@
     p {
         margin: 0;
         @include fontsize(20);
-        font-family: $fancy_italic;
+        font-style: italic;
     }
 }
 // Specific pages vary slightly
@@ -263,6 +287,7 @@
             display: block;
             margin-top: .75rem;
             @include fontsize(20);
+
         }
     }
     .post-location {
diff --git a/design/sass/_comments.scss b/design/sass/_comments.scss
index 45c81dc..1e254d6 100644
--- a/design/sass/_comments.scss
+++ b/design/sass/_comments.scss
@@ -60,7 +60,7 @@
 .comment--form--wrapper {
     @include constrain_narrow();
     p {
-        font-family: $fancy_headline_font_serif;
+        font-family: $fancy_serif;
     }
 }
 .comment--form--header {
diff --git a/design/sass/_details.scss b/design/sass/_details.scss
index ffc32f5..3659c26 100644
--- a/design/sass/_details.scss
+++ b/design/sass/_details.scss
@@ -21,7 +21,7 @@
         }
     }
     .post-subtitle {
-        font-family: $fancy_italic;
+        font-style: italic;
         font-size: 1.5rem;
         line-height: 1;
         margin-top: .5rem;
@@ -60,7 +60,7 @@
         margin: 0
     }
     .afterward {
-        font-family: $fancy_italic;
+        font-style: italic;
         h4 {
             margin-bottom: 0;
         }
@@ -173,7 +173,7 @@ h4.post-source {
     a {
         display: block;
         float: left;
-        font-family: $fancy_headline_font_serif;
+        font-family: $fancy_serif;
         text-align: left;
         font-style: italic;
         color: $brown;
diff --git a/design/sass/_fonts.scss b/design/sass/_fonts.scss
index ed4a212..95fe2e2 100644
--- a/design/sass/_fonts.scss
+++ b/design/sass/_fonts.scss
@@ -16,6 +16,13 @@
     font-weight: 400;
     font-style: normal;
 }
+@font-face {
+    font-family: 'mffweb';
+    src: url('/media/fonts/ffmbi.woff2') format('woff2');
+    src: url('/media/fonts/ffmbi.woff') format('woff');
+    font-weight: 400;
+    font-style: italic;
+}
 
 @font-face {
     font-family: 'mffnweb';
@@ -25,10 +32,3 @@
     font-style: normal;
 }
 
-@font-face {
-    font-family: 'mffmbi';
-    src: url('/media/fonts/ffmbi.woff2') format('woff2');
-    src: url('/media/fonts/ffmbi.woff') format('woff');
-    font-weight: 400;
-    font-style: normal;
-}
diff --git a/design/sass/_footer.scss b/design/sass/_footer.scss
index 5d72eae..b0470ce 100644
--- a/design/sass/_footer.scss
+++ b/design/sass/_footer.scss
@@ -26,7 +26,7 @@ footer[role="contentinfo"] {
             padding-left: 0.75em;
         }
         a {
-            color: $brown;
+            color: $secondary-link-color;
             text-decoration: none;
         }
         ul { display:inline;}
diff --git a/design/sass/_global.scss b/design/sass/_global.scss
index 20f9056..bfbb50e 100644
--- a/design/sass/_global.scss
+++ b/design/sass/_global.scss
@@ -19,16 +19,17 @@ a, button, input, select, textarea, label, summary {
     touch-action: manipulation;
 }
 a {
-    color: $orange;
+    color: $body_font_color;
     -webkit-transition: all 0.1s ease;
     -moz-transition: all 0.1s ease;
     -ms-transition: all 0.1s ease;
     transition: all 0.1s ease;
+    text-decoration-color: $orange;
     &:hover {
         text-decoration: none;
     }
     &:visited {
-        color: $orange;
+        color: $body_font_color;
     }
 }
 p {
@@ -198,7 +199,9 @@ h5 {
 }
 .bl {
     @include smcaps;
-    @include fontsize(11);
+    @include fontsize(12);
+    font-weight: 600;
+    color: $secondary-link-color;
 }
 .italic {
     font-style: italic;
@@ -223,7 +226,9 @@ h5 {
     li {
         display: inline;
     }
-    a { color: $brown;}
+    a {
+        color: $secondary-link-color;
+    }
     @include breakpoint(gamma) {
         text-align: left;
     }
diff --git a/design/sass/_mixins.scss b/design/sass/_mixins.scss
index 2de8000..b7fc66d 100644
--- a/design/sass/_mixins.scss
+++ b/design/sass/_mixins.scss
@@ -5,12 +5,12 @@ $orange: #b53a04;
 $link_color: #b53a04;
 
 $headline_font_serif: Georgia, 'Times New Roman', serif;
-$fancy_headline_font_serif: mffweb, Georgia, 'Times New Roman', serif;
-$fancy_italic: mffmbi, Georgia, 'Times New Roman', serif; 
+$fancy_serif: mffweb, Georgia, 'Times New Roman', serif;
 
 $body_p_font: normal 100% / 1.5 Georgia, Cambria, "Times New Roman", Times, serif;
 $body_font_color: $brown;
 $body_font_light: #b3aeae;
+$secondary-link-color: #838383;
 
 $archive_p_line_height: 1.6;
 //$light;
@@ -19,8 +19,9 @@ $narrow-max-width: 750px;
 $max_width: 1440px;
 
 @mixin smcaps {
-  text-transform: uppercase;
-  letter-spacing: 1px;
+    @include fancy_sans;
+    text-transform: uppercase;
+    letter-spacing: 1px;
 }
 @mixin plain_a {
   border: none;
diff --git a/design/templates/admin/buttons.html b/design/templates/admin/buttons.html
index d0d4f34..bd4b3cb 100644
--- a/design/templates/admin/buttons.html
+++ b/design/templates/admin/buttons.html
@@ -48,6 +48,7 @@
                         <li class="item"><a href="/admin/build/build?id=pages">Build All Pages</a></li>
                         <li class="item"><a href="/admin/build/build?id=sketches">Build Sketches</a></li>
                         <li class="item"><a href="/admin/build/build?id=dailyphotos">Build Daily Photo</a></li>
+                        <li class="item"><a href="/admin/build/build?id=essays">Build Essays</a></li>
                         <li class="item"><a href="/admin/build/build?id=photo_galleries">Build Photo Galleries</a></li>
                         <li class="item"><a href="/admin/build/build?id=projects">Build Project Pages</a></li>
                         <li class="item"><a href="/admin/build/build?id=buildbooks">Build Books</a></li>
diff --git a/design/templates/archives/homepage-light.html b/design/templates/archives/homepage-light.html
index 7aaf1aa..26ff437 100644
--- a/design/templates/archives/homepage-light.html
+++ b/design/templates/archives/homepage-light.html
@@ -51,7 +51,7 @@
     <section class="recent-popular">
         <div class="recent">
         <h1 class="homepage-section-header">Recent</h1>
-        <div  class="archive-grid">{% for object in recent %}
+        <div  class="archive-grid">{% for object in object_list %}
         <article class="h-entry hentry archive-card {% cycle 'odd' 'even' %} {% cycle 'first' 'second' 'third' %}" itemscope itemType="http://schema.org/Article">
             <div class="post-image">
                 <a href="{{object.get_absolute_url}}" title="{{object.title}}">{% if object.featured_image %}
diff --git a/design/templates/essays/essay_list.html b/design/templates/essays/essay_list.html
index 6ea89a3..1d70622 100644
--- a/design/templates/essays/essay_list.html
+++ b/design/templates/essays/essay_list.html
@@ -1,17 +1,20 @@
 {% extends 'base.html' %}
 {% load typogrify_tags %}
-{% load comments %}
 
-{% block pagetitle %}Luxagraf | {{essay_type}}{% endblock %}
+{% block pagetitle %}Collected Essays of Scott Gilbertson {% endblock %}
+{% block metadescription %}Collected writing: essays, articles and stories on travel, photography, tools, walking, the natural world and other ephemera.{% endblock %}
 
-{% block metadescription %}Luxagraf — Collected writing: essays on ecosophia, mediation, life, photography, tools, walking, and other ephemera.{% endblock %}
 {% block primary %}<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
     <li><a href="/" title="luxagraf homepage" itemprop="url"><span itemprop="title">Home</span></a> &rarr; </li>
-    <li>{{essay_type|capfirst}}</li>
+    <li>Essays</li>
     </ul>
     <main role="main" id="essay-archive" class="essay-archive archive-list">
-        <h1 class="topic-hed">{{essay_type.name|capfirst}}</h1>
-        <h6>{{essay_type.dek}}</h6>
+        <div class="essay-intro">
+            <h2>My various articles and essays collected in one spot.</h2>
+            <p>Topics include travel, writing, photography, free software, culture, and once, Del Taco.</p>
+            <p>Many essays below were previously published in: <em><a href="https://www.wired.com/author/scott-gilbertson/">Wired</a></em>, <em><a href="https://www.budgettravel.com/article/0902_HTTN_SocialNetwork_5488">Budget Travel</a></em>, <em><a href="https://arstechnica.com/">Ars Technica</a></em>, <em><a href="https://web.archive.org/web/20100904114555/http://one.longshotmag.com/article/going-for-seconds">Longshot Magazine</a>,</em> <em><a href="https://web.archive.org/web/20150506051746/http://1888.center/scott-gilbertson/">The Cost of Paper</a></em> and elsewhere.</a>
+        </div>
+        <h1 class="topic-hed">Essays</h1>
     <ul>{% for object in object_list %}
         <li class="h-entry hentry" itemscope itemType="http://schema.org/Article">
             <span class="date dt-published">{{object.pub_date|date:"F Y"}}</span>