From 9d88527a997ced7e01b67bcfee6ba10666f77deb Mon Sep 17 00:00:00 2001
From: luxagraf <sng@luxagraf.net>
Date: Thu, 18 Oct 2018 16:17:39 -0500
Subject: cleaned up resume section to fit in new design
---
.gitignore | 2 +
design/sass/_mixins.scss | 3 +
design/sass/_resume.scss | 160 +++++++++++++++++++++++++++++
design/sass/_src.scss | 10 +-
design/sass/screenv9.scss | 1 +
design/templates/archives/resume-pubs.html | 6 +-
design/templates/base.html | 15 ++-
design/templates/details/resume.html | 14 +--
8 files changed, 197 insertions(+), 14 deletions(-)
create mode 100644 design/sass/_resume.scss
diff --git a/.gitignore b/.gitignore
index b245de2..2ffd244 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,5 @@ config/settings.py
bak/
siteold/
/*.json
+.vagrant/
+*.log
diff --git a/design/sass/_mixins.scss b/design/sass/_mixins.scss
index 5fafd95..1df6cad 100644
--- a/design/sass/_mixins.scss
+++ b/design/sass/_mixins.scss
@@ -55,6 +55,9 @@ $max_width: 1440px;
font-family: Helvetica, sans-serif;
font-weight: 600;
}
+@mixin fancy-serif {
+ font-family: Georgia, Palatino, serif;
+}
%clearfix {
*zoom: 1;
&:before {
diff --git a/design/sass/_resume.scss b/design/sass/_resume.scss
new file mode 100644
index 0000000..3a6b139
--- /dev/null
+++ b/design/sass/_resume.scss
@@ -0,0 +1,160 @@
+.head {
+ @extend %clearfix;
+ @include constrain(780px);
+ margin-top: 4em;
+}
+.resume main header {
+ width: 100%;
+ h1 {
+ @include fontsize(36);
+ text-transform: uppercase;
+ letter-spacing: 3px;
+ font-weight: 600;
+ line-height: 1;
+ margin-bottom: 0;
+ color: #444;
+ }
+ h2 {
+ margin-top: .5em !important;
+ @include fontsize(14);
+ text-transform: uppercase;
+ letter-spacing: 1px;
+ font-style: italic;
+ color: #333;
+ }
+ @include breakpoint(gamma) {
+ width: 60%;
+ float: left;
+ text-align: left;
+ margin-top: .5em;
+ }
+}
+.h-resume {
+ h3,h2 {
+ @include constrain_narrow;
+ text-align: left;
+ }
+ h3 {
+ font-family: sans-serif;
+ text-transform: uppercase;
+ letter-spacing: 1px;
+ font-size: 0.75rem;
+ margin-top: 4em;
+ margin-bottom: 3em;
+ border-bottom: 1px dotted #333;
+ }
+ h2 {
+ margin-top: 2.5em;
+ margin-bottom: .25em;
+ text-transform: uppercase;
+ letter-spacing: 1px;
+ font-size: 1rem;
+ }
+ h2 a, h2 a:visited {
+ text-decoration: none;
+ color: #444;
+ }
+}
+.meta {
+ @include constrain_narrow;
+ text-align: left;
+ margin-bottom: 1em;
+ time{
+ display: inline;
+ }
+}
+.contact {
+ margin: 2em 0 1.5em;
+ @include constrain_narrow;
+ li {
+ display: block;
+ @extend %clearfix;
+ }
+ @include breakpoint(gamma) {
+ width: 160px;
+ float: right;
+ margin: 1.9em 0 1.5em;
+ li {
+ display: block;
+ }
+ }
+ h6, a {
+ font-size: 13px;
+ font-size: 0.8125rem;
+ line-height: 1.8;
+ margin: 0;
+ display: block;
+ float: left;
+ }
+ h6 {
+ font-size: 11px;
+ font-size: 0.6875rem;
+ line-height: 2.1;
+ text-transform: uppercase;
+ letter-spacing: 1px;
+ &:after {
+ content: ":";
+ margin-right: 5px;
+ }
+ }
+ a {
+ font-family: sans-serif;
+ }
+}
+.publications-list {
+ list-style-type: none;
+ text-align: left;
+ @include constrain_narrow;
+ h2 {
+ @include smcaps;
+ @include fontsize(11);
+ font-weight: 400;
+ text-align: left;
+ border-bottom: 1px dotted #333;
+ margin-bottom: 2em;
+ &:first-of-type {
+ margin-top: 3em;
+ }
+ }
+ h3, time {
+ display: inline;
+ }
+ h3 {
+ @include fontsize(20);
+ @include fancy_serif;
+ }
+ time:before {
+ content: "\00a0 \00a0"
+ }
+ ul {
+ list-style-type: none;
+ }
+}
+.publisher {
+ margin-top: 1em;
+ margin-bottom: 1em;
+}
+.pub-title {
+ margin-bottom: 1.75em;
+ a {
+ color: $brown;
+ text-decoration: none;
+ font-weight: 400;
+ }
+}
+.resume h6 {
+ @include constrain_narrow;
+ text-align: left;
+ font-weight: 400;
+ @include fontsize(12);
+}
+.toc {
+ @include constrain_narrow;
+ text-align: left;
+ a {
+ color: $brown;
+ }
+ ul {
+ list-style-type: none;
+ }
+}
diff --git a/design/sass/_src.scss b/design/sass/_src.scss
index 2c72313..7aeaa46 100644
--- a/design/sass/_src.scss
+++ b/design/sass/_src.scss
@@ -8,9 +8,9 @@ pre{
font-weight: 400;
}
.src-archive {
+ @include constrain_narrow;
.topic-hed {
@include fontsize(20);
- @include constrain_narrow;
margin-top: 1.5em;
margin-bottom: 1.5em;
@include breakpoint(beta) {
@@ -25,7 +25,6 @@ pre{
}
}
h2 {
- @include constrain_narrow;
@include fontsize(22);
font-weight: 400;
margin-bottom: .25em;
@@ -98,7 +97,12 @@ pre{
text-align: left;
margin: 3.5rem 0 0;
}
-
+ h5 {
+ margin: 3rem 0 -1.5rem 0;
+ text-transform: uppercase;
+ @include fancy_sans;
+ text-align: left;
+ }
}
.highlight {
diff --git a/design/sass/screenv9.scss b/design/sass/screenv9.scss
index 5054281..d2adb37 100644
--- a/design/sass/screenv9.scss
+++ b/design/sass/screenv9.scss
@@ -12,3 +12,4 @@
@import "_leaflet.scss";
@import "_map.scss";
@import "_src.scss";
+@import "_resume.scss";
diff --git a/design/templates/archives/resume-pubs.html b/design/templates/archives/resume-pubs.html
index 19c572a..332a812 100644
--- a/design/templates/archives/resume-pubs.html
+++ b/design/templates/archives/resume-pubs.html
@@ -4,7 +4,7 @@
{% load pagination_tags %}
{% block pagetitle %} Publications | Resume{% endblock %}
{% block metadescription %} {% endblock %}
-{%block bodyid%}class="resume" id="publications-archive"{%endblock%}
+{%block bodyid%}class="archive resume" id="publications-archive"{%endblock%}
{% block primary %}
<ul class="bl" id="breadcrumbs" itemscope itemtype="http://data-vocabulary.org/Breadcrumb">
@@ -12,13 +12,13 @@
<li><a href="/resume/">Resume</a> → </li>
<li>Publications</li>
</ul>
- <main role="main">
+ <main>
<h1 class="hide">Publications</h1>
<h6>By Publication</h6>
<nav class="toc"><ul>{% for publisher in pub_list %}
<li><a href="#{{publisher.name|slugify}}">{{publisher.name}}</a></li>{%endfor%}
</ul></nav>
- <ul class="publications-list">{% regroup object_list|dictsort:"publisher_id" by publisher.name as pub_list %}{% for pub in pub_list %}
+ <ul class="archive publications-list">{% regroup object_list|dictsort:"publisher_id" by publisher.name as pub_list %}{% for pub in pub_list %}
<li>
<h2 id="{{pub.grouper|slugify}}">{{ pub.grouper }}</h2>
<ul>{% for object in pub.list %}{% if forloop.counter < 8 %}
diff --git a/design/templates/base.html b/design/templates/base.html
index 14101f0..cd8a1c5 100644
--- a/design/templates/base.html
+++ b/design/templates/base.html
@@ -49,8 +49,19 @@
{% block primary %}{% endblock %}
{% block extrabody %}{% endblock %}
<footer role="contentinfo">
- Support luxagraf: <script src="https://liberapay.com/luxagraf/widgets/button.js"></script>
- <noscript><a href="https://liberapay.com/luxagraf/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>
+ <div class="support">Support luxagraf:
+ <div class="donate-btn">
+ <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
+ <input type="hidden" name="cmd" value="_s-xclick">
+ <input type="hidden" name="hosted_button_id" value="HYJFZQSBGJ8QQ">
+ <input type="submit" name="submit" alt="Donate to luxagraf via PayPal">
+ </form>
+ </div>
+ <div class="donate-btn">
+ <script src="https://liberapay.com/luxagraf/widgets/button.js"></script>
+ <noscript><a href="https://liberapay.com/luxagraf/donate"><img alt="Donate using Liberapay" src="https://liberapay.com/assets/widgets/donate.svg"></a></noscript>
+ </div>
+ </div>
<nav class="bl">
<ul>
<li><a href="/blogroll" title="Sites that inspire us">Blogroll</a></li>
diff --git a/design/templates/details/resume.html b/design/templates/details/resume.html
index 5c47b2c..ff16bbe 100644
--- a/design/templates/details/resume.html
+++ b/design/templates/details/resume.html
@@ -4,16 +4,18 @@
{% block pagetitle %}{% endblock %}
{% block metadescription %}{% endblock %}
+{%block htmlclass%}class="detail{%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> → </li>
- <li>Resume</li>
+ <li><a href="/resume">Resume</a>{% if object.title != "Resume" %} → {%endif%}</li>
+ {% if object.title != "Resume" %}<li><a href="/resume/pubs/">Publications</a></li>{%endif%}
</ul>
- <main role="main">
- <article role="main">
- <h1>{{object.title|safe|smartypants|widont}}</h1>
- <p><i>This article was published in {{object.publisher}}, you can view <a href="{{object.url}}">the original</a> there, complete with graphics, comments and other fun stuff.</i></p>
- <div class="post--article" style="margin-top: 3em">
+ <main>
+ <article>
+ {% if object.title != "Resume" %}<h1 class="post-header">{{object.title|safe|smartypants|widont}}</h1>{% endif %}
+ {% if object.publisher %}<p><i>This article was published in {{object.publisher}}, you can view <a href="{{object.url}}">the original</a> there, complete with graphics, comments and other fun stuff.</i></p>{% endif %}
+ <div class="post-article" style="margin-top: 3em">
{{object.body_html|safe|smartypants|widont}}
</div>
</article>
--
cgit v1.2.3-70-g09d2