Skip to content

Commit bd603df

Browse files
author
Moritz »mo.« Sauer
committed
Update to version 0.7
1 parent 897f0ff commit bd603df

17 files changed

Lines changed: 688 additions & 149 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_site/

‎_data/navigation.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
- title: "Post-Right-Sidebar"
2020
url: "/design/post-right-sidebar/"
2121
- title: "Full-Width Page"
22-
url: "/design/page-full-width/"
22+
url: "/design/page/"
23+
- title: "Full-Width Page"
24+
url: "/design/page/"
2325
- title: "Typography"
2426
url: "/design/typography/"
27+
- title: "Responsive Gallery"
28+
url: "/design/gallery/"
2529
# - title: "Fullwidth Layout"
2630
# url: "/design/full-width/"
2731

‎_includes/footer.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<div id="footer">
33
<div class="row">
44
<div class="medium-6 large-5 columns">
5-
<h5 class="black-shadow">About this Website</h5>
5+
<h5 class="shadow-black">About this Website</h5>
66

7-
<p class="black-shadow">
7+
<p class="shadow-black">
88
{% include _site_description.html %}
99
</p>
1010
</div><!-- /.large-6.columns -->
@@ -13,8 +13,8 @@ <h5 class="black-shadow">About this Website</h5>
1313
<div class="small-6 medium-3 large-3 large-offset-1 columns">
1414
<aside>
1515
<div class="textwidget">
16-
<h5 class="black-shadow">Services</h5>
17-
<ul class="no-bullet black-shadow">
16+
<h5 class="shadow-black">Services</h5>
17+
<ul class="no-bullet shadow-black">
1818
<li><a href="{{ site.url }}/contact/">Contact</a></li>
1919
<li class="rss-link"><a href="{{ site.url }}/feed.xml">RSS</a></li>
2020
<li class="sitemap-link"><a href="{{ site.url }}/sitemap.xml">Sitemap.xml</a></li>
@@ -25,8 +25,8 @@ <h5 class="black-shadow">Services</h5>
2525

2626

2727
<div class="small-6 medium-3 large-3 columns">
28-
<h5 class="black-shadow">Thank You!</h5>
29-
<ul class="no-bullet black-shadow">
28+
<h5 class="shadow-black">Thank You!</h5>
29+
<ul class="no-bullet shadow-black">
3030
<li><a href="http://entypo.com/">Icons by Daniel Bruce</a></li>
3131
<li><a href="http://foundation.zurb.com/">Built on Foundation</a></li>
3232
<li><a href="http://unsplash.com/">Images by Unsplash</a></li>

‎_includes/header.html‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,27 @@
66
<title>{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}</title>
77
<link rel="stylesheet" href="{{ site.url }}/assets/css/style_feeling_responsive.min.css">
88
<script src="{{ site.url }}/assets/js/modernizr.min.js"></script>
9-
<link href='http://fonts.googleapis.com/css?family=Source+Sans+Pro:400italic,400,700%7cVolkhov:400,700' rel='stylesheet' type='text/css'>
9+
<link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic%7cVolkhov:400,700' rel='stylesheet' type='text/css'>
1010
{% if site.google_site_verification %}<meta name="google-site-verification" content="{{ site.google_site_verification}}" />{% endif %}
1111
{% if site.bing_webmastertools_id %}<meta name="msvalidate.01" content="{{ site.bing_webmastertools_id }}" />{% endif %}
1212
{% if page.meta_description %}<meta name="description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.description %}<meta name="description" content="{{ page.description | strip_html | escape }}"/>{% endif %}
1313
{% if site.google_author %}<link rel="author" href="{{ site.google_author }}"/>{% endif %}
14-
{% if site.favicon %}
15-
<link rel="shortcut icon" href="{{ site.favicon }}" type="image/png" />
16-
<link rel="icon" href="{{ site.favicon }}" type="image/png" />
17-
{% endif %}
14+
{% if site.favicon %}<link rel="shortcut icon" href="{{ site.favicon }}" type="image/png" />{% endif %}
15+
{% if site.favicon %}<link rel="icon" href="{{ site.favicon }}" type="image/png" />{% endif %}
16+
{% if site.apple_touch_icon_iphone %}<link rel="apple-touch-icon" href="{{ site.apple_touch_icon_iphone }}">{% endif %}
17+
{% if site.apple_touch_icon_iphone_retina %}<link rel="apple-touch-icon" sizes="76x76" href="{{ site.apple_touch_icon_iphone_retina }}">{% endif %}
18+
{% if site.apple_touch_icon_ipad %}<link rel="apple-touch-icon" sizes="120x120" href="{{ site.apple_touch_icon_ipad }}">{% endif %}
19+
{% if site.apple_touch_icon_ipad_retina %}<link rel="apple-touch-icon" sizes="152x152" href="{{ site.apple_touch_icon_ipad_retina }}">{% endif %}
20+
{% if site.apple_touch_icon_precomposed %}<link rel="apple-touch-icon-precomposed" href="{{ site.apple_touch_icon_precomposed }}">{% endif %}
1821

1922
<!-- Facebook Optimization -->
2023
<meta property="og:locale" content="{% if site.og_locale == nil %}en_EN{% else %}{{ site.og_locale }}{% endif %}" />
2124
{% if site.og_type %}<meta property="og:type" content="website" />{% endif %}
2225
<meta property="og:title" content="{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}" />
23-
{% if page.meta_description %}<meta property="og:description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.description %}<meta name="description" content="{{ page.description | strip_html | escape }}"/>{% endif %}
26+
{% if page.meta_description %}<meta property="og:description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.description %}<meta name="description" content="{{ page.description | strip_html | escape }}"/>{% elsif site.description %}<meta name="description" content="{{ site.description | strip_html | escape }}"/>{% endif %}
2427
<meta property="og:url" content="{{ site.url }}{{ page.url }}" />
2528
{% if site.title %}<meta property="og:site_name" content="{{ site.title }}" />{% endif %}
2629
{% if page.image.thumb %}<meta property="og:image" content="{{ site.url }}/assets/img/{{ page.image.thumb }}" />{% endif %}
2730

2831
{% if site.alexa_verify_id %}<meta name="alexaVerifyID" content="{{ site.alexa_verify_id }}" />{% endif %}
29-
3032
</head>

‎_includes/meta_information.html‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<div class="page-meta">
2+
<ul class="side-nav">
3+
<li class="subheader">Published on {{ page.date | date: "%d.%m.%Y" }}</li>
4+
<li class="subheader">{% if page.categories %}Archived in {{ page.categories | join: ' · ' | upcase }}{% endif %}</li>
5+
<li class="divider"></li>
6+
</ul>
7+
</div>

‎_includes/navigation.html‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<section class="top-bar-section">
1010
{% comment %}
1111

12-
____ __ __ _ __ _ __ _
13-
/ __ \___ _____/ /_ / /____ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
14-
/ /_/ / _ \/ ___/ __ \/ __/ _ \ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
15-
/ _, _/ __/ /__/ / / / /_/ __/ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
16-
/_/ |_|\___/\___/_/ /_/\__/\___/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
17-
/____/
12+
____ _ __ __ _ __ _ __ _
13+
/ __ \(_)___ _/ /_ / /_ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
14+
/ /_/ / / __ `/ __ \/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
15+
/ _, _/ / /_/ / / / / /_ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
16+
/_/ |_/_/\__, /_/ /_/\__/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
17+
/____/ /____/
1818

1919
{% endcomment %}
2020
<ul class="right">
@@ -26,14 +26,14 @@
2626
{% assign domain = site.url %}
2727
{% endif %}
2828

29-
{% comment %} Wenn rechte Seite sonst mach nichts {% endcomment %}
29+
{% comment %} If there are links for right side begin {% endcomment %}
3030
{% if link.side == 'right' %}
31-
{% comment %} Wenn rechte Seite OHNE Dropdown Menu dann {% endcomment %}
31+
{% comment %} If right side WITHOUT dropdown menu do {% endcomment %}
3232
{% if link.dropdown == nil %}
3333
<li class="divider"></li>
3434
<li{% if link.url == page.url %} class="active"{% endif %}><a href="{{ domain }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title }}</a></li>
3535

36-
{% comment %} Wenn rechte Seite mit Dropdown Menu dann {% endcomment %}
36+
{% comment %} If right side WITH dropdown menu do {% endcomment %}
3737
{% else %}
3838

3939
<li class="divider"></li>
@@ -57,16 +57,16 @@
5757
{% endif %}
5858
{% endif %}
5959
{% endfor %}
60-
{% comment %} Fertig Schleife 1 {% endcomment %}
60+
{% comment %} First loop finished 1 {% endcomment %}
6161
</ul>
6262
{% comment %}
6363

64-
__ _ __ _ __ _ __ _
65-
/ / (_)___ / /_____ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
66-
/ / / / __ \/ //_/ _ \ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
67-
/ /___/ / / / / ,< / __/ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
68-
/_____/_/_/ /_/_/|_|\___/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
69-
/____/
64+
__ ______ _ __ _ __ _
65+
/ / ___ / __/ /_ / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
66+
/ / / _ \/ /_/ __/ / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
67+
/ /___/ __/ __/ /_ / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
68+
/_____/\___/_/ \__/ /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
69+
/____/
7070

7171
{% endcomment %}
7272
<ul class="left">
@@ -78,15 +78,15 @@
7878
{% assign domain = site.url %}
7979
{% endif %}
8080

81-
{% comment %} Wenn linke Seite sonst mach nichts {% endcomment %}
81+
{% comment %} If there are links for left side begin {% endcomment %}
8282
{% if link.side == 'left' %}
8383

84-
{% comment %} Wenn linke Seite OHNE Dropdown Menu dann {% endcomment %}
84+
{% comment %} If left side WITHOUT dropdown menu do {% endcomment %}
8585
{% if link.dropdown == nil %}
8686
<li{% if link.url == page.url %} class="active"{% endif %}><a href="{{ domain }}{{ link.url }}"{% if link.url contains 'http' %} target="_blank"{% endif %}>{{ link.title }}</a></li>
8787
<li class="divider"></li>
8888

89-
{% comment %} Wenn linke Seite mit Dropdown Menu dann {% endcomment %}
89+
{% comment %} If left side WITH dropdown menu do {% endcomment %}
9090
{% else %}
9191

9292
<li class="has-dropdown{% if link.url == page.url %} active{% endif %}">
@@ -110,7 +110,7 @@
110110
{% endif %}
111111
{% endif %}
112112
{% endfor %}
113-
{% comment %} Fertig Schleife 1 {% endcomment %}
113+
{% comment %} Second loop finished {% endcomment %}
114114
</ul>
115115
</section>
116116
</nav>

‎_layouts/post-left-sidebar.html‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,8 @@ <h1>{{ page.title }}</h1>
2222

2323
{{ content }}
2424

25-
<div class="page-meta">
26-
<ul class="side-nav">
27-
<li class="subheader">Date: {{ page.date | date: "%d.%m.%Y" }}</li>
28-
<li class="subheader">{% if page.categories %}Archived in {{ page.categories | join: ' · ' | upcase }}{% endif %}</li>
29-
<li class="divider"></li>
30-
</ul>
25+
{% include meta_information.html %}
3126

32-
</div>
3327
</article>
3428
</div><!-- /.medium-8.columns -->
3529
</div><!-- /.row -->

‎_layouts/post-right-sidebar.html‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,8 @@ <h1>{{ page.title }}</h1>
1717

1818
{{ content }}
1919

20-
<div class="page-meta">
21-
<ul class="side-nav">
22-
<li class="subheader">Date: {{ page.date | date: "%d.%m.%Y" }}</li>
23-
<li class="subheader">{% if page.categories %}Archived in {{ page.categories | join: ' · ' | upcase }}{% endif %}</li>
24-
<li class="divider"></li>
25-
</ul>
20+
{% include meta_information.html %}
2621

27-
</div>
2822
</article>
2923
</div><!-- /.medium-8.columns -->
3024

‎_layouts/post.html‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,8 @@ <h1>{{ page.title }}</h1>
2626

2727
{{ content }}
2828

29-
<div class="page-meta">
30-
<ul class="side-nav">
31-
<li class="subheader">Date: {{ page.date | date: "%d.%m.%Y" }}</li>
32-
<li class="subheader">{% if page.categories %}Archived in {{ page.categories | join: ' · ' | upcase }}{% endif %}</li>
33-
<li class="divider"></li>
34-
</ul>
35-
</div>
29+
{% include meta_information.html %}
30+
3631
</article>
3732

3833
</div><!-- /.medium-8.columns -->

‎_posts/design/2014-07-10-page.md‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
---
2+
layout: page
3+
title: "Page Template"
4+
meta_description: "This is an example of a beautiful aligned page in the middle. There is no sidebar to distract the reader. The difference to the Post-Template is, that you find no meta-information at the bottom of the post."
5+
date: 2014-09-15 00:00:00
6+
categories:
7+
- layout
8+
- design
9+
permalink: "/design/page/"
10+
image:
11+
header: "no"
12+
---
13+
<p class="teaser">
14+
This is an example of a beautiful aligned page in the middle. There is no sidebar to distract the reader. The difference to the <a href='{{ site.url }}/design/post/'>Post-Template</a> is, that you find <mark>no meta-information</mark> at the bottom of the post.</p>
15+
16+
## Look!
17+
18+
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
19+
20+
### Lorem
21+
22+
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
23+
24+
Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

0 commit comments

Comments
 (0)