diff --git a/pinaxcon/templates/symposion/schedule/presentation_detail.html b/pinaxcon/templates/symposion/schedule/presentation_detail.html index 16626ab8..dee08595 100644 --- a/pinaxcon/templates/symposion/schedule/presentation_detail.html +++ b/pinaxcon/templates/symposion/schedule/presentation_detail.html @@ -44,31 +44,33 @@ <div class="abstract">{{ presentation.abstract_html|safe }}</div> <h2>Presented by</h2> - {% for speaker in presentation.speakers %} - {% speaker_photo speaker 512 as speaker_photo_url %} - {% include "_right_floating_image.html" with image_url=speaker_photo_url %} + <div class="presenters"> + {% for speaker in presentation.speakers %} + {% speaker_photo speaker 512 as speaker_photo_url %} + {% include "_right_floating_image.html" with image_url=speaker_photo_url %} - <h3><a href="{% url "speaker_profile" speaker.pk %}">{{ speaker }}</a></h3> + <h3> + <a href="{% url "speaker_profile" speaker.pk %}">{{ speaker }}</a> - {% if speaker.homepage or speaker.twitter_username %} - <p><div class="btn-group"> - {% if speaker.homepage %} - <a href="{{ speaker.homepage}}" class="btn-svg" title="Homepage"> - {% include "cms_pages/home_page_blocks/btn_generic_link.html" %} - </a> - {% endif %} - {% if speaker.twitter_username %} - <a href="https://twitter.com/{{ speaker.twitter_username }}" class="btn-svg" title="{{ speaker}} on twitter"> - {% include "cms_pages/home_page_blocks/btn_twitter.html" %} - </a> - {% endif %} - </div></p> - {% endif %} + {% if speaker.homepage or speaker.twitter_username %} + <div class="btn-group"> + {% if speaker.homepage %} + <a href="{{ speaker.homepage}}" class="btn-svg" title="Homepage"> + {% include "cms_pages/home_page_blocks/btn_generic_link.html" %} + </a> + {% endif %} + {% if speaker.twitter_username %} + <a href="https://twitter.com/{{ speaker.twitter_username }}" class="btn-svg" title="{{ speaker}} on twitter"> + {% include "cms_pages/home_page_blocks/btn_twitter.html" %} + </a> + {% endif %} + </div> + {% endif %} + </h3> + <div class="bio">{{ speaker.biography_html|safe}}</div> - - {{ speaker.biography_html|safe}} - - {% endfor %} + {% endfor %} + </div> {% endblock %} diff --git a/static/src/css/app.css b/static/src/css/app.css index 2f901959..798e8526 100644 --- a/static/src/css/app.css +++ b/static/src/css/app.css @@ -28,8 +28,10 @@ img.profile-pic { } .label-required:after { content: ' *'; } -textarea, .monospace-text { font-family: Hack, monospace; } -.monospace-text { white-space: pre-wrap; } +.abstract, .bio, .monospace-text { + font-family: Hack, monospace; + white-space: pre-wrap; +} /* MESSAGES & ERRORS */ @@ -137,11 +139,6 @@ div.system-message p.system-message-title { padding: 5px 0 0 12px; } -.bio { - font-family: Hack, monospace; - white-space: pre-wrap; -} - /** * The CSS shown here will not be introduced in the Quickstart guide, but shows * how you can use CSS to style your Element's container. @@ -237,8 +234,14 @@ div.system-message p.system-message-title { border: none; } +/* Schedule, proposal and presenter display */ /* Make sure twitter/link buttons get displayed */ -.btn-group, .btn-svg { min-width: 20px; } + +.presenters .btn-group { + display: inline-flex; + margin-left: 10px; +} +.presenters .btn-svg { min-width: 20px; } @media all and (max-width: 760px) { .navbar-nav { margin: 0px -15px; }