diff options
| author | jpope <jpope@jpope.org> | 2014-01-08 00:08:11 -0600 |
|---|---|---|
| committer | jpope <jpope@jpope.org> | 2014-01-08 00:08:11 -0600 |
| commit | 5cdf3a0a1474c9b2f8ea65c3d4185942d94daed1 (patch) | |
| tree | 3685b1b8d9fb2ba197f4b057b28a6963bf46dfb7 | |
| parent | 4a9a796a7fd7fcc144229c19260cbd1c02c279f0 (diff) | |
| download | mediagoblin-5cdf3a0a1474c9b2f8ea65c3d4185942d94daed1.tar.lz mediagoblin-5cdf3a0a1474c9b2f8ea65c3d4185942d94daed1.tar.xz mediagoblin-5cdf3a0a1474c9b2f8ea65c3d4185942d94daed1.zip | |
move "wide" view to seperate branch
| -rw-r--r-- | mediagoblin/static/css/base.css | 10 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 11 |
2 files changed, 11 insertions, 10 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index d77a7b1a..19ee86ae 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -205,13 +205,15 @@ footer { } .media_pane { - border-bottom: 1px solid #333333; +/* in place for possible future wide view */ +/* border-bottom: 1px solid #333333;*/ } .media_sidebar { - border-left: 1px solid #333333; - padding-left: 1em; - padding-top: 1em; +/* in place for possible future wide view */ +/* border-left: 1px solid #333333;*/ +/* padding-left: 1em;*/ +/* padding-top: 1em;*/ } .media_comments { diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 03f0ce64..e01cce5c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -46,7 +46,7 @@ {% include "mediagoblin/utils/prev_next.html" %} </div> </div> - <div class="media_pane sixteen columns"> + <div class="media_pane eleven columns"> <div class="media_image_container"> {% block mediagoblin_media %} {% set display_media = request.app.public_store.file_url( @@ -92,9 +92,6 @@ <p>{{ media.description_html }}</p> {% endautoescape %} </div> - </div> - - <div class="eleven columns omega"> {% if comments and request.user and request.user.has_privilege('commenter') %} <div class="media_comments"> {% if app_config['allow_comments'] %} @@ -174,9 +171,11 @@ <div class="empty_space no_background"> {% endif %} </div> - </div> - <div class="five columns alpha media_sidebar"> + </div> + + + <div class="five columns media_sidebar"> <h3>{% trans %}Added{% endtrans %}</h3> <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}"> {%- trans formatted_time=timesince(media.created) -%} |