Merge branch 'master' into pages

templates/components/makoto-styling.html

@@ -20,6 +20,10 @@
     border-radius: 3px;
   }
 
+  pre {
+    white-space: pre-wrap;
+  }
+
   img {
     max-width: 85%;
   }

templates/post.html

@@ -24,10 +24,7 @@
       </div>
       <div id="post-md">
         [[ for:post.md_lines:line ]]
-          [[ line ]]
+          <p><pre>[[ line ]]</pre></p>
-          [[ if:line ]]
-            <br>
-          [[ endif ]]
         [[ endfor ]]
       </div>
       [[ if:post.slug:!next_post.slug ]]