fixed navigation

seanplays · Jun 17, 2012 · afc4841 · afc4841
1 parent 005b59a
commit afc4841
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
@@ -145,6 +145,7 @@ img
 /* Two columns */
 #navigation
 {
+  float: right;
   position: fixed;
   width: 15em;
   top: 20px;

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -29,10 +29,6 @@
     <div id="content">
       <h1 id="page_heading"><a href="<%= root_url %>"><%= enki_config[:title] %></a></h1>
 
-      <div id="main">
-        <%= yield %>
-      </div>
-
       <div id="navigation">
         <h2>pages</h2>
         <ul>
@@ -58,6 +54,10 @@
         </form>
       </div>
 
+      <div id="main">
+        <%= yield %>
+      </div>
+
       <div id="footer"><%= enki_config[:title] %> <%= mail_to(enki_config[:author, :email], enki_config[:author, :name]) %>, &#169; copyright 2012. valid <a href="http://validator.w3.org/check?uri=referer">html5</a> and <%= link_to "atom", "http://feedvalidator.org/check.cgi?url=#{enki_config[:url]}/posts.atom" %>. powered by <a href="http://www.enkiblog.com" title="a ruby on rails blogging app for the fashionable developer">enki</a>.</div>
     </div>
   </div>