6 files changed, 53 insertions, 37 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 73b07384..cb321c85 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -157,6 +157,12 @@ footer {
   float: left;  
 }
 
+img.media_image {
+  margin-left: auto;
+  margin-right: auto;
+  display: block;
+}
+
 .media_sidebar {
   width: 280px;
   margin-left: 10px;
@@ -178,7 +184,7 @@ footer {
 
 /* common website elements */
 
-.button_action, .button_action_highlight {
+.button_action, .button_action_highlight, .button_form {
   display: inline-block;
   color: #c3c3c3;
   background-color: #363636;
@@ -193,43 +199,17 @@ footer {
   cursor: pointer;
 }
 
-.button_action_highlight {
+.button_action_highlight, .button_form {
   background-color: #86D4B1;
   border-color: #A2DEC3 #6CAA8E #5C9179;
   color: #283F35;
 }
 
-.button_form, .cancel_link {
-  height: 32px;
+.button_form {
   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: 3px;
-  border: none;
-  color: #272727;
   margin: 10px 0px 10px 15px;
   text-align: center;
-  padding-left: 11px;
-  padding-right: 11px;
-  text-decoration: none;
   font-family: 'Lato', sans-serif;
-  font-weight: bold;
-}
-
-.cancel_link {
-  background-color: #aaa;
-  background-image: -webkit-gradient(linear, left top, left bottom, from(##D2D2D2), to(#aaa)); 
-  background-image: -webkit-linear-gradient(top, #D2D2D2, #aaa); 
-  background-image:    -moz-linear-gradient(top, #D2D2D2, #aaa); 
-  background-image:     -ms-linear-gradient(top, #D2D2D2, #aaa); 
-  background-image:      -o-linear-gradient(top, #D2D2D2, #aaa); 
-  background-image:         linear-gradient(top, #D2D2D2, #aaa);
 }
 
 .pagination {
@@ -274,8 +254,7 @@ textarea#comment_content {
 
 .form_box,.form_box_xl {
   background-color: #222;
-  background-image: url("../images/background_lines.png");
-  background-repeat: repeat-x;
+  border-top: 6px solid #D49086;
   padding: 3% 5%;
   display: block;
   float: none;
@@ -290,7 +269,7 @@ textarea#comment_content {
 }
 
 .edit_box {
-  background-image: url("../images/background_edit.png");
+  border-top: 6px dashed #D49086
 }
 
 .form_field_input input, .form_field_input textarea {
@@ -362,11 +341,11 @@ textarea#comment_content {
 /* media galleries */
 
 .media_thumbnail {
+  display: inline-block;
   padding: 0px;
   width: 180px;
   overflow: hidden;
-  float: left;
-  margin: 0px 4px 10px 4px;
+  margin: 0px 5px 10px 5px;
   text-align: center;
   font-size: 0.875em;
 }
@@ -510,6 +489,11 @@ table.media_panel th {
   }
   img.media_image {
     width: 100%;
+    display: inline;
+  }
+
+  .media_thumbnail {
+    width: 21%;
   }
 }
 
@@ -522,4 +506,35 @@ table.media_panel th {
     width: 100%;
     margin: 0px;
   }
+  
+  .navigation {
+    float: none;
+  }
+  
+  .navigation_button {
+    width: 49%;
+    float: right;
+    padding: 10px 0 14px;
+  }
+  
+  .navigation_left {
+    margin-right: 0;
+    float: left;
+  }
+  
+  .button_action, .button_action_highlight, .button_form { 
+    padding: 9px 14px;
+  }
+}
+
+@media screen and (max-width: 570px) {
+  .media_thumbnail {
+    width: 29%;
+  }
+}
+
+@media screen and (max-width: 380px) {
+  .media_thumbnail {
+    width: 46%;
+  }
 }
diff --git a/mediagoblin/static/images/background_edit.png b/mediagoblin/static/images/background_edit.png
deleted file mode 100644
index 4071fd53..00000000
--- a/mediagoblin/static/images/background_edit.png
+++ /dev/null
diff --git a/mediagoblin/static/images/background_lines.png b/mediagoblin/static/images/background_lines.png
deleted file mode 100644
index e1b07afe..00000000
--- a/mediagoblin/static/images/background_lines.png
+++ /dev/null
diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 0c4d5bb1..3f7cbe0e 100644
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -33,7 +33,7 @@
       </div>
       {{ wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <a href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
+        <a class="button_action" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
         <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
 	{{ csrf_token }}
       </div>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index d2503a4e..fb79e4dc 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -189,4 +189,5 @@
 
     {% include "mediagoblin/utils/exif.html" %}
   </div>
+  <div class="clear"></div>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index e64845e7..a3459206 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -46,8 +46,8 @@
 
       <div class="form_submit_buttons">
         {# TODO: This isn't a button really... might do unexpected things :) #}
-	<a class="cancel_link" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
-        <input type="submit" value="{% trans %}Delete Permanently{% endtrans %}" class="button_form" />
+	<a class="button_action" href="{{ media.url_for_self(request.urlgen) }}">{% trans %}Cancel{% endtrans %}</a>
+        <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form" />
 	{{ csrf_token }}
       </div>
     </div>