Permalink
Browse files

Merge branch 'release/0.2.0'

  • Loading branch information...
2 parents c70b48e + 248851d commit 24cc9e6c841e2d052426f6932bfe21b6f9e4dd09 @amalloy amalloy committed Apr 30, 2011
Showing with 16,187 additions and 55 deletions.
  1. +9 −8 README.md
  2. +1 −1 project.clj
  3. +5 −1 resources/public/css/demo_table.css
  4. +38 −2 resources/public/css/style.css
  5. BIN resources/public/images/bluelight.png
  6. BIN resources/public/images/greenlight.png
  7. BIN resources/public/images/redlight.png
  8. +13,357 −0 resources/public/script/ace/src/ace-uncompressed.js
  9. +1 −0 resources/public/script/ace/src/ace.js
  10. +2,504 −0 resources/public/script/ace/src/cockpit-uncompressed.js
  11. +1 −0 resources/public/script/ace/src/cockpit.js
  12. +1 −0 resources/public/script/ace/src/keybinding-emacs.js
  13. +1 −0 resources/public/script/ace/src/keybinding-vim.js
  14. +1 −0 resources/public/script/ace/src/mode-c_cpp.js
  15. +1 −0 resources/public/script/ace/src/mode-clojure.js
  16. +1 −0 resources/public/script/ace/src/mode-coffee.js
  17. +1 −0 resources/public/script/ace/src/mode-csharp.js
  18. +1 −0 resources/public/script/ace/src/mode-css.js
  19. +1 −0 resources/public/script/ace/src/mode-html.js
  20. +1 −0 resources/public/script/ace/src/mode-java.js
  21. +1 −0 resources/public/script/ace/src/mode-javascript.js
  22. +1 −0 resources/public/script/ace/src/mode-perl.js
  23. +1 −0 resources/public/script/ace/src/mode-php.js
  24. +1 −0 resources/public/script/ace/src/mode-python.js
  25. +1 −0 resources/public/script/ace/src/mode-ruby.js
  26. +1 −0 resources/public/script/ace/src/mode-svg.js
  27. +1 −0 resources/public/script/ace/src/mode-xml.js
  28. +1 −0 resources/public/script/ace/src/theme-clouds.js
  29. +1 −0 resources/public/script/ace/src/theme-clouds_midnight.js
  30. +1 −0 resources/public/script/ace/src/theme-cobalt.js
  31. +1 −0 resources/public/script/ace/src/theme-dawn.js
  32. +1 −0 resources/public/script/ace/src/theme-eclipse.js
  33. +1 −0 resources/public/script/ace/src/theme-idle_fingers.js
  34. +1 −0 resources/public/script/ace/src/theme-kr_theme.js
  35. +1 −0 resources/public/script/ace/src/theme-merbivore.js
  36. +1 −0 resources/public/script/ace/src/theme-merbivore_soft.js
  37. +1 −0 resources/public/script/ace/src/theme-mono_industrial.js
  38. +1 −0 resources/public/script/ace/src/theme-monokai.js
  39. +1 −0 resources/public/script/ace/src/theme-pastel_on_dark.js
  40. +1 −0 resources/public/script/ace/src/theme-twilight.js
  41. +1 −0 resources/public/script/ace/src/theme-vibrant_ink.js
  42. +1 −0 resources/public/script/ace/src/worker-javascript.js
  43. +34 −1 resources/public/script/foreclojure.js
  44. +3 −1 src/foreclojure/core.clj
  45. +106 −1 src/foreclojure/data_set.clj
  46. +23 −0 src/foreclojure/db_utils.clj
  47. +4 −1 src/foreclojure/feeds.clj
  48. +55 −32 src/foreclojure/problems.clj
  49. +2 −2 src/foreclojure/social.clj
  50. +3 −1 src/foreclojure/static.clj
  51. +10 −4 src/foreclojure/utils.clj
View
@@ -38,14 +38,15 @@ vaguely like this:
## Contributors
- * David Byrne (dbyrne)
- * Alan Malloy (amalloy)
- * Anthony Grimes (raynes)
- * Carin Meier (cmeier)
- * Clint Harrison (clinteger)
- * David Davis (daviddavis)
- * Devin Walters (devn)
- * Michael Kohl (citizen428)
+* [David Byrne](https://github.com/dbyrne) (dbyrne)
+ * [Alan Malloy](https://github.com/amalloy) (amalloy)
+ * [Anthony Grimes](https://github.com/Raynes) (raynes)
+ * [Carin Meier](https://github.com/gigasquid) (cmeier)
+ * [Clint Harrison](https://github.com/Clinteger) (clinteger)
+ * [David Davis](https://github.com/daviddavis) (daviddavis)
+ * [Devin Walters](https://github.com/devn) (devn)
+ * [Michael Kohl](https://github.com/citizen428) (citizen428)
+
Problem sources:
View
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.1.3.2"
+(defproject foreclojure "0.2.0"
:description "4clojure - a website for lisp beginners"
:dependencies [[org.clojure/clojure "1.2.1"]
[org.clojure/clojure-contrib "1.2.0"]
@@ -32,7 +32,7 @@
.dataTables_wrapper {
float: left;
- width: 95%;
+ width: 100%;
min-height: 302px;
clear: both;
_height: 302px;
@@ -78,6 +78,10 @@
text-align: right;
}
+.dataTables_wrapper th {
+ min-width: 70px;
+}
+
/* Pagination nested */
.paginate_disabled_previous, .paginate_enabled_previous, .paginate_disabled_next, .paginate_enabled_next {
height: 19px;
@@ -44,6 +44,16 @@ body {
border-radius: 15px;
}
+#content_body {
+ margin: 15px;
+ padding: 15px 0px 15px 0px;
+ text-align: left;
+ background-color: #fff;
+ overflow: auto;
+ -moz-border-radius: 15px;
+ border-radius: 15px;
+}
+
#top {
width: 95%;
padding: 15px 0px 15px 0px;
@@ -107,6 +117,13 @@ a.novisited {color: #00e;}
float: left;
}
+#totalcount {
+ float: right;
+ padding: 8px;
+ font-size: 20px;
+ background-color: aliceblue;
+}
+
#footer{
background-color:#445599;
padding: 15px;
@@ -143,7 +160,7 @@ span.error, div.error {
color: red;
}
-div.congrats {
+div.message {
color: red;
margin-bottom: 8px;
font-size: 16px;
@@ -159,7 +176,13 @@ div#prob-desc {
overflow: hidden;
}
-div.testcases {
+table.testcases {
+ font-size: 1.3em;
+ float: left;
+}
+
+div#shared-code-box {
+ width: 90%;
font-size: 1.3em;
float: left;
}
@@ -205,6 +228,19 @@ textarea#code-box {
height: 250px;
}
+#code-div{
+ width: 100%;
+ height: 250px;
+}
+
+#editor {
+ margin: 0px;
+ float: left;
+ width: 50%;
+ height: 250px;
+ overflow: hidden
+}
+
table.my-table {
padding: 2px;
border-collapse: collapse;
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.

0 comments on commit 24cc9e6

Please sign in to comment.