Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix hard spaces #5

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix hard spaces #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9293064
Fixed main navigation
vojtasvoboda Sep 23, 2014
50a82be
Fixed main navigation only for browser with height greater then 580px
vojtasvoboda Sep 23, 2014
288775f
Add hard spaces to avoid having Java version number on new line.
vojtasvoboda Sep 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions public/stylesheets/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,11 @@ a:hover {

.clearfix { clear: both; }


@media (min-height: 580px) {
#inner-wrapper {
padding-left: 335px;
}
}


/* ######### NAVIGATION ########## */
Expand All @@ -135,7 +139,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;
Expand All @@ -148,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 ############## */
Expand Down
8 changes: 4 additions & 4 deletions src/clojurekoans/view/index.hiccup.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 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."]]
Expand All @@ -50,18 +50,18 @@
", 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 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"]
[:p "If you don't want to use Leiningen to manage dependencies for you, you
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 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."]]

Expand Down