Merge branch post-branch into master via CloudCannon

This commit is contained in:
Set Hallstrom 2019-06-18 18:26:22 +02:00 committed by GitHub
commit b57df8c7b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 4 deletions

View file

@ -11,7 +11,7 @@
{%- endcapture %} {%- endcapture %}
{% if name == artist_name %}<br /> {% if name == artist_name %}<br />
<div class="square-image" style="background-image: url('{{ artist.image }}')"></div> <div class="square-image" style="background-image: url('{{ artist.image }}')"></div>
<h4>{{ artist.name }}</h4> <p><strong>{{ artist.name }}</p></strong>
<p class="blurb">{{ artist.blurb_text }}<br /> <p class="blurb">{{ artist.blurb_text }}<br />
{% if artist.link != null %} {% if artist.link != null %}
<br /><a href="{{ artist.link }}" <br /><a href="{{ artist.link }}"

View file

@ -38,7 +38,7 @@
{{ event.event_data.start_datetime | date: "%Y" }} {{ event.event_data.start_datetime | date: "%Y" }}
kl. {{ event.event_data.start_datetime | date: "%R"}}<br /> kl. {{ event.event_data.start_datetime | date: "%R"}}<br />
Typ av konst: {{ event.category }}</p> Typ av konst: {{ event.category }}</p>
<h3>{{ event.description | truncatewords: 10 }} </h3> <p><strong>{{ event.description | truncatewords: 10 }}</strong></p>
<p><a class="cta" href="{{ event.url }}" style="padding:10px;"> Läs mer </a></p> <p><a class="cta" href="{{ event.url }}" style="padding:10px;"> Läs mer </a></p>
</div> </div>
{% break %} {% break %}

View file

@ -25,6 +25,13 @@ b,
strong { strong {
font-family: avantB, "Helvetica Neue", Helvetica, Arial, sans-serif; font-family: avantB, "Helvetica Neue", Helvetica, Arial, sans-serif;
}
h1,
h2,
h3,
h4 {
text-transform: uppercase;
} }
h1{ h1{
font-size: 2em; font-size: 2em;

View file

@ -36,7 +36,7 @@ layout: default
{% for artist in site.momangers %} {% for artist in site.momangers %}
<div class="column"> <div class="column">
<div class="square-image" style="background-image: url('{{ artist.image }}')"></div> <div class="square-image" style="background-image: url('{{ artist.image }}')"></div>
<h4>{{ artist.namn }}</h4> <p><strong>{{ artist.namn }}</strong></p>
<p class="blurb">{{ artist.blurb_text }}<br /> <p class="blurb">{{ artist.blurb_text }}<br />
{% if artist.link != null %}<a href="{{ artist.link }}" trarget="_blank" rel="noopener noreferrer nofollow">Mer info {% if artist.link != null %}<a href="{{ artist.link }}" trarget="_blank" rel="noopener noreferrer nofollow">Mer info
här</a>{% endif %}</p> här</a>{% endif %}</p>

View file

@ -6,7 +6,7 @@ layout: default
<!-- begin /index.html --> <!-- begin /index.html -->
<div class="column"> <div class="column">
<h1>{{ site.title }}</h1> <h1>{{ site.title }}</h1>
<h4>{{ site.description }}</h4> <p><strong>{{ site.description }}</strong></p>
<div class="editable"> <div class="editable">
<h3>Om Kulturf&ouml;reningen Momangen</h3> <h3>Om Kulturf&ouml;reningen Momangen</h3>
<p>Det f&ouml;rsta fr&ouml;et till Kulturf&ouml;reningen Momangen s&aring;ddes genom en enkel fr&aring;ga p&aring; <p>Det f&ouml;rsta fr&ouml;et till Kulturf&ouml;reningen Momangen s&aring;ddes genom en enkel fr&aring;ga p&aring;