From fbaeb935bb102506f2e6bfa4db186ea267823427 Mon Sep 17 00:00:00 2001 From: Oleh Zasadnyy Date: Sun, 31 Aug 2014 21:52:35 +0300 Subject: [PATCH] Static map on small screens, ability to change background image/color of top-section, finalised hackathon page --- .gitignore | 7 +- _config.yml | 21 ++- _data/partners.yml | 6 +- _data/sessions.yml | 2 +- _data/team.yml | 2 +- _includes/direction-details.html | 4 +- _includes/find-way.html | 13 +- _includes/footer.html | 4 +- _includes/hero.html | 2 +- _includes/judges.html | 2 +- _includes/navigation.html | 6 +- _includes/partners.html | 4 +- _includes/rockstar-speakers.html | 2 +- _includes/speakers-list.html | 6 +- _includes/statistic.html | 2 +- _includes/subscribe.html | 2 +- _includes/tickets-2.html | 6 +- _includes/top-section.html | 2 +- _includes/twitter-feed.html | 2 +- _includes/venue.html | 8 +- _layouts/default.html | 18 ++- _sass/modules/_utility.scss | 10 ++ _sass/partials/_about-hackathon.scss | 26 ++-- _sass/partials/_base.scss | 2 + _sass/partials/_find-way.scss | 17 ++- _sass/partials/_global.scss | 7 + _sass/partials/_hackathon-location.scss | 4 + _sass/partials/_hero.scss | 2 +- _sass/partials/_judges.scss | 14 +- _sass/partials/_lily-effect.scss | 12 +- _sass/partials/_partners.scss | 2 - _sass/partials/_prizes.scss | 5 + _sass/partials/_ribbon.scss | 8 ++ _sass/partials/_rockstar-speakers.scss | 31 +++-- _sass/partials/_twitter-feed.scss | 23 +++- _sass/partials/_zoe-effect.scss | 16 +-- blog.html | 1 + css/main.min.css | 4 +- img/favicons/apple-touch-icon-120x120.png | Bin 2355 -> 2342 bytes img/favicons/apple-touch-icon-144x144.png | Bin 2644 -> 2622 bytes img/favicons/apple-touch-icon-152x152.png | Bin 2735 -> 2718 bytes img/favicons/apple-touch-icon-57x57.png | Bin 1697 -> 1686 bytes img/favicons/apple-touch-icon-60x60.png | Bin 1734 -> 1723 bytes img/favicons/apple-touch-icon-72x72.png | Bin 1869 -> 1859 bytes img/favicons/apple-touch-icon-76x76.png | Bin 1908 -> 1896 bytes img/favicons/apple-touch-icon-precomposed.png | Bin 2735 -> 2718 bytes img/favicons/apple-touch-icon.png | Bin 2735 -> 2718 bytes img/favicons/favicon-160x160.png | Bin 2789 -> 2769 bytes img/favicons/favicon-196x196.png | Bin 3193 -> 3121 bytes img/favicons/favicon-32x32.png | Bin 1273 -> 1261 bytes img/favicons/favicon-96x96.png | Bin 2122 -> 2118 bytes img/favicons/mstile-144x144.png | Bin 2644 -> 2622 bytes img/favicons/mstile-150x150.png | Bin 2644 -> 2567 bytes img/favicons/mstile-310x150.png | Bin 2791 -> 2684 bytes img/partners/gdg-lviv.svg | 130 +----------------- img/partners/gdg-x.svg | 54 +------- img/partners/google.svg | 65 +-------- img/people/Thumbs.db | Bin 50688 -> 73728 bytes img/sections-background/blog.jpg | Bin 0 -> 205978 bytes img/sections-background/schedule.jpg | Bin 0 -> 261087 bytes js/scripts.js | 30 ++-- schedule.html | 1 + team.html | 1 + 63 files changed, 224 insertions(+), 362 deletions(-) create mode 100644 img/sections-background/blog.jpg create mode 100644 img/sections-background/schedule.jpg diff --git a/.gitignore b/.gitignore index fc4dc47..e4268ab 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,9 @@ _site/ ### Sass ### -.sass-cache \ No newline at end of file +.sass-cache + +### Windows ### +# Windows image file caches +Thumbs.db +ehthumbs.db \ No newline at end of file diff --git a/_config.yml b/_config.yml index 4b2a00b..caaa7f2 100644 --- a/_config.yml +++ b/_config.yml @@ -49,6 +49,7 @@ rightNavigationButtons: - {link: "http://bit.ly/dfua-c4p", text: "Become a speaker"} # Hero Block +heroImage: "hero.jpg" heroTitle: "GDG DevFest2014" eventDate: "September - November, 2014" typeoutTextValues: '"", "Season", "Ukraine", "Germany", "USA"' @@ -65,6 +66,7 @@ aboutBlock: - {title: "Hackathon", image: "hackathon.jpg", text: "Full-day free-style hackaton! Want some real teambuilding on friday? Grab your team and join our hackathon!" } # Statistic Block +statisticBlockImage: "statistic.jpg" statisticBlock: - {count: "350", specialCharacter: "+", info: "attendees", detail: "from everywhere"} - {count: "48", specialCharacter: "+", info: "hours", detail: "of pure Google technologies"} @@ -75,6 +77,7 @@ statisticBlock: latestNewsTitle: "Latest news" # Rockstar Speakers Block +rockstarSpeakersImage: "rockstar-speakers.jpg" rockstarSpeakersCount: 4 rockstarSpeakersTitle: "Rockstar speakers" rockstarSpeakersButtonText: "See all speakers" @@ -91,16 +94,21 @@ eventAddressCountry: "Ukraine" eventStartTime: "2014-10-25T10:00" eventDoorTime: "09:00" eventEndTime: "2014-10-25T20:00" -eventPlaceCoordinates: "49.843237,24.028751" -mapCenterCoordinates: "49.842537,24.025701" +eventPlaceCoordinates: "49.843237, 24.028751" +mapCenterCoordinates: "49.842537, 24.025701" mapMobileCenterCoordinates: "49.841620, 24.029411" # Venue Block venueBlockTitle: "Venue" +venueBigImage: "venue_0.jpg" +venueSmallImage1: "venue_1.jpg" +venueSmallImage2: "venue_2.jpg" +venueSmallImage3: "venue_3.jpg" venueTitle: "Kinopalace Cinema" venueFeatures: ["3 huge cinema screens", "Doulby Digital Surround EX audio system", "Located directly in the city center"] # Tweets Feed Block +tweetsFeedImage: "twitter-feed.jpg" tweetsFeedTitle: "What's Up?" twitterHashTag: "devfest" twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=900" @@ -111,6 +119,7 @@ partnersTitle: "Partners" partnersC4sponsorsButton: "Become a sponsor" # Subscribe Block +subscribeImage: "subscribe.jpg" 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!" @@ -190,10 +199,17 @@ aboutUs: "Google's services have become synonymous with simple things online. Nu # Logistics Find Way Block findWayTitle: "Find your way here" +findWayDistance: "Distance" +findWayDriving: "DRIVING" +findWayWalking: "WALKING" +findWayBicycling: "BICYCLING" +findWayTransit: "TRANSIT" +findWayFindFlight: "Find Flight" logisticsMapCenterCoordinates: "49.056728, 3.117289" logisticsMapMobileCenterCoordinates: "48.335365, 23.711648" # Logistics Direction Details Block +directionDetailsImage: "direction-details.jpg" directionDetailsTitle: "Get around Lviv" directionDetailsCards: - {title: "From the Airport", information: 'Airport is right at the city border. It is easily reachable by car, public transport or taxi. More information is available at airport website.'} @@ -237,6 +253,7 @@ hackathonRows: - {title: "Polymer", image: "hackathon-2.png", details: "Polymer is a library that introduces web components. Web components are small elements on a page that can be extended and incorporated in web applications. The result is an increase in productivity.

We used Polymer mainly to explore the concept of web components. The transition of Google to material design was also a factor.While the library was never touched by the team, it still was painless to wireframe the application. Later on we incorporated some Polymer components in the design. We didn’t use the full potential of Polymer because of the limited time."} # Hackathon Judges Block +judgesImage: "judges.jpg" judgesTitle: "Judges" # Hackathon Prizes Block diff --git a/_data/partners.yml b/_data/partners.yml index 1a5c102..ca521b2 100644 --- a/_data/partners.yml +++ b/_data/partners.yml @@ -6,9 +6,9 @@ - group: "With support of" elements: - - {name: "Google", description: "Google", link: "https://www.google.com.ua/intl/en/about/", imageUrl: "google.svg"} - - {name: "GDG Lviv", description: "GDG Lviv - Open and volunteer geek community", link: "http://lviv.gdg.org.ua", imageUrl: "gdg-lviv.svg"} - - {name: "GDG[x]", description: "GDG[x] - Yeah, we can fix that", link: "https://github.com/gdg-x", imageUrl: "gdg-x.svg"} + - {name: "Google", description: "Google", link: "https://www.google.com.ua/intl/en/about/", imageUrl: "google.svg", width: "120px"} + - {name: "GDG Lviv", description: "GDG Lviv - Open and volunteer geek community", link: "http://lviv.gdg.org.ua", imageUrl: "gdg-lviv.svg", width: "120px"} + - {name: "GDG[x]", description: "GDG[x] - Yeah, we can fix that", link: "https://github.com/gdg-x", imageUrl: "gdg-x.svg", width: "120px"} - group: "Information partners" elements: diff --git a/_data/sessions.yml b/_data/sessions.yml index f71e7d6..018c237 100644 --- a/_data/sessions.yml +++ b/_data/sessions.yml @@ -13,7 +13,7 @@ title: "Material design: Visual style and imagery" description: "This session will reveal the invisible structures behind the material design system. Designers will show how to use the new color systems, typographic strategies, and the underlying grids that hold it together. They will show how imagery and the new framework material rendering can make apps more interesting and communicate more quickly." subtype: workshop - speakers: [3] + speakers: [3, 6] language: en complexity: "Intermediate" - diff --git a/_data/team.yml b/_data/team.yml index 22808a7..85f8897 100644 --- a/_data/team.yml +++ b/_data/team.yml @@ -16,7 +16,7 @@ id: 1 name: "Oleh" surname: "Zasadnyy" - title: "Designer" + title: "Designer and Web Developer" thumbnailUrl: OlehZasadnyy.jpg team: true ribbon: diff --git a/_includes/direction-details.html b/_includes/direction-details.html index a0a1c29..b2b9b56 100644 --- a/_includes/direction-details.html +++ b/_includes/direction-details.html @@ -1,7 +1,7 @@
-
+

{{ site.directionDetailsTitle }}

@@ -28,7 +28,7 @@
{{ subCard.title }}
diff --git a/_includes/find-way.html b/_includes/find-way.html index 2bf719e..cbe232c 100644 --- a/_includes/find-way.html +++ b/_includes/find-way.html @@ -24,7 +24,7 @@ - Distance + {{ site.findWayDistance }}
  • @@ -33,16 +33,17 @@
    • - + + {{ site.viewOnMap }}
    diff --git a/_includes/footer.html b/_includes/footer.html index 02d4ff7..33af981 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -13,7 +13,7 @@
    {{ block.title }}
    @@ -24,7 +24,7 @@