Merge branch 'master' into develop

This commit is contained in:
Morgan 2015-03-14 07:49:39 +00:00
commit eb477de5b9
2 changed files with 10 additions and 1 deletions

View File

@ -24,3 +24,10 @@ body {
padding: 4px 6px 4px 6px; padding: 4px 6px 4px 6px;
border:4px solid #eeeeee; border:4px solid #eeeeee;
} }
.table {
font: large;
margin: 8px;
padding: 4px 6px 4px 6px;
border:4px solid #eeeeee;
}

View File

@ -94,9 +94,11 @@
[:title "Main Page"] [:title "Main Page"]
[:link {:rel "stylesheet" :href "/pronouns.css"}]] [:link {:rel "stylesheet" :href "/pronouns.css"}]]
[:body [:body
[:div {:class "table"}
[:p "pronoun.is is a www site for showing people how to use pronouns"] [:p "pronoun.is is a www site for showing people how to use pronouns"]
[:p "here are some pronouns the site knows about:"] [:p "here are some pronouns the site knows about:"]
[:ul links]]]))) [:ul links]]]
(contact-block)])))
(defn not-found [] (defn not-found []
(str "We couldn't find those pronouns in our database, please ask us to " (str "We couldn't find those pronouns in our database, please ask us to "