From 770035827a42ed0e7cf5af8447984e1db9896969 Mon Sep 17 00:00:00 2001 From: Set Sakrecoer Date: Tue, 18 Jun 2019 12:58:51 +0200 Subject: [PATCH] making up my mind --- _includes/featured-artists.html | 7 +++++-- _includes/hittahit.html | 8 ++++---- _includes/past-events.html | 13 ++++--------- index.html | 7 +++---- 4 files changed, 16 insertions(+), 19 deletions(-) diff --git a/_includes/featured-artists.html b/_includes/featured-artists.html index f1fc6fe..6c29a55 100644 --- a/_includes/featured-artists.html +++ b/_includes/featured-artists.html @@ -9,11 +9,14 @@ | replace_first: '.md', '' }} {%- endcapture %} - {% if name == artist_name %} + {% if name == artist_name %}

{{ artist.name }}

{{ artist.blurb_text }}
- {% if artist.link != null %}{% if page.category == 'ljudkonst'%}Lyssna{% else %}Mer info{% endif %} här{% endif %}

{% break %} diff --git a/_includes/hittahit.html b/_includes/hittahit.html index 08678ca..6f3b1fc 100644 --- a/_includes/hittahit.html +++ b/_includes/hittahit.html @@ -2,11 +2,11 @@

Hitta hit

-

 

-

 

+ +

-

 

-

 

+ +

Kocksgatan 23
116 24 Stockholm

diff --git a/_includes/past-events.html b/_includes/past-events.html index ab4a8d7..a7fe069 100644 --- a/_includes/past-events.html +++ b/_includes/past-events.html @@ -3,20 +3,15 @@ {% capture now -%}{{ site.time | date: '%s' }}{%- endcapture %} {% for event in site.events %} - {% capture endtime -%} {{ event.event_data.end_datetime | date: '%s' }} {%- endcapture %} - {% if now >= endtime %} -
- - -

{{ event.title }}

-

- {{ event.event_data.start_datetime | date: '%Y-%m-%d' }} -

+ +

{{ event.event_data.start_datetime | date: '%Y-%m-%d' }}
+ {{ event.title }} +


diff --git a/index.html b/index.html index 27c1f54..419349e 100644 --- a/index.html +++ b/index.html @@ -8,15 +8,14 @@ layout: default

{{ page.title }}

{{ site.description }}

Om oss

+ {% include hittahit.html %} +
-
- {% include past-events.html %} -
{% include contact.html %}
- {% include hittahit.html %} + {% include past-events.html %}
\ No newline at end of file