summaryrefslogtreecommitdiff
path: root/design
diff options
context:
space:
mode:
Diffstat (limited to 'design')
-rw-r--r--design/sass/_archives.scss3
-rw-r--r--design/sass/_forms.scss54
-rw-r--r--design/sass/_queries.scss7
-rw-r--r--design/sass/screenv9.scss1
-rw-r--r--design/templates/essays/essay_detail.html2
-rw-r--r--design/templates/essays/essay_list.html2
6 files changed, 63 insertions, 6 deletions
diff --git a/design/sass/_archives.scss b/design/sass/_archives.scss
index 0181bc7..a8c41a4 100644
--- a/design/sass/_archives.scss
+++ b/design/sass/_archives.scss
@@ -28,10 +28,11 @@
border-bottom: 3px double #efefef;
padding-bottom: 3rem;
margin-bottom: 4rem;
+ margin-top: 3rem;
p {
font-style: normal !important;
@include fontsize(18);
- line-height: 1.3;
+ line-height: 1.5;
margin-top: 1.2rem !important;
&:first-of-type {
margin-top: 2rem !important;
diff --git a/design/sass/_forms.scss b/design/sass/_forms.scss
new file mode 100644
index 0000000..80e630c
--- /dev/null
+++ b/design/sass/_forms.scss
@@ -0,0 +1,54 @@
+.generic-form {
+ margin: 2rem 0;
+ @extend %clearfix;
+ fieldset {
+ padding: 0;
+ border: none;
+ width: 100%;
+ position: relative;
+ }
+ input[type=email] {
+ width: 210px;
+ @include fontsize(18);
+ background-color: #fff;
+ border: 2px solid darken(#efefef, 10);
+ border-radius: 5px;
+ height: 2.2rem;
+ padding: 4px 4px 4px 8px;
+ margin-right: .5rem;
+ @include breakpoint(omega){
+ width: 92%;
+ }
+ @include breakpoint(alpha){
+ width: 96%;
+ }
+ }
+ label {
+ display: block;
+ visibility: hidden;
+ width: 0;
+ height: 0;
+ }
+ .btn-hollow {
+ @include fontsize(16);
+ display: inline-block;
+ padding: 10px 15px;
+ margin-bottom: 0;
+ line-height: 20px;
+ text-align: center;
+ vertical-align: middle;
+ cursor: pointer;
+ color: #ddd;
+ border: 0;
+ border-radius: 5px;
+ font-weight: bold;
+ transition: all 0.2s ease;
+ background: $orange;
+ &:hover {
+ color: white;
+ }
+ }
+}
+.flex {
+ display: flex;
+}
diff --git a/design/sass/_queries.scss b/design/sass/_queries.scss
index 3ea883f..8a0eec2 100644
--- a/design/sass/_queries.scss
+++ b/design/sass/_queries.scss
@@ -1,3 +1,4 @@
+$breakpoint-omega: 420px; //728
$breakpoint-alpha: 728px; //728
$breakpoint-beta: 824px; //784
$breakpoint-gamma: 960px;
@@ -5,12 +6,12 @@ $breakpoint-delta: 1170px;
$breakpoint-epsilon: $max_width;
@mixin breakpoint($point) {
+ @if $point == "omega" {
+ @media screen and (min-width:$breakpoint-omega ){ @content; }
+ }
@if $point == "alpha" {
@media screen and (min-width:$breakpoint-alpha ){ @content; }
}
- @if $point == "alpha-2" {
- @media screen and (min-width:$breakpoint-alpha-2 ){ @content; }
- }
@else if $point == "beta" {
@media screen and (min-width: $breakpoint-beta) { @content; }
}
diff --git a/design/sass/screenv9.scss b/design/sass/screenv9.scss
index 30f7190..d594e28 100644
--- a/design/sass/screenv9.scss
+++ b/design/sass/screenv9.scss
@@ -15,3 +15,4 @@
@import "_resume.scss";
@import "_photos.scss";
@import "_notes.scss";
+@import "_forms.scss";
diff --git a/design/templates/essays/essay_detail.html b/design/templates/essays/essay_detail.html
index 2e3c1e7..6bc4100 100644
--- a/design/templates/essays/essay_detail.html
+++ b/design/templates/essays/essay_detail.html
@@ -39,7 +39,7 @@ class="detail {%if t == 1 or t == 3 or t == 5 %}double{%else%}single{%endif%}{%i
<header id="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" itemprop="headline">{%if object.template_name == 1 or object.template_name == 3 %}{{object.title|smartypants|safe}}{%else%}{{object.title|smartypants|safe}}{%endif%}</h1>
<h2 class="post-subtitle">{{object.sub_title|smartypants|safe}}</h2>
- <h4 class="post-source">Originally Published By: <a href="{{object.originally_published_by_url}}" title="View {{object.title}} on {{object.originally_published_by}}">{{object.originally_published_by}}</a></h4>
+ {% if object.originally_published_by %}<h4 class="post-source">Originally Published By: <a href="{{object.originally_published_by_url}}" title="View {{object.title}} on {{object.originally_published_by}}">{{object.originally_published_by}}</a></h4>{%endif%}
<time class="dt-published published dt-updated post-date" datetime="{{object.pub_date|date:'c'}}" itemprop="datePublished">{{object.pub_date|date:"F"}} <span>{{object.pub_date|date:"j, Y"}}</span></time>
<aside class="p-location h-adr adr post-location" itemprop="contentLocation" itemscope itemtype="http://schema.org/Place">
{% if object.country.name == "United States" %}<span class="p-locality locality">{{object.location.name|smartypants|safe}}</span>, <a class="p-region region" href="/jrnl/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="/jrnl/{{object.country.slug}}/" title="travel writing from {{object.country.name}}">{{object.country.name|safe}}</a>{%endif%}
diff --git a/design/templates/essays/essay_list.html b/design/templates/essays/essay_list.html
index 1d70622..e201716 100644
--- a/design/templates/essays/essay_list.html
+++ b/design/templates/essays/essay_list.html
@@ -12,7 +12,7 @@
<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>
+ <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></p>
</div>
<h1 class="topic-hed">Essays</h1>
<ul>{% for object in object_list %}