From 220149a69500a5ba77e1abdfeb13966602a600dc Mon Sep 17 00:00:00 2001 From: Oleh Zasadnyy Date: Mon, 25 Aug 2014 12:42:51 +0300 Subject: [PATCH] Updated partnership proposition, changed .explore icon animation, added new tickets block, merged js plugins into one file, refactoring of scripts.js, minor style fixes --- _config.yml | 34 +- _data/organizers.yml | 6 +- _includes/blog.html | 12 +- _includes/direction-details.html | 2 +- _includes/hero.html | 9 +- _includes/navigation.html | 2 +- _includes/post.html | 19 +- _includes/schema-event.html | 1 + _includes/tickets-2.html | 43 + _includes/{buy-tickets.html => tickets.html} | 12 +- _includes/twitter-feed.html | 2 +- _layouts/default.html | 16 +- _sass/main.scss | 3 +- _sass/partials/_blog.scss | 17 +- _sass/partials/_buttons.scss | 8 +- _sass/partials/_global.scss | 4 +- _sass/partials/_helper.scss | 7 + _sass/partials/_hero.scss | 34 +- _sass/partials/_tickets-2.scss | 86 ++ .../{_buy-tickets.scss => _tickets.scss} | 15 +- _sass/partials/_twitter-feed.scss | 20 +- _site/blog/call-for-papers/index.html | 553 -------- _site/blog/hello-world/index.html | 507 ------- _site/blog/index.html | 510 ------- _site/cod/index.html | 438 ------ _site/css/main.min.css | 2 - _site/feed.xml | 124 -- _site/index.html | 975 -------------- _site/logistics/index.html | 561 -------- _site/speakers/index.html | 1176 ----------------- _site/team/index.html | 604 --------- assets/GDG_DevFest_Partnership.pdf | Bin 13797071 -> 2554514 bytes css/main.min.css | 4 +- img/conference.jpg | Bin 26880 -> 20794 bytes img/organizers/gdg-cherkassy.png | Bin 14801 -> 0 bytes img/organizers/gdg-cherkasy.svg | 1 + img/organizers/gdg-dnipropetrovsk.png | Bin 17521 -> 0 bytes img/organizers/gdg-dnipropetrovsk.svg | 1 + img/organizers/gdg-kyiv.png | Bin 10451 -> 0 bytes img/organizers/gdg-kyiv.svg | 1 + index.html | 4 +- js/scripts.js | 309 +++-- js/scripts.min.js | 2 +- 43 files changed, 432 insertions(+), 5692 deletions(-) create mode 100644 _includes/tickets-2.html rename _includes/{buy-tickets.html => tickets.html} (79%) create mode 100644 _sass/partials/_tickets-2.scss rename _sass/partials/{_buy-tickets.scss => _tickets.scss} (91%) delete mode 100644 _site/blog/call-for-papers/index.html delete mode 100644 _site/blog/hello-world/index.html delete mode 100644 _site/blog/index.html delete mode 100644 _site/cod/index.html delete mode 100644 _site/css/main.min.css delete mode 100644 _site/feed.xml delete mode 100644 _site/index.html delete mode 100644 _site/logistics/index.html delete mode 100644 _site/speakers/index.html delete mode 100644 _site/team/index.html delete mode 100644 img/organizers/gdg-cherkassy.png create mode 100644 img/organizers/gdg-cherkasy.svg delete mode 100644 img/organizers/gdg-dnipropetrovsk.png create mode 100644 img/organizers/gdg-dnipropetrovsk.svg delete mode 100644 img/organizers/gdg-kyiv.png create mode 100644 img/organizers/gdg-kyiv.svg diff --git a/_config.yml b/_config.yml index f342fda..e75a0b2 100644 --- a/_config.yml +++ b/_config.yml @@ -49,9 +49,10 @@ rightNavigationButtons: - {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"} # Hero Block -heroTitle: "GDG DevFest 2014" +heroTitle: "GDG DevFest2014" eventDate: "September - November, 2014" typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"' +typeoutFallback: "Season" heroButtons: - {url: "http://bit.ly/dfua-c4p", text: "Become a speaker"} @@ -113,32 +114,41 @@ subscribeTitle: "Subscribe for updates" subscribeAction: "http://gdg.us5.list-manage1.com/subscribe/post?u=9fc8aa205b0521b5f05fc8e1e&id=ae0fb459fc" subscribeInfo: "Registration will be open around end of August. Number of tickets are limited. Stay tuned!" -# Buy Tickets Block -buyTicketsTitle: "Pricetable" +# Tickets Block +ticketsTitle: "Pricetable" +ticketsInfo: "Tickets grant access to all conference sections, coffee brakes, lunches and parties. Accommodation is NOT included in the ticket price." ticketsOffers: - - name: "1 day" - price: "$100" + name: "Early Bird" + price: "350" + priceCurrency: "UAH" + ticketsNumber: "150" buyButtonLink: "http://dfua.ticketforevent.com/" buyButtonText: "Buy Now" ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"] - validFrom: "2014-08-20T10:00" - validThrough: "2014-10-23T23:59" + validFrom: "2014-08-25T10:00" + validThrough: "2014-09-30T23:59" - - name: "3 days" - price: "$180" + name: "Last Chance" + price: "450" + priceCurrency: "UAH" + ticketsNumber: "100" ribbon: "-20%" featured: true buyButtonLink: "http://dfua.ticketforevent.com/" buyButtonText: "Buy Now" ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"] - validFrom: "2014-08-20T10:00" + validFrom: "2014-10-01T00:00" validThrough: "2014-10-23T23:59" + disabled: true - - name: "2 days" - price: "$150" + name: "Student" + price: "200" + priceCurrency: "UAH" + ticketsNumber: "50" buyButtonLink: "http://dfua.ticketforevent.com/" buyButtonText: "Buy Now" + additionalInfo: "Requires a valid student ID at the conference check in. Without student ID at the check in, ticket will be cancelled without refund" ticketContentList: ["Lorem ipsum is simply", "Dummy text of the printing", "Typesetting industry"] validFrom: "2014-08-20T10:00" validThrough: "2014-10-23T23:59" diff --git a/_data/organizers.yml b/_data/organizers.yml index 768fd05..8e26ad1 100644 --- a/_data/organizers.yml +++ b/_data/organizers.yml @@ -5,6 +5,6 @@ - group: "Co-organizers" elements: - - {name: "GDG Lviv", description: "GDG Kyiv - Open and volunteer geek community", link: "http://kyiv.gdg.org.ua", imageUrl: "gdg-kyiv.png"} - - {name: "GDG Cherkassy", description: "GDG Cherkassy - Open and volunteer geek community", link: "http://cherkassy.gdg.org.ua", imageUrl: "gdg-cherkassy.png"} - - {name: "GDG Dnipropetrovsk", description: "GDG Dnipropetrovsk - Open and volunteer geek community", link: "http://dnipro.gdg.org.ua", imageUrl: "gdg-dnipropetrovsk.png"} \ No newline at end of file + - {name: "GDG Lviv", description: "GDG Kyiv - Open and volunteer geek community", link: "http://kyiv.gdg.org.ua", imageUrl: "gdg-kyiv.svg"} + - {name: "GDG Cherkassy", description: "GDG Cherkassy - Open and volunteer geek community", link: "http://cherkassy.gdg.org.ua", imageUrl: "gdg-cherkasy.svg"} + - {name: "GDG Dnipropetrovsk", description: "GDG Dnipropetrovsk - Open and volunteer geek community", link: "http://dnipro.gdg.org.ua", imageUrl: "gdg-dnipropetrovsk.svg"} \ No newline at end of file diff --git a/_includes/blog.html b/_includes/blog.html index 3e5efcf..f317700 100644 --- a/_includes/blog.html +++ b/_includes/blog.html @@ -5,32 +5,32 @@

{{ site.blogTitle }}

{% for post in site.posts %} - {% assign postUrl = site.url | append: site.baseurl | append: post.url %}

{{ post.title }}
-
+
Posted:
-