diff options
Diffstat (limited to 'design')
-rw-r--r-- | design/sass/_notes.scss | 26 | ||||
-rw-r--r-- | design/sass/_writing_details.scss | 14 | ||||
-rw-r--r-- | design/templates/admin/buttons.html | 1 | ||||
-rw-r--r-- | design/templates/archives/notes.html | 5 | ||||
-rw-r--r-- | design/templates/details/note.html | 32 |
5 files changed, 53 insertions, 25 deletions
diff --git a/design/sass/_notes.scss b/design/sass/_notes.scss index 1357668..27655c7 100644 --- a/design/sass/_notes.scss +++ b/design/sass/_notes.scss @@ -1,18 +1,18 @@ //**************** Notes Structure ************************ -.notes main { +.notes main, .notes--permalink main { @include constrain_narrow(); margin-top: 1em; h1 { margin-bottom: 0; @include fontsize(28); @include breakpoint(beta) { - @include fontsize(36); + @include fontsize(28); text-align: left; } } } -.notes .h-entry { +.notes .h-entry, .notes--permalink .h-entry { @extend %clearfix; border: none; padding: 0; @@ -36,8 +36,26 @@ font-weight: 400; font-size: 1.5em; letter-spacing: 0px; - font-style: italic; } +//date-as-headline +.note--date-hed { + margin-bottom: 0; + time { + text-align: left; + font-weight: 400; + font-size: 1.5em; + letter-spacing: 0px; + font-style: italic; + text-transform: none; + color: $body_font; + } + a { + border: none; + text-decoration: none; + } +} + +//small date .note--date { @include smcaps; @include fontsize(11); diff --git a/design/sass/_writing_details.scss b/design/sass/_writing_details.scss index c94fcaf..8acc70b 100644 --- a/design/sass/_writing_details.scss +++ b/design/sass/_writing_details.scss @@ -240,9 +240,9 @@ img.picwide { clear: both; margin: 1em 0; @include breakpoint(gamma) { - margin-left: -140px; - width: 960px; - max-width: 960px; + margin-left: -140px; + width: 960px; + max-width: 960px; } @include breakpoint(delta) { margin-left: -245px; @@ -254,10 +254,12 @@ img.picwide { margin-bottom: 2em; border-bottom: 1px solid #eae6e6; padding-bottom: .5em; + @include generic_sans; @include breakpoint(gamma) { - margin-left: -140px; - width: 960px; - max-width: 960px; + text-align: right; + margin-left: -140px; + width: 960px; + max-width: 960px; } @include breakpoint(delta) { margin-left: -245px; diff --git a/design/templates/admin/buttons.html b/design/templates/admin/buttons.html index 777d7e5..54dc7b2 100644 --- a/design/templates/admin/buttons.html +++ b/design/templates/admin/buttons.html @@ -43,6 +43,7 @@ <li class="item"><a href="/admin/build/build?id=writingarchives">Build Writing Archives</a></li> <li class="item"><a href="/admin/build/build?id=homepage">Build Homepage</a></li> <li class="item"><a href="/admin/build/build?id=buildrss">Build RSS</a></li> + <li class="item"><a href="/admin/build/build?id=notes">Build Notes</a></li> <li class="item"><a href="/admin/build/build?id=resume">Build Resume</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> diff --git a/design/templates/archives/notes.html b/design/templates/archives/notes.html index 4e8b105..998546f 100644 --- a/design/templates/archives/notes.html +++ b/design/templates/archives/notes.html @@ -16,6 +16,7 @@ {% for object in object_list %} <article class="h-entry"> <h2 class="p-name note--title hide">{{object.title|safe|amp|smartypants}}</h2> + <h5 class="note--date-hed"><a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.pub_date|html5_datetime}}">{{object.pub_date|date:"F j, Y"}}</time></a></h5> <div class="e-content"> {{object.body_html|safe|smartypants}} </div> @@ -24,9 +25,9 @@ <data class="u-url" value="https://luxagraf.net/"></data> </span> <footer> - <p class="note--date"> + {%comment%}<p class="note--date"> <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.pub_date|html5_datetime}}">{{object.pub_date|date:"F j, Y"}}</time></a> - </p>{% if object.location %} + </p>{%endcomment%}{% if object.location %} <p class="p-location h-adr note--location bl" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo"> <span class="p-locality">{{object.location.name|smartypants|safe}}</span>, <span class="p-region">{{object.location.state.name}}</span>, diff --git a/design/templates/details/note.html b/design/templates/details/note.html index d866637..a964381 100644 --- a/design/templates/details/note.html +++ b/design/templates/details/note.html @@ -23,43 +23,49 @@ </ul> <main role="main"> <article class="h-entry post--article"> - <h1 class="p-name note--title">{{object.title|safe|amp|smartypants}}</h1> + {% if object.title %}<h1 class="p-name note--title">{{object.title|safe|amp|smartypants}}</h1>{%endif%} <div class="e-content"> - {{object.body_html|safe|amp|smartypants}} + {{object.body_html|safe|smartypants}} </div> <span class="p-author h-card"> <data class="p-name" value="Scott Gilbertson"></data> <data class="u-url" value="https://luxagraf.net/"></data> </span> - <footer class="note--footer"> - <p class="note--date"> + <footer> + {%comment%}<p class="note--date"> <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.pub_date|html5_datetime}}">{{object.pub_date|date:"F j, Y"}}</time></a> - </p>{% if object.location %} + </p>{%endcomment%}{% if object.location %} <p class="p-location h-adr note--location bl" itemprop="geo" itemscope itemtype="http://data-vocabulary.org/Geo"> <span class="p-locality">{{object.location.name|smartypants|safe}}</span>, - <span class="p-region">{{object.location.state}}</span>, + <span class="p-region">{{object.location.state.name}}</span>, <span class="p-country-name">{{object.location.state.country.name}}</span> <data class="p-latitude" value="{{object.latitude}}"></data> <data class="p-longitude" value="{{object.longitude}}"></data> - </p>{% endif %}{% if object.twitter_id %} + </p>{% endif %} + + <p class="note--date"> + <a class="u-url" href="{{object.get_absolute_url}}" rel="bookmark"><time class="dt-published" datetime="{{object.pub_date|html5_datetime}}">{{object.pub_date|date:"F j, Y"}}</time></a> + </p> + {% comment %} {% if object.twitter_id %} <ul class="note--actions"> <li><a rel="syndication" class="u-syndication" href="https://twitter.com/luxagraf/status/{{object.twitter_id}}">View on Twitter</a></li> <li> - <action do="reply" with="{{SITE_URL}}{{object.get_absolute_url}}"><a href="https://twitter.com/intent/tweet?in_reply_to={{object.twitter_id}}">Reply</a></action> + <indie-action do="reply" with="{{SITE_URL}}{{object.get_absolute_url}}"><a href="https://twitter.com/intent/tweet?in_reply_to={{object.twitter_id}}">Reply</a></indie-action> </li> <li> - <action do="post" with="{{SITE_URL}}{{object.get_absolute_url}}"> + <indie-action do="post" with="{{SITE_URL}}{{object.get_absolute_url}}"> <a href="https://twitter.com/intent/retweet?tweet_id={{object.twitter_id}}">Retweet</a> - </action> + </indie-action> </li> <li> - <action do="bookmark" with="{{SITE_URL}}{{object.get_absolute_url}}"> + <indie-action do="bookmark" with="{{SITE_URL}}{{object.get_absolute_url}}"> <a href="https://twitter.com/intent/favorite?tweet_id={{object.twitter_id}}">Favourite</a> - </action> + </indie-action> </li> - </ul>{% endif %} + </ul>{% endif %}{% endcomment %} </footer> + {% with object.get_next_published as next %} {% with object.get_previous_published as prev %} <nav id="page-navigation"> |