From 92930649ddc3a39f0569a463fa1600016388aee6 Mon Sep 17 00:00:00 2001
From: Vojta Svoboda <vojtasvoboda.cz@gmail.com>
Date: Tue, 23 Sep 2014 18:42:43 +0200
Subject: [PATCH 1/3] Fixed main navigation

---
 public/stylesheets/style.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index 8a10346..b2f9c62 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -115,6 +115,7 @@ a:hover {
 #inner-wrapper {
   margin-right: 35px;
   padding-top: 1em;
+  padding-left: 335px;
   width: 629px;
   float: left;
 }
@@ -135,7 +136,8 @@ a:hover {
 #stripe {
   background-color: #afb59b;
   background-image: url('../images/bg5.jpg');
-  height: 100%;
+  position: fixed;
+  height: auto;
   padding-top: 26px;
   float: left;
   margin: 0px 35px;

From 50a82be605444faaa31f20427c1a88fa14c8837d Mon Sep 17 00:00:00 2001
From: Vojta Svoboda <vojtasvoboda.cz@gmail.com>
Date: Tue, 23 Sep 2014 20:04:36 +0200
Subject: [PATCH 2/3] Fixed main navigation only for browser with height
 greater then 580px

---
 public/stylesheets/style.css | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
index b2f9c62..151a396 100644
--- a/public/stylesheets/style.css
+++ b/public/stylesheets/style.css
@@ -115,7 +115,6 @@ a:hover {
 #inner-wrapper {
   margin-right: 35px;
   padding-top: 1em;
-  padding-left: 335px;
   width: 629px;
   float: left;
 }
@@ -124,7 +123,11 @@ a:hover {
 
 .clearfix { clear: both; }
 
-
+@media (min-height: 580px) {
+  #inner-wrapper {
+    padding-left: 335px;
+  }
+}
 
 
 /* ######### NAVIGATION ########## */
@@ -150,24 +153,31 @@ a:hover {
 }
 
 #stripe ul {
-	padding: 26px;
-	text-align: left;
+  padding: 26px;
+  text-align: left;
 }
 
 #stripe a {
-	color: #2a1807;
+  color: #2a1807;
   display: block;
   font-weight: normal;
   font-family: Rosarivo, Arial, Sans-serif;
   padding: .42em;
   border-bottom: 1px dashed #e0d5c7;
 }
+
 #stripe a:hover {
   background: rgba(255,255,255, .25);
   border-radius: 2px;
-	color: #e95d3d;
+  color: #e95d3d;
 }
 
+@media (min-height: 580px) {
+  #stripe {
+    position: fixed;
+    height: auto;
+  }
+}
 
 
 /* ########### MAIN CONTENT ############## */

From 288775f0a4fd098591882859088ce9a33cb77a05 Mon Sep 17 00:00:00 2001
From: Vojta Svoboda <vojtasvoboda.cz@gmail.com>
Date: Tue, 23 Sep 2014 21:32:49 +0200
Subject: [PATCH 3/3] Add hard spaces to avoid having Java version number on
 new line.

---
 src/clojurekoans/view/index.hiccup.clj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/clojurekoans/view/index.hiccup.clj b/src/clojurekoans/view/index.hiccup.clj
index 966cace..7a7ace6 100644
--- a/src/clojurekoans/view/index.hiccup.clj
+++ b/src/clojurekoans/view/index.hiccup.clj
@@ -37,7 +37,7 @@
    [:p " Before we begin the koans, we need Clojure, and before we install Clojure, we'll need Java. You probably already have Java installed, but "
     "if you don't, it's not difficult. Oracle provides "
     [:a {:href "http://www.java.com/en/download/help/windows_manual_download.xml"} "installation instructions for Windows users"]
-    ", and Linux users should use their package manager of choice. Apple distributes Java 6 with their system update tool."]
+    ", and Linux users should use their package manager of choice. Apple distributes Java&nbsp;6 with their system update tool."]
    [:p "After downloading Java (if necessary), go to your console and enter:"]
    [:div.terminal "~ $ java -version"]
    [:p "Make sure the version installed is 1.5 or greater."]]
@@ -50,10 +50,10 @@
     ", Clojure's most popular dependency management tool. (It will install Clojure for us shortly.)"
     " Follow the "
     [:a {:href "http://leiningen.org/#install"} "installation instructions"]
-    " for Leiningen bliss. "]
+    " for Leiningen bliss."]
 
    [:p "Important: if you already have lein 1.x installed, you'll need to "
-    [:a {:href "https://github.com/technomancy/leiningen/wiki/Upgrading"} "upgrade to Leiningen 2"]
+    [:a {:href "https://github.com/technomancy/leiningen/wiki/Upgrading"} "upgrade to Leiningen&nbsp;2"]
     "."]
    [:p "Once you have Leiningen installed, you just need to clone the koans repo:"]
    [:div.terminal "$ git clone git://github.com/functional-koans/clojure-koans.git"]
@@ -61,7 +61,7 @@
        can still easily install the koans manually. [Note: this option will only
        work until "
     [:a {:href "https://github.com/blog/1302-goodbye-uploads"} "Github shuts down the Downloads feature completely"]
-    " in March 2013.] Just download and unzip the latest version of the koans "
+    " in March&nbsp;2013.] Just download and unzip the latest version of the koans "
     [:a {:href "https://github.com/functional-koans/clojure-koans/downloads"} "here"]
     ", and you should be ready to start."]]