Skip to content

Commit 4525133

Browse files
committed
Integrated
1 parent 2f2580b commit 4525133

31 files changed

Lines changed: 202 additions & 158 deletions

_config.yml

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,7 @@ markdown: kramdown
5757
permalink: /:categories/:title/
5858
highlight: pygments
5959
excerpt_separator: "<!--more-->"
60-
exclude: []
6160
include: ['.htaccess']
62-
63-
64-
# The language setting is used in /includes/header.html for html-settings
65-
language: "en"
66-
6761
# Exclude these files from your production _site
6862
exclude:
6963
- .sass-cache
@@ -73,6 +67,11 @@ exclude:
7367
- README.md
7468
- INSTALL.md
7569

70+
71+
# The language setting is used in /includes/header.html for html-settings
72+
language: "en"
73+
74+
7675
# Used › default.html front-matter and comress.html
7776
# Options › http://jch.penibelst.de
7877
compress_html:
@@ -85,12 +84,12 @@ compress_html:
8584

8685

8786
#
88-
# ____ ____ ____
87+
# ____ ____ ____
8988
# / __ \___ / __/___ ___ __/ / /_
9089
# / / / / _ \/ /_/ __ `/ / / / / __/
91-
# / /_/ / __/ __/ /_/ / /_/ / / /_
92-
# /_____/\___/_/ \__,_/\__,_/_/\__/
93-
#
90+
# / /_/ / __/ __/ /_/ / /_/ / / /_
91+
# /_____/\___/_/ \__,_/\__,_/_/\__/
92+
#
9493
# Default Settings
9594

9695
defaults:
@@ -105,7 +104,7 @@ defaults:
105104
author: phlow # Default author for pages
106105
-
107106
scope:
108-
path: ""
107+
path: ""
109108
type: "posts"
110109
values:
111110
show_meta: true # Show metadata for all posts
@@ -115,22 +114,22 @@ defaults:
115114

116115

117116

118-
# _ __ _ __ _
119-
# / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
117+
# _ __ _ __ _
118+
# / | / /___ __ __(_)___ _____ _/ /_(_)___ ____
120119
# / |/ / __ `/ | / / / __ `/ __ `/ __/ / __ \/ __ \
121120
# / /| / /_/ /| |/ / / /_/ / /_/ / /_/ / /_/ / / / /
122-
# /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
123-
# /____/
121+
# /_/ |_/\__,_/ |___/_/\__, /\__,_/\__/_/\____/_/ /_/
122+
# /____/
124123
#
125124
# Open _data/navigation.yml to adjust the left and right topbar navigation
126125
#
127126

128127

129128

130-
# _____ __________
129+
# _____ __________
131130
# / ___// ____/ __ \
132131
# \__ \/ __/ / / / /
133-
# ___/ / /___/ /_/ /
132+
# ___/ / /___/ /_/ /
134133
# /____/_____/\____/ Verify Website to Webmaster Tools
135134

136135
google_author: "https://plus.google.com/u/0/118311555303973066167"
@@ -140,10 +139,10 @@ bing_webmastertools_id: "0FB4C028ABCF07C908C54386ABD2D97F"
140139

141140

142141

143-
# ______ _
142+
# ______ _
144143
# / ____/___ __ __(_)________ ____ _____
145144
# / /_ / __ `/ | / / / ___/ __ \/ __ \/ ___/
146-
# / __/ / /_/ /| |/ / / /__/ /_/ / / / (__ )
145+
# / __/ / /_/ /| |/ / / /__/ /_/ / / / (__ )
147146
# /_/ \__,_/ |___/_/\___/\____/_/ /_/____/ Favicon-Crap: Favicons, Chrome, Android & Apple Touch Buttons
148147
# More information » https://mathiasbynens.be/notes/touch-icons
149148

@@ -161,10 +160,10 @@ msapplication_tileimage: "msapplication_tileimage.png"
161160
msapplication_tilecolor: "#fabb00"
162161

163162

164-
# ______ __ __
163+
# ______ __ __
165164
# / ____/___ _________ / /_ ____ ____ / /__
166165
# / /_ / __ `/ ___/ _ \/ __ \/ __ \/ __ \/ //_/
167-
# / __/ / /_/ / /__/ __/ /_/ / /_/ / /_/ / ,<
166+
# / __/ / /_/ / /__/ __/ /_/ / /_/ / /_/ / ,<
168167
# /_/ \__,_/\___/\___/_.___/\____/\____/_/|_| Facebook-Optimization › http://j.mp/fb_optimize
169168

170169
og_image: "http://images.phlow.de/phlow/phlow_de-logo-512x.png"
@@ -176,46 +175,46 @@ og_description: "Feeling Responsive is built on the fabulous
176175
# og_site_name: ""
177176

178177

179-
# _____ _ __ __ ___ ___
178+
# _____ _ __ __ ___ ___
180179
# / ___/____ _____(_)___ _/ / / |/ /__ ____/ (_)___ _
181180
# \__ \/ __ \/ ___/ / __ `/ / / /|_/ / _ \/ __ / / __ `/
182-
# ___/ / /_/ / /__/ / /_/ / / / / / / __/ /_/ / / /_/ /
183-
# /____/\____/\___/_/\__,_/_/ /_/ /_/\___/\__,_/_/\__,_/
181+
# ___/ / /_/ / /__/ / /_/ / / / / / / __/ /_/ / / /_/ /
182+
# /____/\____/\___/_/\__,_/_/ /_/ /_/\___/\__,_/_/\__,_/
184183
#
185184
# Open _data/socialmedia.yml to adjust the left and right topbar navigation
186185
#
187186

188187

189-
# ____ _
188+
# ____ _
190189
# / __ \(_)________ ___ _______
191190
# / / / / / ___/ __ `/ / / / ___/
192-
# / /_/ / (__ ) /_/ / /_/ (__ )
193-
# /_____/_/____/\__, /\__,_/____/
194-
# /_/
191+
# / /_/ / (__ ) /_/ / /_/ (__ )
192+
# /_____/_/____/\__, /\__,_/____/
193+
# /_/
195194
#
196195
# used in _includes/comments.html
197196

198197
disqus_shortname: feelingresponsive
199198

200199

201-
# _____
200+
# _____
202201
# / ___/____ ___________
203202
# \__ \/ __ `/ ___/ ___/
204-
# ___/ / /_/ (__ |__ ) More › http://sass-lang.com/
203+
# ___/ / /_/ (__ |__ ) More › http://sass-lang.com/
205204
# /____/\__,_/____/____/ More › http://jekyllrb.com/docs/assets/#sassscss
206-
#
205+
#
207206

208207
sass:
209208
sass_dir: _sass
210209
style: :compressed
211210

212211

213-
# ___ __ __ _
212+
# ___ __ __ _
214213
# / | ____ ____ _/ /_ __/ /_(_)_________
215214
# / /| | / __ \/ __ `/ / / / / __/ / ___/ ___/
216-
# / ___ |/ / / / /_/ / / /_/ / /_/ / /__(__ )
215+
# / ___ |/ / / / /_/ / / /_/ / /_/ / /__(__ )
217216
# /_/ |_/_/ /_/\__,_/_/\__, /\__/_/\___/____/ https://www.google.com/analytics/
218-
# /____/
217+
# /____/
219218
#
220219
# used in _includes/footer_scripts.html
221220

_config_dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ sass:
1111
# http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style
1212
style: :expanded
1313
line_numbers: true
14-
#trace_selectors: true
15-
#debug_info: true
14+
# trace_selectors: true
15+
# debug_info: true
1616
# FUTURE https://github.com/jekyll/jekyll-sass-converter/issues/12
1717
sourcemap: true
1818

_data/authors.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#
77
# Resource › http://blog.sorryapp.com/blogging-with-jekyll/2014/02/06/adding-authors-to-your-jekyll-site.html
88
phlow: # replace this with your info
9-
name: "Moritz »mo.« Sauer"
9+
name: "Phlow"
1010
siterole: "webmaster, developer, copywriter, designer"
11-
uri: http://mo.phlow.de/
11+
uri: http://phlow.de/
1212
email:
1313
twitter: "@phlow"
1414
# you can add more authors here

_drafts/gallery.md

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,32 @@
11
---
22
layout: page
3-
subheadline:
4-
title:
5-
teaser:
6-
meta_description:
7-
permalink:
3+
#
4+
# Content
5+
#
6+
subheadline: ""
7+
title: ""
8+
teaser: ""
89
categories:
910
-
1011
tags:
1112
-
13+
#
14+
# Styling
15+
#
1216
image:
1317
thumb:
18+
#
19+
# Metainformation & Customization
20+
#
21+
meta_description:
22+
permalink:
1423
---
1524

1625
<ul class="clearing-thumbs small-block-grid-3" data-clearing>
17-
<li><a href="{{ site.urlimg }}unsplash_1.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_1_thumb.jpg" /></a></li>
18-
<li><a href="{{ site.urlimg }}unsplash_2.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_2_thumb.jpg" /></a></li>
19-
<li><a href="{{ site.urlimg }}unsplash_3.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_3_thumb.jpg" /></a></li>
20-
<li><a href="{{ site.urlimg }}unsplash_4.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_4_thumb.jpg" /></a></li>
21-
<li><a href="{{ site.urlimg }}unsplash_5.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_5_thumb.jpg" /></a></li>
22-
<li><a href="{{ site.urlimg }}unsplash_6.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_6_thumb.jpg" /></a></li>
26+
<li><a href="{{ site.urlimg }}unsplash_1.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_1_thumb.jpg"></a></li>
27+
<li><a href="{{ site.urlimg }}unsplash_2.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_2_thumb.jpg"></a></li>
28+
<li><a href="{{ site.urlimg }}unsplash_3.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_3_thumb.jpg"></a></li>
29+
<li><a href="{{ site.urlimg }}unsplash_4.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_4_thumb.jpg"></a></li>
30+
<li><a href="{{ site.urlimg }}unsplash_5.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_5_thumb.jpg"></a></li>
31+
<li><a href="{{ site.urlimg }}unsplash_6.jpg"><img data-caption="" class="th" src="{{ site.urlimg }}unsplash_6_thumb.jpg"></a></li>
2332
</ul>

_drafts/page_all_frontmatter.md

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
---
22
layout: page
3-
subheadline:
4-
title:
5-
teaser:
6-
meta_title: # SEO: Overwrites title in <head> if needed
7-
meta_description:
8-
permalink:
3+
#
4+
# Content
5+
#
6+
subheadline: ""
7+
title: ""
8+
teaser: ""
99
categories:
10-
-
10+
-
1111
tags:
12-
-
12+
-
13+
#
14+
# Styling
15+
#
1316
header: no
1417
header:
15-
image_fullwidth:
18+
image_fullwidth:
1619
image:
1720
pattern:
1821
color:
19-
background-color: "#fabb00"
20-
title:
21-
caption:
22-
caption_url:
22+
background-color: "#fabb00" # You must use ""
23+
title:
24+
caption:
25+
caption_url:
2326
image:
2427
title:
2528
homepage:
@@ -32,10 +35,16 @@ video:
3235
embedURL: ""
3336
contentURL: ""
3437
thumbnailUrl: ""
35-
show_meta: false
38+
#
39+
# Metainformation & Customization
40+
#
3641
sidebar: left
3742
comments: true
3843
breadcrumb: true
44+
show_meta: false
45+
meta_title: # SEO: Overwrites title in <head> if needed
46+
meta_description:
47+
permalink:
3948
tawkto: true # Enable tawk.to-Service › More › _config.yml
4049
---
4150

_drafts/page_simple.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
---
22
layout: page
3-
title:
4-
teaser:
5-
permalink:
3+
#
4+
# Content
5+
#
6+
subheadline: ""
7+
title: ""
8+
teaser: ""
9+
#
10+
# Styling
11+
#
612
header: no
13+
#
14+
# Metainformation & Customization
15+
#
16+
permalink:
717
---
818

_drafts/page_with_image.md

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,21 @@
11
---
22
layout: page
3-
subheadline:
4-
title:
5-
teaser:
6-
meta_description:
7-
permalink:
3+
#
4+
# Content
5+
#
6+
subheadline: ""
7+
title: ""
8+
teaser: ""
89
categories:
9-
-
10+
-
1011
tags:
11-
-
12+
-
13+
#
14+
# Styling
15+
#
1216
image:
13-
title:
14-
thumb:
17+
title:
18+
thumb:
1519
homepage:
1620
caption:
1721
caption_url:

_drafts/page_with_table_of_contents.md

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
---
22
layout: page-fullwidth
3-
subheadline:
4-
title:
5-
teaser:
6-
meta_description:
7-
permalink:
3+
#
4+
# Content
5+
#
6+
subheadline: ""
7+
title: ""
8+
teaser: ""
89
categories:
9-
-
10+
-
1011
tags:
11-
-
12+
-
1213
---
1314
<div class="row">
1415
<div class="medium-4 medium-push-8 columns" markdown="1">

_drafts/page_without_image.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
---
22
layout: page
3-
title:
4-
subheadline:
5-
teaser:
3+
#
4+
# Content
5+
#
6+
subheadline: ""
7+
title: ""
8+
teaser: ""
69
meta_description:
710
permalink:
811
categories:

0 commit comments

Comments
 (0)