Browse files

Merge branch 'release/2.0.0-alpha5'

  • Loading branch information...
2 parents f01f181 + 8d384dc commit 84d39e0dc980a4e7beee9e7161f98f460a7fdd46 @amalloy amalloy committed Aug 30, 2012
Showing with 12 additions and 6 deletions.
  1. +1 −1 project.clj
  2. +7 −3 resources/public/css/style.css
  3. +4 −2 src/foreclojure/problems.clj
View
2 project.clj
@@ -1,4 +1,4 @@
-(defproject foreclojure "2.0.0-alpha4"
+(defproject foreclojure "2.0.0-alpha5"
:description "4clojure - a website for learning Clojure"
:dependencies [[org.clojure/clojure "1.4.0"]
[compojure "1.1.0"]
View
10 resources/public/css/style.css
@@ -616,13 +616,17 @@ a.graph-class :hover {color: #445599;}
font-weight: bold;
}
-.solution-user-code {
- background-color: #DDD;
+.syntaxhighlighter.solution-code.solution-user-code {
+ background-color: #DDD !important;
padding: 15px;
margin-bottom: 25px;
}
-.solution-code {
+.syntaxhighlighter.solution-code.solution-user-code div {
+ background-color: #DDD !important;
+}
+
+.syntaxhighlighter.solution-code {
padding-left: 10px;
}
View
6 src/foreclojure/problems.clj
@@ -348,7 +348,8 @@ Return a map, {:message, :error, :url, :num-tests-passed}."
(with-user [{:keys [_id following]}]
(list
(let [user-code (get-solution :public _id problem-id)]
- [:pre.solution-code.solution-user-code (escape-html user-code)])
+ [:pre {:class "brush: clojure;gutter: false;toolbar: false;light: true; class-name: 'solution-code solution-user-code'"}
+ (escape-html user-code)])
(if (empty? following)
[:p "You can only see solutions of users whom you follow. Click on any name from the " (link-to "/users" "users") " listing page to see their profile, and click follow from there."]
(if (some (complement nil?) (map #(get-solution :public % problem-id) following))
@@ -363,7 +364,8 @@ Return a map, {:message, :error, :url, :num-tests-passed}."
:when f-code]
[:div.follower-solution
[:div.solution-username (str f-user "'s solution:")]
- [:pre.solution-code (escape-html f-code)]]))
+ [:pre {:class "brush: clojure;gutter: false;toolbar: false;light: true; class-name: 'solution-code'"}
+ (escape-html f-code)]]))
[:p "None of the users you follow have solved this problem yet!"])))))})
(defn show-solutions [id]

0 comments on commit 84d39e0

Please sign in to comment.