Permalink
Browse files

Merge branch 'release/0.1.1'

  • Loading branch information...
2 parents a492b3d + 44b3e02 commit 2de3c185368485907ef8f8349524117c2b6ef5fc @amalloy amalloy committed Apr 23, 2011
View
@@ -40,7 +40,7 @@ vaguely like this:
* David Byrne <david.r.byrne@gmail.com>
* Alan Malloy
- * Anthony Simpson
+ * Anthony Grimes
* Carin Meier
Problem sources:
View
@@ -0,0 +1,3 @@
+@echo off
+for /f %%a in ('lein classpath') do @set project_classpath=%%a
+java -cp %project_classpath% clojure.main .\src\foreclojure\data_set.clj
View
@@ -1,4 +1,4 @@
-(defproject foreclojure "0.0.3"
+(defproject foreclojure "0.1.1"
:description "4clojure - a website for lisp beginners"
:dependencies [[org.clojure/clojure "1.2.1"]
[org.clojure/clojure-contrib "1.2.0"]
@@ -1,4 +1,3 @@
-
body {
background-color: #bbddee;
font-size: 12px;
@@ -49,6 +48,7 @@ h3 {
color: #fff;
}
+a.novisited {color: #00e;}
#menu a:link {color: #fff;}
#menu a:visited {color: #fff;}
@@ -165,7 +165,10 @@ div#restrictions {
font-size: 16px;
}
-
+#contact {
+ color: #FFFFFF;
+ margin-left: 1.3em;
+}
textarea#code-box {
width: 500px;
@@ -190,6 +193,54 @@ table.my-table th {
padding: 10px 0px 0px 0px;
font-size: 14px;
font-weight: bold;
+}
- }
+button {
+ border: 1px solid #A1CC59;
+ color: #32401C;
+ font-size: 14px;
+ font-weight: bold;
+ height: 23px;
+ margin: 4px;
+ padding: 1px 6px 2px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+ background: #BCEE68;
+ background: -moz-linear-gradient(top, #BCEE68, #A1CC59);
+ background: -webkit-gradient(linear, left top, left bottom, from(#BCEE68), to(#A1CC59));
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#BCEE68', endColorstr='#A1CC59')";
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#BCEE68', endColorstr='#A1CC59');
+}
+
+button.large {
+ font-size: 16px;
+ padding: 3px 10px;
+ height: 26px;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+button:hover {
+ cursor: pointer;
+ outline: none;
+ text-decoration: none;
+ background: #D1F09E;
+ background: -moz-linear-gradient(top, #D1F09E, #A1CC59);
+ background: -webkit-gradient(linear, left top, left bottom, from(#D1F09E), to(#A1CC59));
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#D1F09E', endColorstr='#A1CC59')";
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#D1F09E', endColorstr='#A1CC59');
+}
+
+button:active {
+ position: relative;
+ top: 1px;
+ outline: none;
+ background: #A1CC59;
+ background: -moz-linear-gradient(top, #A1CC59, #A7D45C);
+ background: -webkit-gradient(linear, left top, left bottom, from(#A1CC59), to(#A7D45C));
+ -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#A1CC59', endColorstr='#A7D45C')";
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#A1CC59', endColorstr='#A7D45C');
+}
View
@@ -1,6 +1,7 @@
(ns foreclojure.core
(:use compojure.core
- [foreclojure static problems login register users config]
+ [foreclojure static problems login register
+ users config social]
ring.adapter.jetty
somnium.congomongo
[ring.middleware.reload :only [wrap-reload]])
@@ -28,6 +29,7 @@
problems-routes
users-routes
static-routes
+ social-routes
(route/resources "/")
(route/not-found "Page not found"))
Oops, something went wrong.

0 comments on commit 2de3c18

Please sign in to comment.