From 24fe480eba0379246fb3299dab1cfb46fcd923b5 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 9 Oct 2015 20:38:38 +0200 Subject: [PATCH 1/1] more uniformity for blog post headers; change link colors a bit --- personal/_config.yml | 1 + personal/_includes/post-header.html | 1 + personal/_layouts/default.html | 6 ++++-- personal/blog/index.html | 2 +- personal/style.scss | 17 +++++++++++++++-- personal/upload.sh | 4 +--- 6 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 personal/_includes/post-header.html diff --git a/personal/_config.yml b/personal/_config.yml index e5d9a01..f08b44a 100644 --- a/personal/_config.yml +++ b/personal/_config.yml @@ -30,6 +30,7 @@ defaults: type: "posts" values: rss: true + post: true vars: "blog-page.html" # Build settings diff --git a/personal/_includes/post-header.html b/personal/_includes/post-header.html new file mode 100644 index 0000000..6163cf5 --- /dev/null +++ b/personal/_includes/post-header.html @@ -0,0 +1 @@ +
{{ include.item.date | date: "%b %-d, %Y" }}{% if include.item.author %} • {{ include.item.author }}{% endif %}{% if include.item.meta %} • {{ include.item.meta }}{% endif %} • Permalink
diff --git a/personal/_layouts/default.html b/personal/_layouts/default.html index 897abcc..721c6f0 100644 --- a/personal/_layouts/default.html +++ b/personal/_layouts/default.html @@ -28,8 +28,8 @@ {% comment %} Unfortunately, the variables we set above are not preserved for sub-layouts. So, we have to have all the layout here. {% endcomment %} {% if pretitle %}
- {% if page.date %} -
Permalink • {{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}
+ {% if page.post %} + {% include post-header.html item=page %} {% endif %}

{{ pretitle }}

@@ -40,6 +40,8 @@ {{ content }} + + {% if page.post %}

Comments? Drop me a mail!

{% endif %} diff --git a/personal/blog/index.html b/personal/blog/index.html index 99724ea..a59db4c 100644 --- a/personal/blog/index.html +++ b/personal/blog/index.html @@ -10,7 +10,7 @@ sort: 10 {% assign num_posts = num_posts | minus: 1 %} {% if num_posts >= 0 %}
-
Permalink • {{ post.date | date: "%b %-d, %Y" }}{% if post.author %} • {{ post.author }}{% endif %}{% if post.meta %} • {{ post.meta }}{% endif %}
+ {% include post-header.html item=post %}

{{ post.title }}

{{ post.content }} diff --git a/personal/style.scss b/personal/style.scss index ab65787..7f82f55 100644 --- a/personal/style.scss +++ b/personal/style.scss @@ -17,7 +17,8 @@ $background-color: white; $text-color: #313131; $light-text-color: #808080; $code-background-color: #F7F7F7; -$link-color: #268BD2; +$link-color: #237fbf; +$light-link-color: #69a7d2; /* General Fonts */ html, body, div, p { @@ -64,7 +65,7 @@ h4 { /* Layout and Color stuff */ -/* General page structure */ +g/* General page structure */ html { overflow-y: scroll; } @@ -220,9 +221,17 @@ body { /* This centers us in the page, and handles the "too wide" case */ #-content { .side { float: right; + } + + .side, .comment { color: $light-text-color; + + a { + color: $light-link-color; + } } + .pretitle, .subtitle { h1 { display: inline-block; @@ -264,4 +273,8 @@ body { /* This centers us in the page, and handles the "too wide" case */ margin: 0.5em 0; line-height: 1.3; } + + .comment { + margin-top: 1.5em; + } } diff --git a/personal/upload.sh b/personal/upload.sh index 88e6126..4c4d7c6 100755 --- a/personal/upload.sh +++ b/personal/upload.sh @@ -3,6 +3,4 @@ cd "$(dirname "$0")" jekyll build cd _site -rsync ./ ralfj.de:srv/www.ralfj.de/docroot/ -aP \ - --exclude=cs/research.html -scp cs/research.html mpi-contact:public_html/index.html +rsync ./ ralfj.de:srv/www.ralfj.de/docroot/ -aP -- 2.30.2