diff --git a/config.yaml b/config.yaml index 4ba1e5e..753343d 100644 --- a/config.yaml +++ b/config.yaml @@ -21,7 +21,6 @@ site: feed: 'http://feeds.feedburner.com/BioinformaticsZen' rights: "Creative Commons Attribution 3.0 Unported" navigation: - twitter: 'http://twitter.com/michaelbarton' about: 'http://www.michaelbarton.me.uk' email: 'mailto:mail@bioinformaticszen.com' youtube: 'http://www.youtube.com/user/bioinformaticszen' @@ -30,6 +29,7 @@ author: uri: "http://www.michaelbarton.me.uk" name: "Michael Barton" email: "mail@michaelbarton.me.uk" + twitter: "http://twitter.com/michaelbarton" scripts: - "https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js" - "/fancybox/javascript.js" diff --git a/content/stylesheets/stylesheet.scss b/content/stylesheets/stylesheet.scss index a6bb8fa..55e3ca9 100644 --- a/content/stylesheets/stylesheet.scss +++ b/content/stylesheets/stylesheet.scss @@ -6,7 +6,7 @@ body { } #sidebar { - width: 200px; } + width: 210px; } .widget { h3 { diff --git a/layouts/_footer.haml b/layouts/_footer.haml index ada387e..aeac5cc 100644 --- a/layouts/_footer.haml +++ b/layouts/_footer.haml @@ -3,5 +3,5 @@ %p = "Keep up to date with my thoughts on bioinformatics by" %b - %a{:href => @site.config[:site][:navigation][:twitter] } + %a{:href => @site.config[:author][:twitter] } = "following me on twitter." diff --git a/layouts/_navigation.haml b/layouts/_navigation.haml deleted file mode 100644 index 53d82b2..0000000 --- a/layouts/_navigation.haml +++ /dev/null @@ -1,9 +0,0 @@ -- if @site.config[:site][:navigation] - #sidebar - .widget - %h3 links - %ul - - @site.config[:site][:navigation].each do |name,href| - %li - %a{:href => href} - = name diff --git a/layouts/_sidebar.haml b/layouts/_sidebar.haml new file mode 100644 index 0000000..4067558 --- /dev/null +++ b/layouts/_sidebar.haml @@ -0,0 +1,18 @@ +- if @site.config[:site][:navigation] + #sidebar + .widget + %h3 about + %p + = "I'm Michael Barton, a post-doctoral researcher in bioinformatics. I enjoy writing about data analysis and simple approaches to computational biology." + %p + = "Follow me on twitter as" + %b + %a{:href => @site.config[:author][:twitter] } + = "@michaelbarton." + .widget + %h3 links + %ul + - @site.config[:site][:navigation].each do |name,href| + %li + %a{:href => href} + = name diff --git a/layouts/default.haml b/layouts/default.haml index 58b258c..e349db3 100644 --- a/layouts/default.haml +++ b/layouts/default.haml @@ -22,5 +22,5 @@ = comments(@item) - else = render "_front" - = render "_navigation" + = render "_sidebar" = google_analytics @site.config[:site][:analytics_token]