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

Add sidebar again

Browse Source
This commit is contained in:
Jef van Schendel 2012-03-04 19:13:47 +01:00
parent 822d37176e
commit 141f14e27e
2 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,7 +109,7 @@ input, textarea {
.container { .container {
margin: auto; margin: auto;
width: 96%; width: 96%;
max-width: 820px; max-width: 940px;
} }
header { header {
@ -151,18 +151,14 @@ footer {
} }
.media_pane { .media_pane {
width: 560px; width: 640px;
margin-left: 0px; margin-left: 0px;
margin-right: 10px; margin-right: 10px;
float: left; float: left;
} }
img.media_image {
width: 100%;
}
.media_sidebar { .media_sidebar {
width: 240px; width: 280px;
margin-left: 10px; margin-left: 10px;
float: left; float: left;
} }
@ -493,7 +489,7 @@ table.media_panel th {
} }
/* Media queries and other responsivisivity */ /* Media queries and other responsivisivity */
@media screen and (max-width: 820px) { @media screen and (max-width: 940px) {
.media_pane { .media_pane {
width: 100%; width: 100%;
margin: 0px; margin: 0px;

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

@ -47,28 +47,28 @@
<p class="context">❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p> <p class="context">❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
{%- endtrans %} {%- endtrans %}
{% include "mediagoblin/utils/prev_next.html" %} {% include "mediagoblin/utils/prev_next.html" %}
<div class="media_image_container"> <div class="media_pane">
{% block mediagoblin_media %} <div class="media_image_container">
{% set display_media = request.app.public_store.file_url( {% block mediagoblin_media %}
media.get_display_media(media.media_files)) %} {% set display_media = request.app.public_store.file_url(
{# if there's a medium file size, that means the medium size media.get_display_media(media.media_files)) %}
# isn't the original... so link to the original! {# if there's a medium file size, that means the medium size
#} # isn't the original... so link to the original!
{% if media.media_files.has_key('medium') %} #}
<a href="{{ request.app.public_store.file_url( {% if media.media_files.has_key('medium') %}
media.media_files['original']) }}"> <a href="{{ request.app.public_store.file_url(
media.media_files['original']) }}">
<img class="media_image"
src="{{ display_media }}"
alt="Image for {{ media.title }}" />
</a>
{% else %}
<img class="media_image" <img class="media_image"
src="{{ display_media }}" src="{{ display_media }}"
alt="Image for {{ media.title }}" /> alt="Image for {{ media.title }}" />
</a> {% endif %}
{% else %} {% endblock %}
<img class="media_image" </div>
src="{{ display_media }}"
alt="Image for {{ media.title }}" />
{% endif %}
{% endblock %}
</div>
<div class="media_pane">
<h2 class="media_title"> <h2 class="media_title">
{{ media.title }} {{ media.title }}
</h2> </h2>