Permalink
Browse files

Merge branch 'develop' of https://github.com/gigasquid/4clojure into …

…develop
  • Loading branch information...
2 parents 5879561 + a5b957b commit 86e339de62a6c66e3b9b25cd0b5301e54281492b @amalloy amalloy committed Apr 20, 2011
Showing with 87 additions and 94 deletions.
  1. +71 −74 resources/public/style.css
  2. +5 −4 src/foreclojure/static.clj
  3. +11 −16 src/foreclojure/utils.clj
@@ -1,55 +1,83 @@
-span.error, div.error {
- color: red;
+body {
+ background-color: #bbddee;
+ font-size: 12px;
+ font-family: Verdana, Arial, Helvetica, SunSans-Regular, Sans-Serif;
+ color:#564b47;
+ margin: 20px 140px 20px 140px;
+ text-align: center;
}
-div.congrats {
- color: red;
- margin-bottom: 8px;
- font-size: 16px;
+#content {
+ width: 95%;
+ padding: 15px 0px 15px 0px;
+ text-align: left;
+ background-color: #fff;
+ overflow: auto;
+ -moz-border-radius: 15px;
+ border-radius: 15px;
}
-html body {
- margin-top: 0px;
- margin-bottom: 0px;
- margin-left: 2px;
- margin-right:auto;
- padding-top: 8px;
- padding-left: 8px;
- width: 75%;
+#top {
+ width: 95%;
+ padding: 15px 0px 15px 0px;
}
-#header {
- width: 100%;
- float: left;
+h3 {font-size: 18px;
}
-div#menu {
- padding-left: 7px;
- padding-top: 7px;
- padding-bottom: 7px;
- padding-right: 15px;
- float: left;
- font-family: sans-serif;
+
+#menu{
+background-color:#445599;
+padding: 15px;
+color: #fff
}
-div#menu li {
- padding-top: 5px;
- padding-bottom: 5px;
- padding-left: 8px;
- padding-right: 8px;
- list-style-type: none;
- background-color: #eee;
+
+#menu a:link {color: #fff;}
+#menu a:visited {color: #fff;}
+#menu a:active {color: #fff;}
+#menu a:hover {color: #7CFC00;}
+#menu a {text-decoration: none; font-size: 14px; font-weight:bold; margin: 15px}
+
+#user-info{
+float:right;
}
-div#menu li:hover {
- background-color: #BCEE68;
+#logo {
+float:left;
+padding:15px 0px 15px 0px;
+}
+
+#content{
+margin:15px
+}
+
+#welcome{
+width: 90%;
+float: left;
+}
+
+#footer{
+background-color:#445599;
+padding: 15px;
+color: #fff;
+text-align: center;
+}
+
+#footer img {
+float: left;
+}
+
+
+
+span.error, div.error {
+ color: red;
}
-div#content {
- width: 100%;
- padding-bottom: 10px;
- font-family: serif;
- font-size: 14px;
+div.congrats {
+ color: red;
+ margin-bottom: 8px;
+ font-size: 16px;
}
span#prob-title {
@@ -90,42 +118,7 @@ div#restrictions {
font-size: 16px;
}
-a:hover {
- text-decoration: underline;
-}
-
-a {
- text-decoration: none;
- color: blue;
-}
-img#logo {
- float: left;
-}
-
-a#logout {
- margin-right: 5px;
- float: right;
-}
-
-#user-info {
- background-color: #eee;
- margin-top: 15px;
- margin-left: 2em;
- padding: 5px;
- float: left;
- width: 40%;
- font-size: 14px;
- font-family: sans-serif;
- text-align: center;
-}
-
-span#footer {
- float: right;
- width: 813px;
- background-color: #eee;
- text-align: center;
-}
textarea#code-box {
width: 350px;
@@ -161,4 +154,8 @@ table.my-table th {
background-color: #BCEE68;
padding: 2px;
border-collapse: collapse;
-}
+}
+
+
+
+
@@ -11,10 +11,10 @@
"StackOverflow.com: A Gentle Tutorial to Emacs/Swank/Paredit for Clojure"]]])
(def-page welcome-page []
- [:div
+ [:div {:id "welcome"}
[:div
[:h3 "What is 4Clojure?"]
- "4Clojure is a resource to help fledgling clojurians learn the language through interactive problems. The first few problems are easy enough that even someone with no prior experience should find the learning curve forgiving. See 'Getting Started' for more information."]
+ [:p "4Clojure is a resource to help fledgling clojurians learn the language through interactive problems. The first few problems are easy enough that even someone with no prior experience should find the learning curve forgiving. See 'Getting Started' for more information."]]
[:div
[:h3 "Is this site written in Clojure?"]
@@ -23,7 +23,8 @@
" is itself open source. Once you've mastered the language, feel free to contribute something back to the community."]
[:div
[:h3 "So wait, I can't buy cheap real estate here?"]
- "At this time, 4clojure.com does not provide information regarding the sale of foreclosed homes, and has no plans of doing so in the future."]])
+ [:p "At this time, 4clojure.com does not provide information regarding the sale of foreclosed homes, and has no plans of doing so in the future."]]
+ [:img {:src "/PoweredMongoDBbeige50.png"}]])
(def-page getting-started-page []
[:div
@@ -68,4 +69,4 @@
[:a {:href "http://clojure.org/getting_started"} "getting started"]
" page for help with installation."
[:br][:br]
- "You should now be ready to start solving problems. Happy coding!"])
+ "You should now be ready to start solving problems. Happy coding!"])
@@ -65,26 +65,21 @@
})();
"
)]
- [:body
- [:div {:id "header"}
- [:img {:id "logo" :src "/logo.png"}]
- [:div {:id "user-info"}
+ [:body
+ [:div {:id "top"} [:img {:id "logo" :src "/logo.png"}]]
+ [:div {:id "content"}
+ [:div {:id "menu"}
+ [:a {:href "/"} "Main Page"]
+ [:a {:href "/problems"} "Problem List"]
+ [:a {:href "/users"} "Top Users"]
+ [:a {:href "/directions"} "Getting Started"]
+ [:span {:id "user-info"}
(if-let [user (session/session-get :user)]
[:div
(str "Logged in as " user)
[:a {:id "logout" :href "/logout"} "Logout"]]
[:div
[:a {:href "/login"} "Login"] " or "
[:a {:href "/register"} "Register"]])]]
- [:div {:id "menu"}
- [:ul
- [:li [:a {:href "/"} "Main Page"]]
- [:li [:a {:href "/problems"} "Problem List"]]
- [:li [:a {:href "/users"} "Top Users"]]
- [:li [:a {:href "/directions"} "Getting Started"]]
- [:li [:a {:href "/links"} "Useful Links"]]]
- [:div
- [:img {:src "/PoweredMongoDBbeige50.png"}]]]
- [:div {:id "content"} body]
- [:footer
- [:span {:id "footer"} "© 2011 David Byrne" ]]]]))
+ [:div {:id "content"} body]
+ [:div {:id "footer"} "© 2011 David Byrne" ]]]]))

0 comments on commit 86e339d

Please sign in to comment.