Merge branch 'master' into english

diff --git a/css/custom.css b/css/custom.css
index 2ea042a227755c3abd0dde341726ea4aa30286b5..4fb0c9ff0c60a264a4d4923c57f79ebc47cc0bbe 100644 (file)
--- a/css/custom.css
+++ b/css/custom.css
@@ -9,3 +9,8 @@
 #page-content > section[role="main"] a {
     color: #e95420;
 }
+
+.image-left {
+    float: left;
+    margin: 0px 15px 15px 0px;
+}

diff --git a/haunt.scm b/haunt.scm
index 6c83826d22cb41041707a970945c299a1f7289e8..0a6fa503e4315f6cb710af4a8fd40259fb065403 100644 (file)
--- a/haunt.scm
+++ b/haunt.scm
@@ -33,9 +33,13 @@
                   `(" "
                     (span (@ (style "margin: 0 3px")) ⦿)
                     (span (@ (class "tags"))
-                          ,@(map (lambda (tag)
-                                   `((a (@ (href ,(format #f "tags/~a.html" tag))) ,tag) " "))
-                                 tags)))))
+                          ,@(drop-right
+                              (apply
+                               append
+                               (map (lambda (tag)
+                                      `((a (@ (href ,(format #f "tags/~a.html" tag))) ,tag) ", "))
+                                    tags))
+                              1)))))
          (else
           div))))