From b6c2d9c762847d7e54e713598ad210969639a886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20=C2=BBmo=2E=C2=AB=20Sauer?= Date: Mon, 4 Jan 2016 13:17:05 +0100 Subject: [PATCH 001/105] Minor Changes and Bugfixes --- .jekyll-metadata | Bin 4 -> 0 bytes Gemfile | 1 + Gemfile.lock | 17 +++++- _config.yml | 12 ++-- _config_dev.yml | 10 +++- _drafts/page_all_frontmatter.md | 8 +-- _includes/_favicon.html | 97 ++++++++------------------------ _includes/_footer.html | 4 +- _includes/_head.html | 62 +++++++++++++------- 9 files changed, 103 insertions(+), 108 deletions(-) delete mode 100644 .jekyll-metadata diff --git a/.jekyll-metadata b/.jekyll-metadata deleted file mode 100644 index beefda1ae32c2cef8eb53a4f3c8407a532a22b51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZSKsAd2F0U`j1 diff --git a/Gemfile b/Gemfile index 4486bb9ea20..7b7a2da6f63 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,5 @@ source 'https://rubygems.org' gem 'jekyll' +gem 'jekyll-gist' gem 'jekyll-paginate' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 3a82675224f..79ec5bda91b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,9 +1,12 @@ GEM remote: https://rubygems.org/ specs: + addressable (2.3.8) colorator (0.1) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) ffi (1.9.10) - jekyll (3.0.0) + jekyll (3.0.1) colorator (~> 0.1) jekyll-sass-converter (~> 1.0) jekyll-watch (~> 1.1) @@ -12,6 +15,8 @@ GEM mercenary (~> 0.3.3) rouge (~> 1.7) safe_yaml (~> 1.0) + jekyll-gist (1.4.0) + octokit (~> 4.2) jekyll-paginate (1.1.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) @@ -23,16 +28,26 @@ GEM rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) mercenary (0.3.5) + multipart-post (2.0.0) + octokit (4.2.0) + sawyer (~> 0.6.0, >= 0.5.3) rb-fsevent (0.9.6) rb-inotify (0.9.5) ffi (>= 0.5.0) rouge (1.10.1) safe_yaml (1.0.4) sass (3.4.19) + sawyer (0.6.0) + addressable (~> 2.3.5) + faraday (~> 0.8, < 0.10) PLATFORMS ruby DEPENDENCIES jekyll + jekyll-gist jekyll-paginate + +BUNDLED WITH + 1.10.6 diff --git a/_config.yml b/_config.yml index bd2001cad5b..dbd1e4eb944 100644 --- a/_config.yml +++ b/_config.yml @@ -51,7 +51,9 @@ logo: "logo.png" # /_/ \__,_/\__, /_/_/ /_/\__,_/\__/_/\____/_/ /_/ # /____/ # -gems: [jekyll-paginate] +gems: + - jekyll-gist + - jekyll-paginate paginate: 5 # Paginates all X entries paginate_path: "blog/page:num" # Pagination path › Important for blog page in /blog/ to work @@ -175,10 +177,6 @@ msapplication_tilecolor: "#fabb00" og_image: "http://images.phlow.de/phlow/phlow_de-logo-512x.png" og_locale: "en_EN" og_type: "website" -og_title: "Feeling Responsive – A Responsive Theme for Jekyll" -og_description: "Feeling Responsive is built on the fabulous Foundation Framework and comes with lots of features to show your content right." -# og_url: "" -# og_site_name: "" # _____ _ __ __ ___ ___ @@ -190,6 +188,10 @@ og_description: "Feeling Responsive is built on the fabulous # Open _data/socialmedia.yml to adjust the left and right topbar navigation # +socialmedia: + twitter: phlow + facebook: phlow.media + # ____ _ # / __ \(_)________ ___ _______ diff --git a/_config_dev.yml b/_config_dev.yml index 7b23c13084c..2b7844f2428 100644 --- a/_config_dev.yml +++ b/_config_dev.yml @@ -5,9 +5,13 @@ # # Start development with › $ jekyll serve --config _config.yml,_config_dev.yml -url: 'http://localhost:4000' -urlimg: 'http://localhost:4000/images/' -gems: [jekyll-paginate] +url: 'http://localhost:4000' +baseurl: '' +urlimg: 'http://localhost:4000/images/' + +# See › https://github.com/jekyll/jekyll-gist#disabling-noscript-support +gist: + noscript: false sass: # http://sass-lang.com/documentation/file.SASS_REFERENCE.html#output_style diff --git a/_drafts/page_all_frontmatter.md b/_drafts/page_all_frontmatter.md index 2ef6801fcb1..4c6fc7f2123 100644 --- a/_drafts/page_all_frontmatter.md +++ b/_drafts/page_all_frontmatter.md @@ -30,11 +30,11 @@ image: caption: caption_url: style: # Adding additional CSS-styles to -iframe: "" +iframe: '' video: - embedURL: "" - contentURL: "" - thumbnailUrl: "" + embedURL: '' + contentURL: '' + thumbnailUrl: '' # # Metainformation & Customization # diff --git a/_includes/_favicon.html b/_includes/_favicon.html index 0fcfe352b91..1921f776aa2 100644 --- a/_includes/_favicon.html +++ b/_includes/_favicon.html @@ -3,75 +3,28 @@ * More Information › https://mathiasbynens.be/notes/touch-icons * {% endcomment %} - - -{% if site.favicon-32x32 %} - {% comment %} Regular Old-Skool Favicon: {% endcomment %} - -{% endif %} - - -{% if site.touch-icon-192x192 %} - {% comment %} For Chrome for Android: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-180x180-precomposed %} - {% comment %} For iPhone 6 Plus with @3× display: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-152x152-precomposed %} - {% comment %} For iPad with @2× display running iOS ≥ 7: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-144x144-precomposed %} - {% comment %} For iPad with @2× display running iOS ≤ 6: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-120x120-precomposed %} - {% comment %} For iPhone with @2× display running iOS ≥ 7: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-114x114-precomposed %} - {% comment %} For iPhone with @2× display running iOS ≤ 6: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-76x76-precomposed %} - {% comment %} For the iPad mini and the first- and second-generation iPad (@1× display) on iOS ≥ 7: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-72x72-precomposed %} - {% comment %} For the iPad mini and the first- and second-generation iPad (@1× display) on iOS ≤ 6: {% endcomment %} - -{% endif %} - - -{% if site.apple-touch-icon-precomposed %} - {% comment %} For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: {% endcomment %} - {% comment %} 57×57px {% endcomment %} -{% endif %} - - -{% if site.msapplication_tileimage %} - {% comment %} Favicon for Windows 8 {% endcomment %} - -{% endif %} - - -{% if site.msapplication_tilecolor %} - {% comment %} Background Color for Tile for Windows 8 {% endcomment %} - -{% endif %} +{% comment %} Regular Old-Skool Favicon: {% endcomment %} + {% if site.favicon-32x32 %}{% endif %} +{% comment %} For Chrome for Android: {% endcomment %} + {% if site.touch-icon-192x192 %}{% endif %} +{% comment %} For iPhone 6 Plus with @3× display: {% endcomment %} + {% if site.apple-touch-icon-180x180-precomposed %}{% endif %} +{% comment %} For iPad with @2× display running iOS ≥ 7: {% endcomment %} + {% if site.apple-touch-icon-152x152-precomposed %}{% endif %} +{% comment %} For iPad with @2× display running iOS ≤ 6: {% endcomment %} + {% if site.apple-touch-icon-144x144-precomposed %}{% endif %} +{% comment %} For iPhone with @2× display running iOS ≥ 7: {% endcomment %} + {% if site.apple-touch-icon-120x120-precomposed %}{% endif %} +{% comment %} For iPhone with @2× display running iOS ≤ 6: {% endcomment %} + {% if site.apple-touch-icon-114x114-precomposed %}{% endif %} +{% comment %} For the iPad mini and the first- and second-generation iPad (@1× display) on iOS ≥ 7: {% endcomment %} + {% if site.apple-touch-icon-76x76-precomposed %} + {% endif %} +{% comment %} For the iPad mini and the first- and second-generation iPad (@1× display) on iOS ≤ 6: {% endcomment %} + {% if site.apple-touch-icon-72x72-precomposed %}{% endif %} +{% comment %} For non-Retina iPhone, iPod Touch, and Android 2.1+ devices: {% endcomment %} + {% if site.apple-touch-icon-precomposed %}{% comment %} 57×57px {% endcomment %} {% endif %} +{% comment %} Favicon for Windows 8 {% endcomment %} + {% if site.msapplication_tileimage %}{% endif %} +{% comment %} Background Color for Tile for Windows 8 {% endcomment %} + {% if site.msapplication_tilecolor %}{% endif %} diff --git a/_includes/_footer.html b/_includes/_footer.html index 3f6ed3a1902..c3c675fe9dc 100755 --- a/_includes/_footer.html +++ b/_includes/_footer.html @@ -27,7 +27,7 @@
{{ service_item.menu_name }}