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-08 00:08:55 -06:00
commit 833099ccf8
5 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,13 +205,15 @@ footer {
} }
.media_pane { .media_pane {
border-bottom: 1px solid #333333; /* in place for possible future wide view */
/* border-bottom: 1px solid #333333;*/
} }
.media_sidebar { .media_sidebar {
border-left: 1px solid #333333; /* in place for possible future wide view */
padding-left: 1em; /* border-left: 1px solid #333333;*/
padding-top: 1em; /* padding-left: 1em;*/
/* padding-top: 1em;*/
} }
.media_comments { .media_comments {
@ -329,11 +331,11 @@ text-align: center;
margin-right:0; margin-right:0;
} }
.heaven { .head {
margin-top:0; margin-top:0;
} }
.hell { .foot {
margin-bottom:0; margin-bottom:0;
} }

2
mediagoblin/templates/mediagoblin/base.html
View File

@ -65,7 +65,7 @@
{% block mediagoblin_header %} {% block mediagoblin_header %}
<div class="container"> <div class="container">
<header> <header>
<div class="row hell"> <div class="row foot">
<div class="header_left"> <div class="header_left">
{%- include "mediagoblin/bits/logo.html" -%} {%- include "mediagoblin/bits/logo.html" -%}
{% block mediagoblin_header_title %}{% endblock %} {% block mediagoblin_header_title %}{% endblock %}

2
mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
View File

@ -19,7 +19,7 @@
{% if request.user %} {% if request.user %}
<h1>{% trans %}Explore{% endtrans %}</h1> <h1>{% trans %}Explore{% endtrans %}</h1>
{% else %} {% else %}
<div class="row hell"> <div class="row foot">
<div class="eleven columns"> <div class="eleven columns">
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1> <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
<p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p> <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>

2
mediagoblin/templates/mediagoblin/moderation/user.html
View File

@ -160,7 +160,7 @@
</p> </p>
</div> </div>
</div> </div>
<div class="row hell"> <div class="row foot">
<h2>{% trans username=user.username -%} <h2>{% trans username=user.username -%}
{{ username }}'s Privileges{% endtrans %}</h2> {{ username }}'s Privileges{% endtrans %}</h2>
<div class="six columns"> <div class="six columns">

13
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -33,7 +33,7 @@
{% template_hook("media_head") %} {% template_hook("media_head") %}
{% endblock mediagoblin_head %} {% endblock mediagoblin_head %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
<div class="row hell"> <div class="row foot">
<p class="eleven columns context"> <p class="eleven columns context">
{%- trans user_url=request.urlgen( {%- trans user_url=request.urlgen(
'mediagoblin.user_pages.user_home', 'mediagoblin.user_pages.user_home',
@ -46,7 +46,7 @@
{% include "mediagoblin/utils/prev_next.html" %} {% include "mediagoblin/utils/prev_next.html" %}
</div> </div>
</div> </div>
<div class="media_pane sixteen columns"> <div class="media_pane eleven columns">
<div class="media_image_container"> <div class="media_image_container">
{% block mediagoblin_media %} {% block mediagoblin_media %}
{% set display_media = request.app.public_store.file_url( {% set display_media = request.app.public_store.file_url(
@ -70,7 +70,7 @@
{% endif %} {% endif %}
{% endblock %} {% endblock %}
</div> </div>
<div class="row heaven hell"> <div class="row head foot">
<h2 class="media_title"> <h2 class="media_title">
{{ media.title }} {{ media.title }}
</h2> </h2>
@ -92,9 +92,6 @@
<p>{{ media.description_html }}</p> <p>{{ media.description_html }}</p>
{% endautoescape %} {% endautoescape %}
</div> </div>
</div>
<div class="eleven columns omega">
{% if comments and request.user and request.user.has_privilege('commenter') %} {% if comments and request.user and request.user.has_privilege('commenter') %}
<div class="media_comments"> <div class="media_comments">
{% if app_config['allow_comments'] %} {% if app_config['allow_comments'] %}
@ -174,9 +171,11 @@
<div class="empty_space no_background"> <div class="empty_space no_background">
{% endif %} {% endif %}
</div> </div>
</div> </div>
<div class="five columns alpha media_sidebar">
<div class="five columns media_sidebar">
<h3>{% trans %}Added{% endtrans %}</h3> <h3>{% trans %}Added{% endtrans %}</h3>
<p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}"> <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
{%- trans formatted_time=timesince(media.created) -%} {%- trans formatted_time=timesince(media.created) -%}