heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jpope777 2014-01-07 20:40:12 -06:00
commit b2de5021c6
6 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mediagoblin/static/css/base.css
View File

@ -195,11 +195,13 @@ footer {
margin-right: 0; margin-right: 0;
} }
.media_image_container {
display: flex;
justify-content: center;
}
.media_image { .media_image {
max-width: 100%; max-width: 100%;
margin-left:auto;
margin-right:auto;
display:block;
} }
.media_pane { .media_pane {
@ -823,7 +825,7 @@ pre {
} }
.media_thumbnail { .media_thumbnail {
width: 21%; /* width: 21%;*/
} }
.profile_sidebar { .profile_sidebar {
@ -871,6 +873,9 @@ pre {
margin-left:2px; margin-left:2px;
margin-right:2px; margin-right:2px;
} }
.media_thumbnail.thumb_entry img {
margin-left: -16.5px;
}
.thumb_gallery { .thumb_gallery {
margin-left: 0; margin-left: 0;
margin-right: 0; margin-right: 0;

2
mediagoblin/templates/mediagoblin/edit/attachments.html
View File

@ -57,7 +57,7 @@
<h2>{% trans %}Add attachment{% endtrans %}</h2> <h2>{% trans %}Add attachment{% endtrans %}</h2>
{{- wtforms_util.render_divs(form) }} {{- wtforms_util.render_divs(form) }}
<div class="form_submit_buttons"> <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 -%} {%- trans %}Cancel{% endtrans -%}
</a> </a>
<input type="submit" value="{% trans %}Save changes{% endtrans %}" <input type="submit" value="{% trans %}Save changes{% endtrans %}"

2
mediagoblin/templates/mediagoblin/edit/delete_account.html
View File

@ -41,7 +41,7 @@
'mediagoblin.user_pages.user_home', 'mediagoblin.user_pages.user_home',
user=user.username) }}">{% trans %}Cancel{% endtrans %}</a> user=user.username) }}">{% trans %}Cancel{% endtrans %}</a>
{{ csrf_token }} {{ 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>
</div> </div>
</form> </form>

2
mediagoblin/templates/mediagoblin/user_pages/collection_confirm_delete.html
View File

@ -45,7 +45,7 @@
{{- collection.url_for_self(request.urlgen) }}"> {{- collection.url_for_self(request.urlgen) }}">
{%- trans %}Cancel{% endtrans -%} {%- trans %}Cancel{% endtrans -%}
</a> </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 }} {{ csrf_token }}
</div> </div>
</div> </div>

2
mediagoblin/templates/mediagoblin/user_pages/collection_item_confirm_remove.html
View File

@ -51,7 +51,7 @@
{{- collection_item.in_collection.url_for_self(request.urlgen) }}"> {{- collection_item.in_collection.url_for_self(request.urlgen) }}">
{%- trans %}Cancel{% endtrans -%} {%- trans %}Cancel{% endtrans -%}
</a> </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 }} {{ csrf_token }}
</div> </div>
</div> </div>

2
mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
View File

@ -46,7 +46,7 @@
<div class="form_submit_buttons"> <div class="form_submit_buttons">
{# TODO: This isn't a button really... might do unexpected things :) #} {# 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> <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 }} {{ csrf_token }}
</div> </div>
</div> </div>