Skip to content

Commit 4025378

Browse files
chrschornchrschorn
committed
Add 404 page, compressed contact background image, gallery gid fix, changed front image
1 parent 13e23c3 commit 4025378

File tree

10 files changed

+86
-78
lines changed

10 files changed

+86
-78
lines changed

‎404.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
layout: default
3+
firstsection: "#error"
4+
error404: true
5+
---
6+

‎_assets/js/funkforce5.js‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,9 @@ $(function() {
259259
}
260260
captionEl.children[0].innerHTML = item.title + '<br/><small>Photo: ' + item.author + '</small>';
261261
return true;
262-
}
262+
},
263+
264+
shareEl: false
263265
};
264266

265267
// PhotoSwipe opened from URL

‎_includes/gallery.html‎

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,24 @@ <h2 class="section-subheading text-muted">Eindrücke von einigen tollen Events</
99
</div>
1010

1111
<!-- Gallery -->
12-
<div class="gallery srgroup" itemscope itemtype="http://schema.org/ImageGallery">
13-
<div class="row">
14-
{% assign lgext = "-large.jpg" %}
15-
16-
{% for image in page.images %}
17-
{% assign img = image.file %}
18-
{% assign imglg = img | append: lgext %}
19-
{% assign alt = image.alt %}
20-
{% assign caption = image.caption %}
21-
{% assign auth = image.author %}
22-
23-
<figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject" class="col-xs-6 col-md-3 sreveal">
24-
<a href="{% asset_path '{{imglg}}' %}" itemprop="contentUrl" data-size="{{ assets[imglg].width }}x{{ assets[imglg].height }}" data-author="{{ auth }}" class="thumbnail">
25-
{% img '{{img}}' itemprop:'thumbnail' alt:'{{alt}}' %}
26-
</a>
27-
<figcaption itemprop="caption description">{{caption}}</figcaption>
28-
</figure>
29-
30-
{% endfor %}
31-
32-
</div>
12+
<div class="gallery srgroup row" itemscope itemtype="http://schema.org/ImageGallery" data-pswp-uid="1">
13+
{% assign lgext = "-large.jpg" %}
14+
15+
{% for image in page.images %}
16+
{% assign img = image.file %}
17+
{% assign imglg = img | append: lgext %}
18+
{% assign alt = image.alt %}
19+
{% assign caption = image.caption %}
20+
{% assign auth = image.author %}
21+
22+
<figure itemprop="associatedMedia" itemscope itemtype="http://schema.org/ImageObject" class="col-xs-6 col-md-3 sreveal">
23+
<a href="{% asset_path '{{imglg}}' %}" itemprop="contentUrl" data-size="{{ assets[imglg].width }}x{{ assets[imglg].height }}" data-author="{{ auth }}" class="thumbnail">
24+
{% img '{{img}}' itemprop:'thumbnail' alt:'{{alt}}' %}
25+
</a>
26+
<figcaption itemprop="caption description">{{caption}}</figcaption>
27+
</figure>
28+
29+
{% endfor %}
3330
</div>
3431

3532
<div class="row text-center">

‎_includes/head.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,6 @@
3232
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
3333
<![endif]-->
3434

35-
</head>
35+
</head>
36+
37+
<body id="page-top" class="index">

‎_includes/header.html‎

Lines changed: 3 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,9 @@
1-
{% assign ishome = false %}
2-
{% if page.url == "/" %}
3-
{% assign ishome = true %}
4-
{% endif %}
5-
6-
<body id="page-top" class="index">
7-
8-
<!-- Navigation -->
9-
<nav class="navbar navbar-default navbar-fixed-top">
10-
<div class="container">
11-
<!-- Brand and toggle get grouped for better mobile display -->
12-
<div class="navbar-header page-scroll">
13-
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
14-
<span class="sr-only">Toggle navigation</span>
15-
<span class="icon-bar"></span>
16-
<span class="icon-bar"></span>
17-
<span class="icon-bar"></span>
18-
</button>
19-
<a class="navbar-brand page-scroll" href="{% if ishome %}#page-top{% else %}/{% endif %}">Funk Force 5</a>
20-
</div>
21-
22-
<!-- Collect the nav links, forms, and other content for toggling -->
23-
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
24-
<ul class="nav navbar-nav navbar-right">
25-
<li class="hidden">
26-
<a href="#page-top"></a>
27-
</li>
28-
<li>
29-
<a class="page-scroll" href="{% if ishome %}#music{% else %}/#_music{% endif %}">Musik</a>
30-
</li>
31-
<li>
32-
<a class="page-scroll" href="{% if ishome %}#gallery{% else %}/#_gallery{% endif %}">Galerie</a>
33-
</li>
34-
<li>
35-
<a class="page-scroll" href="{% if ishome %}#repertoire{% else %}/#_repertoire{% endif %}">Repertoire</a>
36-
</li>
37-
<li>
38-
<a class="page-scroll" href="{% if ishome %}#band{% else %}/#_band{% endif %}">Band</a>
39-
</li>
40-
<li>
41-
<a class="page-scroll" href="{% if ishome %}#bio{% else %}/#_bio{% endif %}">Bio</a>
42-
</li>
43-
<li>
44-
<a class="page-scroll" href="{% if ishome %}#contact{% else %}/#_contact{% endif %}">Kontakt</a>
45-
</li>
46-
</ul>
47-
</div>
48-
<!-- /.navbar-collapse -->
49-
</div>
50-
<!-- /.container-fluid -->
51-
</nav>
52-
531
<header>
542
<div class="container-fluid">
553
<div class="intro-text">
56-
<div class="intro-lead-in">Willkommen bei</div>
57-
<div class="intro-heading">Funk Force 5</div>
58-
<a href="{{ include.firstsection }}" class="page-scroll btn btn-next header"><i class="fa fa-chevron-down fa-2x" aria-hidden="true"></i></a>
4+
<div class="intro-lead-in" {% if page.error404 %}style="visibility: hidden"{% endif %}>Willkommen bei</div>
5+
<div class="intro-heading">{% if page.error404 %}404 Error{% else %}{{site.title}}{% endif %}</div>
6+
<a href="{{ include.firstsection }}" class="page-scroll btn btn-next header" {% if page.error404 %}style="visibility: hidden"{% endif %}><i class="fa fa-chevron-down fa-2x" aria-hidden="true"></i></a>
597
</div>
608
</div>
619
</header>

‎_includes/navigation.html‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
{% assign ishome = false %}
2+
{% if page.url == "/" %}
3+
{% assign ishome = true %}
4+
{% endif %}
5+
6+
7+
<!-- Navigation -->
8+
<nav class="navbar navbar-default navbar-fixed-top">
9+
<div class="container">
10+
<!-- Brand and toggle get grouped for better mobile display -->
11+
<div class="navbar-header page-scroll">
12+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
13+
<span class="sr-only">Toggle navigation</span>
14+
<span class="icon-bar"></span>
15+
<span class="icon-bar"></span>
16+
<span class="icon-bar"></span>
17+
</button>
18+
<a class="navbar-brand page-scroll" href="{% if ishome %}#page-top{% else %}/{% endif %}">Funk Force 5</a>
19+
</div>
20+
21+
<!-- Collect the nav links, forms, and other content for toggling -->
22+
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
23+
<ul class="nav navbar-nav navbar-right">
24+
<li class="hidden">
25+
<a href="#page-top"></a>
26+
</li>
27+
<li>
28+
<a class="page-scroll" href="{% if ishome %}#music{% else %}/#_music{% endif %}">Musik</a>
29+
</li>
30+
<li>
31+
<a class="page-scroll" href="{% if ishome %}#gallery{% else %}/#_gallery{% endif %}">Galerie</a>
32+
</li>
33+
<li>
34+
<a class="page-scroll" href="{% if ishome %}#repertoire{% else %}/#_repertoire{% endif %}">Repertoire</a>
35+
</li>
36+
<li>
37+
<a class="page-scroll" href="{% if ishome %}#band{% else %}/#_band{% endif %}">Band</a>
38+
</li>
39+
<li>
40+
<a class="page-scroll" href="{% if ishome %}#bio{% else %}/#_bio{% endif %}">Bio</a>
41+
</li>
42+
<li>
43+
<a class="page-scroll" href="{% if ishome %}#contact{% else %}/#_contact{% endif %}">Kontakt</a>
44+
</li>
45+
</ul>
46+
</div>
47+
<!-- /.navbar-collapse -->
48+
</div>
49+
<!-- /.container-fluid -->
50+
</nav>

‎_layouts/default.html‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{% include head.html %}
2+
3+
{% include navigation.html %}
4+
25
{% include header.html firstsection=page.firstsection %}
36

47
{{ content }}

‎img/header-bg_old.jpg‎

361 KB
Loading

‎img/map-image-inv-original.png‎

407 KB
Loading

‎img/map-image-inv.png‎

-329 KB
Loading

0 commit comments

Comments
 (0)