Merge branch 'master' into test_submission_views_365

3 files changed, 42 insertions, 24 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 5d928b9a..1d04fc73 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -69,34 +69,39 @@ a.mediagoblin_logo:hover {
   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 {
@@ -104,8 +109,9 @@ a.mediagoblin_logo:hover {
   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;
+  padding:1px 83px 30px 83px;
   font-size:18px;
 }
 
@@ -113,6 +119,11 @@ a.mediagoblin_logo:hover {
   width:600px;
 }
 
+.edit_box {
+  width:600px;
+  background-image:url("../images/background_edit.png");
+}
+
 .form_box h1 {
   font-size:28px;
 }
@@ -139,6 +150,10 @@ a.mediagoblin_logo:hover {
   margin-bottom:8px;
 }
 
+.form_submit_buttons {
+  text-align:right;
+}
+
 /* media pages */
 
 img.media_image {
@@ -147,14 +162,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:133px;
+  display:-moz-inline-stack;
+  display:inline-block;
+  vertical-align:top;
+  margin:0px 10px 10px 0px;
+  zoom:1;
+. *display:inline;
 }
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