nav after content

ssorc · Oct 26, 2014 · 53714ba · 53714ba
1 parent 7026cb4
commit 53714ba
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 29 deletions.
diff --git a/content/assets/stylesheets/_layout.scss b/content/assets/stylesheets/_layout.scss
@@ -50,6 +50,7 @@ p {
 
 .page {
   @include leader(2);
+  float:left;
   img {
     display: block;
     margin-left: auto;

diff --git a/layouts/default.haml b/layouts/default.haml
@@ -95,7 +95,8 @@
               dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
               (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
           })();
-
+      .chapter-nav
+        .wrapper
     %script{:src => "https://code.jquery.com/jquery-2.1.1.min.js"}
     %script{:src => relative_path_to("/javascripts/jquery.sticky.js")}
     %script{:src => relative_path_to("/javascripts/sticky.js")}

diff --git a/layouts/home.haml b/layouts/home.haml
@@ -60,7 +60,33 @@
             :javascript
               !function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs')
 
-    .page.container
+    .page.container              
+      .content
+        = find_and_preserve(yield)
+        .pagenav.bottom
+          - if index
+            - if index != 0
+              - i = @items[index - 1]
+              .prev
+                %a{:href => relative_path_to(i)}
+                  &larr;
+                  = i[:link_title]
+            - if i = @items[index + 1]
+              .next
+                %a{:href => relative_path_to(i)}
+                  = i[:link_title]
+                  &rarr;          
+        #disqus_thread
+        :javascript
+          /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
+          var disqus_shortname = 'clojureforthebraveandtrue'; // required: replace example with your forum shortname
+
+          /* * * DON'T EDIT BELOW THIS LINE * * */
+          (function() {
+              var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+              dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
+              (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+          })();
       .chapter-nav
         .wrapper
           %h4 Chapters
@@ -93,33 +119,6 @@
               %a{:href => "/resources/"} Other Resources
             %li
               %a{:href => "/about/"} About the Author
-
-      .content
-        = find_and_preserve(yield)
-        .pagenav.bottom
-          - if index
-            - if index != 0
-              - i = @items[index - 1]
-              .prev
-                %a{:href => relative_path_to(i)}
-                  &larr;
-                  = i[:link_title]
-            - if i = @items[index + 1]
-              .next
-                %a{:href => relative_path_to(i)}
-                  = i[:link_title]
-                  &rarr;          
-        #disqus_thread
-        :javascript
-          /* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */
-          var disqus_shortname = 'clojureforthebraveandtrue'; // required: replace example with your forum shortname
-
-          /* * * DON'T EDIT BELOW THIS LINE * * */
-          (function() {
-              var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
-              dsq.src = '//' + disqus_shortname + '.disqus.com/embed.js';
-              (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
-          })();
 
     %script{:src => "https://code.jquery.com/jquery-2.1.1.min.js"}
     %script{:src => relative_path_to("/javascripts/jquery.sticky.js")}