Permalink
Browse files

Merge branch 'hotfix/0.1.3.2'

  • Loading branch information...
2 parents 5717cd0 + 62c1a35 commit c70b48e0ec6807c2481623a4c7a73a0d7e502345 @amalloy amalloy committed Apr 25, 2011
Showing with 6 additions and 2 deletions.
  1. +1 −1 project.clj
  2. +3 −0 resources/public/css/style.css
  3. +1 −1 src/foreclojure/problems.clj
  4. +1 −0 src/foreclojure/utils.clj
View
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.1.3.1"
+(defproject foreclojure "0.1.3.2"
:description "4clojure - a website for lisp beginners"
:dependencies [[org.clojure/clojure "1.2.1"]
[org.clojure/clojure-contrib "1.2.0"]
@@ -176,6 +176,9 @@ li.testcase {
background-color: #eee;
font-family: Courier;
}
+div.syntaxhighlighter {
+ padding: 4px;
+}
div#restrictions {
list-style-type: none;
@@ -104,7 +104,7 @@
[:u "Special Restrictions"] [:br]
(map (partial vector :li) restricted)])]
[:div
- [:b "Enter your code:" [:br]
+ [:b "Code which fills in the blank:" [:br]
[:span {:class "error"} (session/flash-get :error)]]]
(form-to [:post "/run-code"]
(text-area {:id "code-box"
@@ -67,6 +67,7 @@
[:html
[:head
[:title "4Clojure"]
+ [:link {:rel "alternate" :type "application/atom+xml" :title "Atom" :href "http://4clojure.com/problems/rss"}]
(include-js "/script/jquery-1.5.2.min.js" "/script/jquery.dataTables.min.js")
(include-js "/script/foreclojure.js")
(include-js "/script/xregexp.js" "/script/shCore.js" "/script/shBrushClojure.js")

0 comments on commit c70b48e

Please sign in to comment.