improving upcoming-details

This commit is contained in:
Alex Corbi 2015-03-26 16:12:06 +01:00
parent 20bc741c64
commit dd71d3a222
4 changed files with 19 additions and 14 deletions

View file

@ -46,18 +46,22 @@
{% for talk in post.talks %} {% for talk in post.talks %}
<div class="upcoming row"> <div class="upcoming row">
<div class="upcoming-media"> <div class="col-md-2">
{% if {{talk.media_artist_url}} %} <div class="upcoming-media">
<img src={{talk.media_artist_url}}></img> {% if {{talk.media_artist_url}} %}
{% else %} <img src={{talk.media_artist_url}}></img>
<img src="/assets/no_artist_media.png"></img> {% else %}
{% endif %} <img src="/assets/no_artist_media.png"></img>
</div> {% endif %}
</div>
</div>
<div class="upcoming-detail"> <div class="col-md-10">
<p><a class="button hvr-sweep-to-top" href="{{talk.artist_website}}">{{talk.artist}}</a> <br/> {{talk.title}} </p> <div class="upcoming-detail">
<p class="small-text">{{talk.description | truncate: 200 }}</p> <p><a class="button hvr-sweep-to-top" href="{{talk.artist_website}}">{{talk.artist}}</a> <br/> {{talk.title}} </p>
</div> <p class="small-text">{{talk.description}}</p>
</div>
</div>
</div> </div>
{% endfor %} {% endfor %}

View file

@ -14,9 +14,9 @@ talks:
artist: "STATE Festival" artist: "STATE Festival"
speakers: "Nenad Popov" speakers: "Nenad Popov"
artist_bio: "Based in Berlin, STATE Experience Science is an agency and collective of independent scientists, artists and cultural producers working to make science accessible and facilitate creativity without borders. With the festival as its core offering, STATE is expanding its services and develops customized initiatives with academic, corporate and public clients." artist_bio: "Based in Berlin, STATE Experience Science is an agency and collective of independent scientists, artists and cultural producers working to make science accessible and facilitate creativity without borders. With the festival as its core offering, STATE is expanding its services and develops customized initiatives with academic, corporate and public clients."
description: "In this special edition, we will have the opportunity to discover about STATE Festival. An event exploring the intersection between Science and Art. The previous edition featured 4 days of events, 2 locations in the heart of Berlin. Over 100 contributing scientists, artists and filmmakers from more than 20 countries. Talks, exhibitions, films, performances, workshops, panels, interactive science formats." description: "In this special edition, we will have the opportunity to discover STATE Experience Science, a collective of independent scientists, artists and cultural producers, working to make science accessible and facilitate creativity without borders. Last year's STATE Festival featured 4 days of events in 2 locations in the heart of Berlin. Over 100 contributing scientists, artists and filmmakers from more than 20 countries took part in talks, exhibitions, films, performances, workshops, panels and interactive science formats."
artist_website: "http://www.statefestival.org" artist_website: "http://www.statefestival.org"
media_artist_url: "/images/state.png" media_artist_url: "/images/State_Logo-A.png"
video_artist_url: "https://vimeo.com/110024179" video_artist_url: "https://vimeo.com/110024179"
talk_video_url: talk_video_url:
--- ---

View file

@ -17,7 +17,7 @@ a:hover {
cursor: pointer; cursor: pointer;
} }
.small-text{ .small-text{
font-size: 10px; font-size: 14px;
} }
.left{ .left{
float:left; float:left;
@ -95,6 +95,7 @@ a:hover {
.upcoming-media { .upcoming-media {
width: 100px; width: 100px;
height: 80px; height: 80px;
padding: 0px 10px;
float: left; float: left;
margin-right: 10px; margin-right: 10px;
margin-left: 4px; margin-left: 4px;

BIN
images/State_Logo-A.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB