1 files changed, 119 insertions, 67 deletions

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index a1943d2a6..d337a45ff 100644
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -24,79 +24,40 @@ a:hover, a:active {
     color: #ff0000;
 }
 
-form {
-    margin: 0;
-    padding: 1em;
-    background-color: #97E300;
-    -moz-border-radius: 1em;
-    border-radius: 1em;
-}
-
-select, input, textarea {
-    font-size: 99%;
-}
-
-label {
-    float: left;
-    text-align: right;
-    padding-right: 0.5em;
-    width: 10em;
-    margin-bottom: 0.5em;
-}
-
-/* Flashes */
-
-#errorExplanation, #error, #notice {
-    text-align: center;
-    font-size: larger;
-    padding: 4px;
-    margin: 1em;
-}
-#errorExplanation, #error {
-    color: #cc0000;
-    background-color: #ffcccc;
-    border: solid 1px #cc0000;
-}
-#notice {
-    color: #00cc00;
-    background-color: #eeffee;
-    border: solid 1px #00cc00;
-}
-
-/* Form error highlighting */
-
-.fieldWithErrors input, .fieldWithErrors input[type=text], 
-.fieldWithErrors select, .fieldWithErrors input[type=radio],
-.fieldWithErrors input[type=password],
-.fieldWithErrors textarea
-{
-    border: solid 1px #cc0000;
-    background-color: #ffcccc;
-}
-
 /* Site-wide layout */
 
 #header {
-    font-size: 200%;
-    font-weight: bold;
-    border-bottom: solid 2px #4e451b;
+    border-bottom: solid 1px #4e451b;
     margin: 0;
     padding: 5px 0.5em;
-    background-color: #97E300;
-    color: #4e451b;
-    /* 4e451b is another useful green */
+    background-color: #a8f400;
+    color: #000000;
+    /* 4e451b, a8f400 are useful greens */
+}
+
+#header h1 {
+    font-size: 200%;
+    font-weight: bold;
 }
 
 #beta {
     color: #6e653b;
-    background-color: #97E300;
+    background-color: #a8f400;
+    font-size: 50%;
+}
+#tagline {
+    /* color: #6e653b; */
+
+    color: #000000;
+    background-color: #a8f400;
+    padding-top: -2em;
     font-size: 50%;
     font-style: italic;
 }
 
 #header a:link, #header a:visited {
-    color: #4e451b;
-    background-color: #97E300;
+    color: #000000;
+    background-color: #a8f400;
     text-decoration: none;
 }
 #header a:active, #header a:hover {
@@ -113,11 +74,13 @@ label {
 /* Can't put the margin in #content because of above IE craziness */
 #wrapper {
     margin: 2em;
+    margin-left: 4em;
+    margin-right: 4em;
 }
 
 #navigation {
     position: absolute;
-    top: 1em;
+    top: 2em;
     right: 1em;
     padding: 0;
     margin: 0;
@@ -135,26 +98,101 @@ label {
     padding: 0.5em 1em;
 }
 #navigation a:link, #navigation a:visited {
-    color: #4e451b;
+    color: #000000;
 }
 #navigation a:hover, #navigation a:active {
     background-color: #4e451b;
-    color: #97E300;
+    color: #a8f400;
 }
 
 #logged_in_bar {
     text-align: right;
+    margin-top: 0.5em;
+    margin-right: 1em;
+}
+
+/* Forms */
+
+form {
+    margin: 0;
+    padding: 1em;
+}
+
+.plaque {
+    background-color: #a8f400;
+    -moz-border-radius: 1em;
+    border-radius: 1em;
+}
+
+select, input, textarea {
+    font-size: 99%;
+}
+
+label {
+    float: left;
+    text-align: right;
+    padding-right: 0.5em;
+    width: 10em;
+    margin-bottom: 0.5em;
+}
+.form_note {
+    margin-left: 10.5em;
+}
+.form_button {
+    margin-left: 10em;
 }
 
-/* Front page */
+/* Flashes */
 
-#explanation {
+#errorExplanation, #error, #notice {
     text-align: center;
-    font-size: 150%;
-    margin: 0 2em;
+    font-size: larger;
+    padding: 0.5em;
+    margin: 1em;
 }
+#errorExplanation, #error {
+    color: #cc0000;
+    background-color: #ffcccc;
+    border: solid 1px #cc0000;
+}
+#notice {
+    color: #00cc00;
+    background-color: #eeffee;
+    border: solid 1px #00cc00;
+}
+
+/* Form error highlighting */
+
+.fieldWithErrors input, .fieldWithErrors input[type=text], 
+.fieldWithErrors select, .fieldWithErrors input[type=radio],
+.fieldWithErrors input[type=password],
+.fieldWithErrors textarea
+{
+    border: solid 1px #cc0000;
+    background-color: #ffcccc;
+}
+
+/* / - front page */
 
-/* Submitting requests */
+#frontpage h1 {
+    margin-bottom: 1em;
+}
+#frontpage #make_requests {
+    text-align: center;
+    width: 45%;
+    float: left;
+}
+#frontpage #public_body_form {
+}
+
+#frontpage #find_information {
+    text-align: center;
+    width: 45%;
+    float: right;
+}
+
+
+/* /new - submitting requests */
 
 #writeForm {
     float: right;
@@ -169,6 +207,20 @@ label {
     float: right;
 }
 
+/* /list - browsing requests */
+table#list_requests {
+    border-collapse: collapse; 
+    border: solid 1px #4e451b;
+    border-width: 1px 0 1px 1px;
+}
+table#list_requests td, table#list_requests th {
+    margin: 0; padding: 0.2em;
+    border: solid 1px #4e451b;
+}
+table#list_requests .odd {
+    background-color: #dddddd;
+}
+
 /* User accounts */
 
 #accountForm {