more uniformity for blog post headers; change link colors a bit

diff --git a/personal/_config.yml b/personal/_config.yml
index e5d9a01487b9a238b7fc163ddf6481e12ff66fb2..f08b44a87f20df4e57078b99f88e25f6cbbfd4ce 100644 (file)
--- a/personal/_config.yml
+++ b/personal/_config.yml
@@ -30,6 +30,7 @@ defaults:
         type: "posts"
     values:
         rss: true
         type: "posts"
     values:
         rss: true

+        post: true

         vars: "blog-page.html"
 
 # Build settings
         vars: "blog-page.html"
 
 # Build settings

diff --git a/personal/_includes/post-header.html b/personal/_includes/post-header.html
new file mode 100644 (file)
index 0000000..6163cf5
--- /dev/null
+++ b/personal/_includes/post-header.html
@@ -0,0 +1 @@
+<div class="side">{{ include.item.date | date: "%b %-d, %Y" }}{% if include.item.author %} • {{ include.item.author }}{% endif %}{% if include.item.meta %} • {{ include.item.meta }}{% endif %} • <a href="{{ include.item.url }}">Permalink</a></div>

diff --git a/personal/_layouts/default.html b/personal/_layouts/default.html
index 897abcc9100ff63e60fbaade038744b3981cd08e..721c6f0277ed872e9b52cc353c3f15182ce2e460 100644 (file)
--- 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 %}
         <header class="pretitle">
       {% 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 %}
         <header class="pretitle">

-          {% if page.date %}
-            <div class="side"><a href="{{ site.baseurl }}{{ page.url }}">Permalink</a> • {{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}</div>
+          {% if page.post %}
+            {% include post-header.html item=page %}

           {% endif %}
           <h1>{{ pretitle }}</h1>
         </header>
           {% endif %}
           <h1>{{ pretitle }}</h1>
         </header>


@@ -40,6 +40,8 @@
       </header>
 
       {{ content }}
       </header>
 
       {{ content }}

+
+      {% if page.post %}<p class="comment">Comments? <a href="mailto:post-AT-ralfj-DOT-de">Drop me a mail</a>!</p>{% endif %}

     </article>
 
   </div></body>
     </article>
 
   </div></body>

diff --git a/personal/blog/index.html b/personal/blog/index.html
index 99724ea6f74a21e650a9cf94e499bd99dae0b0b6..a59db4ca78dba1375103a7e1f706975ead703d0e 100644 (file)
--- 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 %}
         <header class="subtitle">
     {% assign num_posts = num_posts | minus: 1 %}
     {% if num_posts >= 0 %}
         <header class="subtitle">

-            <div class="side"><a href="{{ post.url }}">Permalink</a> • {{ post.date | date: "%b %-d, %Y" }}{% if post.author %} • {{ post.author }}{% endif %}{% if post.meta %} • {{ post.meta }}{% endif %}</div>
+            {% include post-header.html item=post %}

             <h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
         </header>
         {{ post.content }}
             <h1><a href="{{ post.url }}">{{ post.title }}</a></h1>
         </header>
         {{ post.content }}

diff --git a/personal/style.scss b/personal/style.scss
index ab657879ae033ccb7de8af50242e0c7aade2db7e..7f82f55c48044ffdbbc62060d5ffe08f8406b22e 100644 (file)
--- 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;
 $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 {
 
 /* General Fonts */
 html, body, div, p {


@@ -64,7 +65,7 @@ h4 {
 
 /* Layout and Color stuff */
 
 
 /* Layout and Color stuff */
 

-/* General page structure */
+g/* General page structure */

 html {
     overflow-y: scroll;
 }
 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;
 #-content {
     .side {
         float: right;

+    }
+
+    .side, .comment {

         color: $light-text-color;
         color: $light-text-color;

+
+        a {
+            color: $light-link-color;
+        }

     }
 
     }
 

+

     .pretitle, .subtitle {
         h1 {
             display: inline-block;
     .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;
     }
         margin: 0.5em 0;
         line-height: 1.3;
     }

+
+    .comment {
+        margin-top: 1.5em;
+    }

 }
 }

diff --git a/personal/upload.sh b/personal/upload.sh
index 88e6126cd52950b0a36485b0bf3f2fa5721393e4..4c4d7c6a6cd1eb5ebb2229bcad71c426f8786375 100755 (executable)
--- a/personal/upload.sh
+++ b/personal/upload.sh
@@ -3,6 +3,4 @@ cd "$(dirname "$0")"
 
 jekyll build
 cd _site
 
 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