summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas "Cakeisalie5" Touhey <thomas@touhey.fr>2019-04-10 22:06:21 +0200
committerThomas "Cakeisalie5" Touhey <thomas@touhey.fr>2019-04-10 22:06:21 +0200
commit5a445e2d6e03362ec65c3f2077cfa963314ac5e8 (patch)
treeaa112ce0fdd7c045409507d67c984aa8a654235e
parentc87cbe1ea2784d723f93dd5a2dc6db117f9e7f35 (diff)
Latest updates (mainly on paintings)
-rw-r--r--_assets/css/skeleton.scss10
-rw-r--r--_assets/me_painting.jpgbin0 -> 78995 bytes
-rw-r--r--_assets/paintings/20190410_202955.jpgbin0 -> 3309115 bytes
-rw-r--r--_layouts/default.html2
-rw-r--r--_plugins/markdown.rb13
-rw-r--r--paintings.md14
6 files changed, 37 insertions, 2 deletions
diff --git a/_assets/css/skeleton.scss b/_assets/css/skeleton.scss
index e9f0b8d..ca2bd55 100644
--- a/_assets/css/skeleton.scss
+++ b/_assets/css/skeleton.scss
@@ -93,6 +93,12 @@ pre {
color: $text;
}
+.clearfix::after {
+ content: "";
+ display: table;
+ clear: both;
+}
+
hr {
line-height: 1;
border: none;
@@ -188,6 +194,10 @@ a:hover { color: #0040FF; }
a:active { color: #0431B4; }
.content {
+ .img-container {
+ display: inline;
+ }
+
.post-list {
list-style-type: none;
margin: 0;
diff --git a/_assets/me_painting.jpg b/_assets/me_painting.jpg
new file mode 100644
index 0000000..794c7ca
--- /dev/null
+++ b/_assets/me_painting.jpg
Binary files differ
diff --git a/_assets/paintings/20190410_202955.jpg b/_assets/paintings/20190410_202955.jpg
new file mode 100644
index 0000000..ff5d5e1
--- /dev/null
+++ b/_assets/paintings/20190410_202955.jpg
Binary files differ
diff --git a/_layouts/default.html b/_layouts/default.html
index e817bc0..a6e1fc7 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -66,7 +66,9 @@
<hr />
+<div class="clearfix">
{{ content | strip }}
+</div>
</section>
<!-- Sidebar. -->
diff --git a/_plugins/markdown.rb b/_plugins/markdown.rb
new file mode 100644
index 0000000..8b11050
--- /dev/null
+++ b/_plugins/markdown.rb
@@ -0,0 +1,13 @@
+module Jekyll
+ class MarkdownBlock < Liquid::Block
+ def initialize(tag_name, text, tokens)
+ super
+ end
+ require "kramdown"
+ def render(context)
+ content = super
+ "#{Kramdown::Document.new(content).to_html}"
+ end
+ end
+end
+Liquid::Template.register_tag('markdown', Jekyll::MarkdownBlock)
diff --git a/paintings.md b/paintings.md
index 4f08c5e..a020117 100644
--- a/paintings.md
+++ b/paintings.md
@@ -3,6 +3,17 @@ layout: default
title: Paintings
description: Paintings by John Touhey.
---
+<div class="clearfix">
+{% asset me_painting.jpg alt="John Touhey painting" class="aside" %}
+{% markdown %}
+
+I started painting in 2012 at the
+[atelier des Noctambules](https://atelierdesnoctambules.fr) in Brunoy.
+Here are some of my creations.
+
+{% endmarkdown %}
+</div>
+
{% include gb
%}{% include gi src="paintings/2015-05-06 22.26.25.jpg" alt=""
%}{% include gi src="paintings/2015-06-17 21.49.36.jpg" alt=""
@@ -11,6 +22,5 @@ description: Paintings by John Touhey.
%}{% include gi src="paintings/IMG_20120411_191222.jpg" alt=""
%}{% include gi src="paintings/IMG_20120411_213623.jpg" alt=""
%}{% include gi src="paintings/IMG_20120619_214117.jpg" alt=""
+%}{% include gi src="paintings/20190410_202955.jpg" alt=""
%}{% include ge %}
-
-I started painting in 2012. Here are some of my creations.