Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton

6 files changed, 14 insertions, 9 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index aa2987c1..87c9b5dd 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -195,11 +195,13 @@ footer {
   margin-right: 0;
 }
 
+.media_image_container {
+  display: flex;
+  justify-content: center;
+}
+
 .media_image {
   max-width: 100%;
-  margin-left:auto;
-  margin-right:auto;
-  display:block;
 }
 
 .media_pane {
@@ -823,7 +825,7 @@ pre {
   }
 
   .media_thumbnail {
-    width: 21%;
+/*    width: 21%;*/
   }
 
   .profile_sidebar {
@@ -871,6 +873,9 @@ pre {
     margin-left:2px;
     margin-right:2px;
   }
+  .media_thumbnail.thumb_entry img {
+    margin-left: -16.5px;
+  }
   .thumb_gallery {
     margin-left: 0;
     margin-right: 0;
diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index 3fbea3be..d1e33c47 100644
--- a/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@ -57,7 +57,7 @@
       <h2>{% trans %}Add attachment{% endtrans %}</h2>
       {{- wtforms_util.render_divs(form) }}
       <div class="form_submit_buttons">
-        <a href="{{ media.url_for_self(request.urlgen) }}">
+        <a class="button_action" href="{{ media.url_for_self(request.urlgen) }}">
           {%- trans %}Cancel{% endtrans -%}
         </a>
         <input type="submit" value="{% trans %}Save changes{% endtrans %}"
diff --git a/mediagoblin/templates/mediagoblin/edit/delete_account.html b/mediagoblin/templates/mediagoblin/edit/delete_account.html
index 84d0b580..a7a3c3d2 100644
--- a/mediagoblin/templates/mediagoblin/edit/delete_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/delete_account.html
@@ -41,7 +41,7 @@
                          'mediagoblin.user_pages.user_home',
                           user=user.username) }}">{% trans %}Cancel{% endtrans %}</a>
         {{ csrf_token }}
-        <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form" />
+        <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form button_warning" />
       </div>
     </div>
   </form>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html
index 694eb979..209cd491 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html
@@ -45,7 +45,7 @@
             {{- collection.url_for_self(request.urlgen) }}">
           {%- trans %}Cancel{% endtrans -%}
         </a>
-        <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form" />
+        <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form button_warning" />
 	{{ csrf_token }}
       </div>
     </div>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html
index dc31d90f..cb4fd1a2 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html
@@ -51,7 +51,7 @@
             {{- collection_item.in_collection.url_for_self(request.urlgen) }}">
           {%- trans %}Cancel{% endtrans -%}
         </a>
-        <input type="submit" value="{% trans %}Remove{% endtrans %}" class="button_form" />
+        <input type="submit" value="{% trans %}Remove{% endtrans %}" class="button_form button_warning" />
 	{{ csrf_token }}
       </div>
     </div>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index 1d7dcc17..c948ccec 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -46,7 +46,7 @@
       <div class="form_submit_buttons">
         {# TODO: This isn't a button really... might do unexpected things :) #}
 	<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" />
+        <input type="submit" value="{% trans %}Delete permanently{% endtrans %}" class="button_form button_warning" />
 	{{ csrf_token }}
       </div>
     </div>