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

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index aa2987c1d22dab560ece8a66ac8a2ff5c65ce62f..87c9b5dd2ce4c9cdc4eb9c1dd0733ecdfdc17394 100644 (file)
--- 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 3fbea3be329f84577c6864e3f22c4bb986a83f39..d1e33c47a8d14fb1b3d7591b4956794e9848a783 100644 (file)
--- 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 84d0b580a81a889abd132e66afabcdbad678da9d..a7a3c3d2da414fb70f20a97e385b7b4496fe715f 100644 (file)
--- 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 694eb9797cbac8585dcebfb60e77a5a1fc1870f6..209cd491f6add2bd0b5da41fde88daf91c557021 100644 (file)
--- 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 dc31d90f89e74df8c7ba0c6916424aab089b80fe..cb4fd1a2c0dc64d8cb1ef2b73a9d72d8c0cff5e9 100644 (file)
--- 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 1d7dcc1701b921836db23944757747eaa1ef22a1..c948ccec10969e48a4a35b3e54571f16c0b4f329 100644 (file)
--- 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>