4 files changed, 74 insertions, 37 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 5d928b9a..0a659bb4 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -4,6 +4,12 @@ body {
   font-family: sans-serif;
   padding:none;
   margin:0px;
+  height:100%;
+}
+
+form {
+  margin:0px;
+  padding:0px;
 }
 
 /* Carter One font */
@@ -38,6 +44,11 @@ label {
 
 /* website structure */
 
+.mediagoblin_body {
+  position:relative;
+  min-height:100%;
+}
+
 .mediagoblin_header {
   width:100%;
   height:36px;
@@ -46,6 +57,22 @@ label {
   margin-bottom:40px;
 }
 
+.mediagoblin_footer {
+  width:100%;
+  height:26px;
+  background-color:#393939;
+  bottom:0px;
+  padding-top:8px;
+  position:absolute;
+  text-align:center;
+  font-size:14px;
+  color:#999;
+}
+
+.mediagoblin_content {
+  padding-bottom:74px;
+}
+
 a.mediagoblin_logo {
   width:34px;
   height:25px;
@@ -59,66 +86,68 @@ a.mediagoblin_logo:hover {
   background-position:0px -28px;
 }
 
-.mediagoblin_container {
-  width: 960px;
-  margin-left: auto;
-  margin-right: auto;
-}
-
 .mediagoblin_header_right {
   float:right;
 }
 
+/* common website elements */
+
+.dotted_line {
+  width:100%;
+  height:0px;
+  border-bottom: dotted 1px #5f5f5f;
+  position:absolute;
+  left:0px;
+  margin-top:-20px;
+}
+
 .button {
   font-family:'Carter One', arial, serif;
   height:32px;
   min-width:99px;
   background-color:#86d4b1;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(#86d4b1), to(#62caa2)); 
+  background-image: -webkit-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:    -moz-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:     -ms-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:      -o-linear-gradient(top, #86d4b1, #62caa2); 
+  background-image:         linear-gradient(top, #86d4b1, #62caa2);
   box-shadow:0px 0px 4px #000;
   border-radius:5px;
   border:none;
   color:#272727;
-  margin:10px;
+  margin:10px 0px 10px 15px;
   font-size:1em;
-  display:block;
   text-align:center;
   padding-left:11px;
   padding-right:11px;
 }
 
-/* common website elements */
-
-.dotted_line {
-  width:100%;
-  height:0px;
-  border-bottom: dotted 1px #5f5f5f;
-  position:absolute;
-  left:0px;
-  margin-top:-20px;
-}
-
 /* forms */
 
 .form_box {
-  width:300px;
-  margin-left:auto;
-  margin-right:auto;
   background-color:#393939;
-  padding:0px 83px 30px 83px;
-  border-top:5px solid #d49086;
+  background-image:url("../images/background_lines.png");
+  background-repeat:repeat-x;
   font-size:18px;
+  padding-bottom:30px;
+  padding-top:1px;
+  margin-left:auto;
+  margin-right:auto;
+  display:block;
+  float:none;
 }
 
-.submit_box {
-  width:600px;
+.edit_box {
+  background-image:url("../images/background_edit.png");
 }
 
 .form_box h1 {
   font-size:28px;
 }
 
-.form_field_input input {
-  width:300px;
+.form_field_input input, .form_field_input textarea {
+  width:100%;
   font-size:18px;
 }
 
@@ -139,6 +168,10 @@ a.mediagoblin_logo:hover {
   margin-bottom:8px;
 }
 
+.form_submit_buttons {
+  text-align:right;
+}
+
 /* media pages */
 
 img.media_image {
@@ -147,14 +180,17 @@ img.media_image {
   margin-right:auto;
 }
 
+ul.media_thumbnail {
+  padding:0px;
+}
+
 li.media_thumbnail {
-        width: 200px;
-        min-height: 250px;
-        display: -moz-inline-stack;
-        display: inline-block;
-        vertical-align: top;
-        margin: 5px;
-        zoom: 1;
-        *display: inline;
-        _height: 250px;
+  width:200px;
+  height:200px;
+  display:-moz-inline-stack;
+  display:inline-block;
+  vertical-align:top;
+  margin:0px 10px 10px 0px;
+  zoom:1;
+. *display:inline;
 }
diff --git a/mediagoblin/static/css/contrib/960_12_col.css b/mediagoblin/static/css/contrib/960_12_col.css
new file mode 120000
index 00000000..15c360e4
--- /dev/null
+++ b/mediagoblin/static/css/contrib/960_12_col.css
@@ -0,0 +1 @@
+../../../contrib/960_12_col.css
+\ No newline at end of file
diff --git a/mediagoblin/static/images/background_edit.png b/mediagoblin/static/images/background_edit.png
new file mode 100644
index 00000000..4071fd53
--- /dev/null
+++ b/mediagoblin/static/images/background_edit.png
diff --git a/mediagoblin/static/images/background_lines.png b/mediagoblin/static/images/background_lines.png
new file mode 100644
index 00000000..e1b07afe
--- /dev/null
+++ b/mediagoblin/static/images/background_lines.png