Merge pull request #38 from pikesley/cannot-fathom-partials

Cannot fathom partials
pikesley · Nov 17, 2013 · 8ea74a1 · 8ea74a1
2 parents 667dbd9 + 41cade3
commit 8ea74a1
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 34 deletions.
diff --git a/lib/uncle_clive.rb b/lib/uncle_clive.rb
@@ -16,8 +16,8 @@ class Spectrum < Sinatra::Base
 
   get '/' do
     haml :readme, :locals => {
-        :text  => markdown(File.read('README.md')),
-        :title => '© 1982 Sinclair Research Ltd.'
+        :title => '© 1982 Sinclair Research Ltd.',
+        :text  => markdown(File.read('README.md'))
     }
   end
 

diff --git a/lib/views/layout.haml b/lib/views/layout.haml
@@ -0,0 +1,11 @@
+!!! 5
+%html(lang="en")
+  %head
+    %title= title
+    %link{:rel => 'stylesheet', :href => '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css', :type => "text/css"}
+    %link{:rel => 'stylesheet', :href => 'http://bootswatch.com/amelia/bootstrap.min.css', :type => "text/css"}
+    %link{:rel => 'stylesheet', :href => '../sinclair.css', :type => "text/css"}
+    %link{:rel => 'stylesheet', :href => '../uncle-clive.css', :type => "text/css"}
+
+  %body
+    = yield
diff --git a/lib/views/readme.haml b/lib/views/readme.haml
@@ -1,23 +1,15 @@
-!!! 5
-%html(lang="en")
-  %head
-    %title= title
-    %link{:rel => 'stylesheet', :href => '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css', :type => "text/css"}
-    %link{:rel => 'stylesheet', :href => '../uncle-clive.css', :type => "text/css"}
-
-  %body
-    .body
-      %a{:href => "https://github.com/pikesley/uncle-clive"}
-        %img{:style => "position: absolute; top: 0; right: 0; border: 0;",
+.body
+  %a{:href => "https://github.com/pikesley/uncle-clive"}
+    %img{:style => "position: absolute; top: 0; right: 0; border: 0;",
          :src => "https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png",
          :alt => "Fork me on GitHub"}
-      .container
-        #readme~ text
+  .container
+    #readme~ text
 
-      %footer
-        %p
-          %a{:href => "http://github.com/pikesley/uncle-clive"}Source on Github
-          |
-          %a{:href => "http://travis-ci.org/pikesley/uncle-clive"}Built on Travis
-          |
-          %a{:href => "http://heroku.com"}Hosted on Heroku
+  %footer
+    %p
+      %a{:href => "http://github.com/pikesley/uncle-clive"}Source on Github
+      |
+      %a{:href => "http://travis-ci.org/pikesley/uncle-clive"}Built on Travis
+      |
+      %a{:href => "http://heroku.com"}Hosted on Heroku
diff --git a/lib/views/tabliser.haml b/lib/views/tabliser.haml
@@ -1,12 +1,4 @@
-!!! 5
-%html(lang="en")
-  %head
-    %title= title
-    %link{:rel => 'stylesheet', :href => 'http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/css/bootstrap-combined.min.css', :type => "text/css"}
-    %link{:rel => 'stylesheet', :href => '../sinclair.css', :type => "text/css"}
-
-  %body
-    .body
-      .container
-        .hero-unit
-          = table
+.body
+  .container
+    .hero-unit
+      = table