Improve display of abstract and presenter bio

Relocate buttons to be beside the presenter's name.

Format abstract and bio in monospace hack as intended.
This commit is contained in:
James Polley 2017-11-22 18:23:24 +11:00
parent ad2dd4c560
commit a0610972fc
2 changed files with 35 additions and 30 deletions

View file

@ -44,14 +44,16 @@
<div class="abstract">{{ presentation.abstract_html|safe }}</div> <div class="abstract">{{ presentation.abstract_html|safe }}</div>
<h2>Presented by</h2> <h2>Presented by</h2>
<div class="presenters">
{% for speaker in presentation.speakers %} {% for speaker in presentation.speakers %}
{% speaker_photo speaker 512 as speaker_photo_url %} {% speaker_photo speaker 512 as speaker_photo_url %}
{% include "_right_floating_image.html" with image_url=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 %} {% if speaker.homepage or speaker.twitter_username %}
<p><div class="btn-group"> <div class="btn-group">
{% if speaker.homepage %} {% if speaker.homepage %}
<a href="{{ speaker.homepage}}" class="btn-svg" title="Homepage"> <a href="{{ speaker.homepage}}" class="btn-svg" title="Homepage">
{% include "cms_pages/home_page_blocks/btn_generic_link.html" %} {% include "cms_pages/home_page_blocks/btn_generic_link.html" %}
@ -62,13 +64,13 @@
{% include "cms_pages/home_page_blocks/btn_twitter.html" %} {% include "cms_pages/home_page_blocks/btn_twitter.html" %}
</a> </a>
{% endif %} {% endif %}
</div></p> </div>
{% endif %} {% endif %}
</h3>
<div class="bio">{{ speaker.biography_html|safe}}</div>
{{ speaker.biography_html|safe}}
{% endfor %} {% endfor %}
</div>
{% endblock %} {% endblock %}

View file

@ -28,8 +28,10 @@ img.profile-pic {
} }
.label-required:after { content: ' *'; } .label-required:after { content: ' *'; }
textarea, .monospace-text { font-family: Hack, monospace; } .abstract, .bio, .monospace-text {
.monospace-text { white-space: pre-wrap; } font-family: Hack, monospace;
white-space: pre-wrap;
}
/* MESSAGES & ERRORS */ /* MESSAGES & ERRORS */
@ -137,11 +139,6 @@ div.system-message p.system-message-title {
padding: 5px 0 0 12px; 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 * 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. * how you can use CSS to style your Element's container.
@ -237,8 +234,14 @@ div.system-message p.system-message-title {
border: none; border: none;
} }
/* Schedule, proposal and presenter display */
/* Make sure twitter/link buttons get displayed */ /* 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) { @media all and (max-width: 760px) {
.navbar-nav { margin: 0px -15px; } .navbar-nav { margin: 0px -15px; }