From 84c47e35843c6f0ca4505c7925fda5552a39a883 Mon Sep 17 00:00:00 2001 From: Oleh Zasadnyy Date: Fri, 22 Aug 2014 01:01:20 +0300 Subject: [PATCH] Optimized _layouts. Merged most js libraries into one --- .gitignore | 8 +- _config.yml | 8 +- _includes/footer.html | 2 +- _includes/post.html | 6 +- .../schema-event.html | 71 ++---- _layouts/default.html | 146 ++++++------- _layouts/index.html | 154 ------------- _layouts/post.html | 83 +------ _sass/partials/_base.scss | 1 - _site/blog/call-for-papers/index.html | 49 +++-- _site/blog/hello-world/index.html | 49 +++-- _site/blog/index.html | 43 ++-- _site/cod/index.html | 43 ++-- _site/index.html | 203 +++++++++--------- _site/js/bootstrap.min.js | 4 - _site/js/jquery-2.1.1.min.js | 6 +- _site/js/scripts.js | 4 - _site/js/scripts.min.js | 4 - _site/logistics/index.html | 75 ++++--- _site/speakers/index.html | 43 ++-- _site/team/index.html | 43 ++-- index.html | 2 +- js/default.js | 17 ++ js/jquery.appear.min.js | 1 - js/jquery.countTo.min.js | 1 - {_site/js => js/sources}/jquery.appear.min.js | 0 .../js => js/sources}/jquery.countTo.min.js | 0 js/{ => sources}/jquery.sticky-kit.min.js | 0 {_site/js => js/sources}/typed.min.js | 0 {_site/js => js/sources}/waves.min.js | 0 js/{ => sources}/waves.min.js.map | 0 js/typed.min.js | 1 - js/waves.min.js | 10 - logistics.html | 2 +- 34 files changed, 397 insertions(+), 682 deletions(-) rename _layouts/logistics.html => _includes/schema-event.html (51%) delete mode 100644 _layouts/index.html create mode 100644 js/default.js delete mode 100644 js/jquery.appear.min.js delete mode 100644 js/jquery.countTo.min.js rename {_site/js => js/sources}/jquery.appear.min.js (100%) rename {_site/js => js/sources}/jquery.countTo.min.js (100%) rename js/{ => sources}/jquery.sticky-kit.min.js (100%) rename {_site/js => js/sources}/typed.min.js (100%) rename {_site/js => js/sources}/waves.min.js (100%) rename js/{ => sources}/waves.min.js.map (100%) delete mode 100644 js/typed.min.js delete mode 100644 js/waves.min.js diff --git a/.gitignore b/.gitignore index 8be296e..fc4dc47 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ -_site -_sass/.sass-cache \ No newline at end of file +### Jekyll ### +_site/ + + +### Sass ### +.sass-cache \ No newline at end of file diff --git a/_config.yml b/_config.yml index 9719963..f342fda 100644 --- a/_config.yml +++ b/_config.yml @@ -104,12 +104,10 @@ twitterHashTag: "devfest" twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=900" # Partners Block +organizersTitle: "Organizers" partnersTitle: "Partners" partnersC4sponsorsButton: "Become a sponsor" -# Organizers Block -organizersTitle: "Organizers" - # Subscribe Block subscribeTitle: "Subscribe for updates" subscribeAction: "http://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&id=ae0fb459fc" @@ -150,7 +148,7 @@ socialLinks: - {link: "https://plus.google.com/b/102444623953913144164", icon: "google-plus"} - {link: "https://twitter.com/intent/user?screen_name=GDGLviv", icon: "twitter"} - {link: "https://facebook.com/GDGLviv", icon: "facebook"} - - {link: "http://localhost:4000/zeppelin/feed.xml", icon: "rss"} + - {permalink: "/feed.xml", icon: "rss"} footerBlocks: - title: "Links" @@ -164,7 +162,7 @@ footerBlocks: - title: "FAQ" links: - - {permalink: "http://localhost:4000/zeppelin/cod/", text: "Code of Conduct"} + - {permalink: "/cod/", text: "Code of Conduct"} # Blog blogTitle: "Latest news" diff --git a/_includes/footer.html b/_includes/footer.html index c5fe800..02d4ff7 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -24,7 +24,7 @@