build common css into single css file

[iankelling.org] / b.rb
diff --git a/b.rb b/b.rb

index 266ce819b6525215afdbcaff90b8cf78166925d5..4611b5d7fe9cc237c98341c2b8765acae5fdeddb 100644 (file)
--- a/b.rb
+++ b/b.rb
@@ -58,7 +58,7 @@ module B # blog module
      head = <<EOF
  <link rel="canonical" href="#{DURL}/#{rel_path}">
  EOF
-    if rel_path =~ %r{^blog/.}
+    if rel_path =~ %r{^/blog/|^blog.html}
        head += <<EOF
  <link rel="alternate" type="application/atom+xml" title="#{DN}" href="#{DURL}/feed.xml">
  EOF
@@ -75,8 +75,7 @@ EOF
    <head>
      <meta charset="utf-8">
      <title>#{title}</title>
-    <link rel="stylesheet" href="/main.css">
-    <link rel="stylesheet" href="/common.css">
+    <link rel="stylesheet" href="/css/main.css">
      <link rel="shortcut icon" href="/assets/favicon.png" />
      <meta name="description" content="#{o[:description] || DESCRIPTION}">
  #{o[:head]}
@@ -97,7 +96,7 @@ EOF
      <footer>
  #{o[:footer]}
        <p>This site has a <a href="/git/?p=iankelling.org;a=summary">git repo</a>. Unless stated otherwise, <a rel="license" href="http://creativecommons.org/licenses/by-sa/4.0/"><img id="cc-by-sa" alt="Creative Commons License" src="/assets/cc-by-sa-4.0-80x15.png" /></a></p>
-      <p><address><a href="ian@iankelling.org">ian@iankelling.org</a> let me know what you think</address></p>
+      <p><address><a href="mailto:ian@iankelling.org">ian@iankelling.org</a> let me know what you think</address></p>
      </footer>
    </body>
  </html>
@@ -126,7 +125,7 @@ EOF
    end
  
    def comment_html(comment, date)
-    inner = Redcarpet::Markdown.new(Redcarpet::Render::HTML, fenced_code_blocks: true).render(<<EOF)
+    inner = Redcarpet::Markdown.new(Redcarpet::Render::Safe, fenced_code_blocks: true).render(<<EOF)
  #{comment}
  <span class="comment-date">#{Time.at(date).strftime("%b %-d '%y")}</span>
  EOF