diff options
author | Jef van Schendel <mail@jefvanschendel.nl> | 2011-12-18 01:54:58 +0100 |
---|---|---|
committer | Jef van Schendel <mail@jefvanschendel.nl> | 2011-12-18 01:54:58 +0100 |
commit | 42a7c010321a01d1abb01d1137cc46cd97d66843 (patch) | |
tree | 09858a305871333707f593472f91aaef3b891639 | |
parent | 4fe9c9b99fc14f827d87ef803a9a67508591220f (diff) | |
download | mediagoblin-42a7c010321a01d1abb01d1137cc46cd97d66843.tar.lz mediagoblin-42a7c010321a01d1abb01d1137cc46cd97d66843.tar.xz mediagoblin-42a7c010321a01d1abb01d1137cc46cd97d66843.zip |
Add styles to make media.html not fall apart entirely
-rw-r--r-- | mediagoblin/static/css/base.css | 14 | ||||
-rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 4 |
2 files changed, 16 insertions, 2 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index d3136788..2a05e988 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -126,8 +126,22 @@ a.mediagoblin_logo{ padding-top: 8px; text-align: center; font-size: 0.875em; + clear: both; } +.media_pane { + width: 640px; + margin-left: 0px; + margin-right: 10px; + float: left; +} + +.media_sidebar { + width: 280px; + margin-left: 10px; + margin-right: 0px; + float: left; +} /* common website elements */ diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index b9e31667..0c3f373e 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -37,7 +37,7 @@ {% endblock mediagoblin_head %} {% block mediagoblin_content %} - <div class="grid_11 alpha"> + <div class="media_pane"> <div class="media_image_container"> {% block mediagoblin_media %} {% set display_media = request.app.public_store.file_url( @@ -141,7 +141,7 @@ media = media._id)) }} {% endif %} </div> - <div class="grid_5 omega"> + <div class="media_sidebar"> {% trans user_url=request.urlgen( 'mediagoblin.user_pages.user_home', user=media.get_uploader().username), |