diff options
| author | Jef van Schendel <mail@jefvanschendel.nl> | 2012-01-06 13:44:00 +0100 |
|---|---|---|
| committer | Jef van Schendel <mail@jefvanschendel.nl> | 2012-01-06 13:44:00 +0100 |
| commit | 7646e695bfbfc403deecdf3068abd3b453d6fef0 (patch) | |
| tree | 4fff403acd36746af0a514897257a1b970f34b14 | |
| parent | 173999a7e44aac11c8a2d4a7bf61f709b3822f79 (diff) | |
| download | mediagoblin-7646e695bfbfc403deecdf3068abd3b453d6fef0.tar.lz mediagoblin-7646e695bfbfc403deecdf3068abd3b453d6fef0.tar.xz mediagoblin-7646e695bfbfc403deecdf3068abd3b453d6fef0.zip | |
Fix div breaking in user.html; add media query bits
| -rw-r--r-- | mediagoblin/static/css/base.css | 15 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/user.html | 6 |
2 files changed, 17 insertions, 4 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css index eac956f1..c2d45a1b 100644 --- a/mediagoblin/static/css/base.css +++ b/mediagoblin/static/css/base.css @@ -480,11 +480,24 @@ table.media_panel th { line-height: 1em; } -@media screen and (max-width: 660px) { +/* Media queries and other responsivisivity */ +@media screen and (max-width: 680px) { .media_pane { width: 100%; + margin: 0px; } img.media_image { width: 100%; } } + +@media screen and (max-width: 960px) { + .profile_sidebar { + width: 100%; + margin: 0px; + } + .profile_showcase { + width: 100%; + margin: 0px; + } +} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index c8eb9026..0937f97a 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -120,12 +120,12 @@ {% endif %} {% endif %} - {% if request.user and (request.user._id == user._id) %} + {% if request.user and (request.user._id == user._id) %} <a href="{{ request.urlgen('mediagoblin.edit.account') }}"> {%- trans %}Change account settings{% endtrans -%} </a> - </div> - {% endif %} + {% endif %} + </div> {% if media_entries.count() %} <div class="profile_showcase"> |