Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit ecf83a0

Browse files
ozasadnyyozasadnyy
committed
Merge branch 'develop' into gh-pages
Conflicts: _sass/partials/_helper.scss css/main.min.css
2 parents 29c65ae + 4ae5844 commit ecf83a0

31 files changed

+196
-187
lines changed

‎README.md

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,22 @@ Or watch project presentation from [GDG[x] Townhall meeting](http://www.youtube.
3030

3131
## Local development
3232

33-
Check if you have [all requirments for local environment](http://jekyllrb.com/docs/installation/), install [Jekyll server](http://jekyllrb.com/docs/quickstart/) gem and run this command from project root folder:
33+
Check if you have [all requirments for local environment](http://jekyllrb.com/docs/installation/), install [Jekyll server](http://jekyllrb.com/docs/quickstart/) gem.
34+
Install GitHub pages
35+
```bash
36+
gem install github-pages
37+
```
3438

39+
Run this command from project root folder:
3540
```bash
3641
jekyll serve -w
3742
```
38-
Site will be available at http://127.0.0.1:4000/zeppelin/
43+
Site will be available at http://127.0.0.1:4000/zeppelin/ or http://localhost:4000/zeppelin/ (on Windows)
3944

4045
**NOTE:** in this mode all changes to html and data files will be automatically regenerated, but after changing ```_config.yml``` you have to restart server.
4146

42-
### Sass support
43-
Install Sass. Ruby uses Gems to manage its various packages of code like Sass. In your open terminal window type:
44-
```bash
45-
gem install sass
46-
```
47-
48-
Also you need to install the latest version of [Compass](http://compass-style.org/) with command
47+
### Sass(Compass) support
48+
Install the latest version of [Compass](http://compass-style.org/). Ruby uses Gems to manage its various packages of code like Sass. In your open terminal window type:
4949
```bash
5050
gem install compass --pre
5151
```
@@ -60,17 +60,18 @@ And for prefixing css3 properties use [Autoprefixer](https://github.com/ai/autop
6060
gem install autoprefixer-rails
6161
```
6262

63-
To watch changes in `.sass` files and compile it to the `.css` on a fly, run this command from `\_sass\` folder
64-
```bash
65-
compass watch -c config.rb -e production
66-
```
63+
**Note:** Also you need to install [Node.js](http://nodejs.org/download/)
64+
65+
To watch changes of `.sass` files and compile it to the `.css` on a fly change property `safe: true` to `safe: false` in `_config.yml`.
66+
**Note: It works only on local machine, because GitHub runs Jekyll in `--save` [mode](https://help.github.com/articles/using-jekyll-with-pages/#configuration-overrides)**
6767

6868
Learn more about Sass development from [documentation](https://github.com/gdg-x/zeppelin/wiki/Sass-development).
6969

7070

7171
### Resource optimizations (optional)
7272

7373
You can optimize images and minify css and javascript automaticaly (for now only on Windows).
74+
But for Mac OS users available amazing tool - [imageoptim](https://imageoptim.com/). Thanks [@raphaelsavina](https://github.com/raphaelsavina) for link.
7475
Optimize all images by running this script from `/automation/images/` folder:
7576
```bash
7677
all_image_optimization.bat -d -jtran -pout -pquant -optip -gsicle -svgo
@@ -117,11 +118,26 @@ Going to use template? Go on! The only thing we ask - let us know at [*lviv@gdg.
117118
* [Android DevFest Space Coast](http://gdg-space-coast.github.io/zeppelin/)
118119
* [DevFest in Baroda](devfest.gdgbaroda.com)
119120
* [GDG Hi Pic (France)](http://maximemularz.github.io/zeppelin/)
120-
* [GDG Space Coast DevFest](http://gdg-space-coast.github.io/zeppelin/)
121+
* [GDG DevFest Córdoba 2014](http://gdgcordoba.github.io/zeppelin/)
122+
* [GDG DevFest Düsseldorf 2014](http://www.gdg-dus.de/DevFest2014/)
123+
* [GDG Dublin DevFest 2014](http://gdg-dublin.appspot.com/)
124+
* [GDG Makerere DevFest 2014](http://gdgmakerere.github.io/)
125+
* [GDG Busitema DevFest 2014](http://gdgbusitema.github.io/)
126+
* [DevFest Vienna 2014](http://www.devfest.at/)
127+
* [Android Wear DevFest](http://devfest.gdgnorthjersey.com/wear2014/)
128+
* [GDG SLAU DevFest 2014](http://gdgslau.github.io/)
129+
* [GDG Korea DevFair 2014](http://devfair2014.gdg.kr/)
130+
* [Lima DevFest](http://limadevfest.com/)
131+
* [GDG DevFest Kota Kinabalu 2014](http://devfest.gdgkk.info/)
132+
* [GDG DevFest Belgium](http://gdg-brussels.org/DevFest2014/)
133+
* [DevFest Praha 2014](http://devfest.cz/)
134+
* [GDG DevFest Kosice](http://devfest.sk/)
135+
* [DevFest Birgunj](gdgbirgunj.github.io/DevFest2014/)
136+
* [DevFest Lima 2014](http://limadevfest.com/)
121137

122138
### Contributors
123-
* Design and markup: [Oleh Zasadnyy](https://github.com/ozasadnyy)
124-
* Idea and Jekyll integration: [Vitaliy Zasadnyy](https://github.com/zasadnyy)
139+
* Design and web development: [Oleh Zasadnyy](https://github.com/ozasadnyy)
140+
* Idea: [Vitaliy Zasadnyy](https://github.com/zasadnyy)
125141

126142
### Licence
127143
Project is published under the [MIT licence](https://github.com/gdg-x/zeppelin/blob/master/LICENSE.txt). Feel free to clone and modify repo as you want, but don't forget to add reference to authors :)

‎_config.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1+
# Plugins
2+
gems:
3+
- jekyll-sitemap
4+
safe: false
5+
16
# Build Settings
27
markdown: kramdown
38
permalink: pretty
4-
exclude: ['/automation/', 'README.md', 'LICENCE.txt', 'CNAME']
9+
exclude: ['/automation/', 'README.md', 'LICENSE.txt', 'CNAME']
510

611

712
# Site Settings
@@ -62,9 +67,9 @@ heroButtons:
6267
# About Block
6368
aboutTitle: "About GDG DevFest"
6469
aboutBlock:
65-
- {title: "Conference", image: "conference.jpg", text: "The biggest Google related event in the country carefully crafted for you by GDG community! Awesome speakers and lot's of fun!" }
70+
- {title: "Conference", image: "conference.jpg", text: "The biggest Google related event in the country carefully crafted for you by GDG community! Awesome speakers and lots of fun!" }
6671
- {title: "Workshops", image: "workshop.jpg", text: "Full-day of workshops, hands-on experience, hacking and debugging. Come and tame your favourite technology!" }
67-
- {title: "Hackathon", image: "hackathon.jpg", text: "Full-day free-style hackaton! Want some real teambuilding on friday? Grab your team and join our hackathon!" }
72+
- {title: "Hackathon", image: "hackathon.jpg", text: "Full-day freestyle hackathon! Want some real team building on friday? Grab your team and join our hackathon!" }
6873

6974
# Statistic Block
7075
statisticBlockImage: "statistic.jpg"
@@ -112,7 +117,7 @@ venueFeatures: ["3 huge cinema screens", "Doulby Digital Surround EX audio syste
112117
tweetsFeedImage: "twitter-feed.jpg"
113118
tweetsFeedTitle: "What's Up?"
114119
twitterHashTag: "devfest"
115-
twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=900"
120+
twitterFeed: "http://lviv.gdg.org.ua/tweetledee/favoritesjson.php?c=10&cache_interval=8000"
116121

117122
# Partners Block
118123
organizersTitle: "Organizers"
@@ -218,7 +223,7 @@ directionDetailsCards:
218223
- {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 <a href="http://lwo.aero/en/transport">airport website</a>.'}
219224
- {title: "Public Transit", information: 'Google Transit is available in Lviv. So you can find your way in Google Maps. Moreover, you can download any of the offline public transit apps available for Lviv.'}
220225
- {title: "Hotels", information: 'Lviv has lots of great hotels and hostels. More information will be available later.'}
221-
directionDetailsWideCards:
226+
directionDetailsWideCards:
222227
-
223228
title: "Questions?"
224229
subCards:
@@ -229,7 +234,7 @@ directionDetailsWideCards:
229234
- {link: "https://plus.google.com/b/102444623953913144164", text: "The Hotel Rex"}
230235
- {link: "https://plus.google.com/b/102444623953913144164", text: "Westin Market Street"}
231236
- {link: "https://plus.google.com/b/102444623953913144164", text: "Hotel Adagio"}
232-
-
237+
-
233238
title: "Registration"
234239
links:
235240
- {link: "https://plus.google.com/b/102444623953913144164", text: "InterContinental"}
@@ -282,4 +287,4 @@ hackathonEndTime: "2014-10-25T00:00"
282287
viewOnMap: "View on Google Maps"
283288
hackathonPlaceCoordinates: "49.840999, 24.031144"
284289
hackathonMapCenterCoordinates: "49.840696, 24.028754"
285-
hackathonMapMobileCenterCoordinates: "49.841639, 24.031182"
290+
hackathonMapMobileCenterCoordinates: "49.841639, 24.031182"

‎_data/sessions.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,26 @@
1616
speakers: [3, 6]
1717
language: en
1818
complexity: "Intermediate"
19+
video: "//www.youtube.com/embed/v3SCiUqI1yQ"
1920
-
2021
id: 002
2122
title: "Building Cloud-powered wearable Apps"
22-
description: "Android wear extends the Android platform to a new generation of wearable devices. The user experience is designed specifically for wearables. In this session you’ll see how to use the Android Wear SDK to build a connected cloud-powered application. Using Android Studio and it’s cloud extensions, you’ll see how to build an app that ‘listens’ for changes in stock prices, and notifies a wearable device. You’ll also see how to use voice controls on the device to trigger interactions with the app, such as buying or selling the stock after a notification. Call to action: Get the SDK and start building apps today!"
23+
description: "I will speak and show how to:<br>- Respond to touch events in your views with touch feedback animations.<br>- Hide and show views with reveal effect animations.<br>- Switch between activities with custom activity transition animations.<br>- Create more natural animations with curved motion.<br>- Animate changes in one or more view properties with view state change animations.<br>- Create icon morphing transition"
2324
subtype: presentation
2425
speakers: [4, 5]
2526
language: en
26-
complexity: "Beginner"
27+
complexity: "Intermediate"
28+
presentation: "https://speakerdeck.com/gdglviv/dmytro-danylyk-android-l-animation"
29+
video: "//www.youtube.com/embed/v3SCiUqI1yQ"
2730
-
2831
id: 003
29-
title: "The world is your playground - go global with Google"
32+
title: "Android L Animation"
3033
description: "More than ever before, developing for global audience is a necessity than a luxury in today's world. Are you ready ... where to start? what does it entail? how do I do it? how to promote in local markets? This talk will address above questions for android, chrome and web developers. In our journey of the where, what and how, we will take an in-depth look at various internationalization and localization tools & strategies available to you."
3134
subtype: presentation
3235
speakers: [4]
3336
language: en
34-
complexity: "Expert"
37+
complexity: "Intermediate"
38+
presentation: "https://speakerdeck.com/gdglviv/dmytro-danylyk-android-l-animation"
3539
-
3640
id: 004
3741
title: "Polymer: Interacting with Google Services using nothing but HTML"
@@ -40,6 +44,8 @@
4044
speakers: [6]
4145
language: uk
4246
complexity: "Beginner"
47+
presentation: "https://speakerdeck.com/gdglviv/mateusz-herych-guava-beyond-collections"
48+
video: "//www.youtube.com/embed/v3SCiUqI1yQ"
4349
-
4450
id: 005
4551
title: "Test: Interacting with Google Services using nothing but HTML"
@@ -48,3 +54,5 @@
4854
speakers: [7]
4955
language: en
5056
complexity: "Expert"
57+
presentation: "https://speakerdeck.com/gdglviv/michal-tajchert-wearables-views"
58+
video: "//www.youtube.com/embed/v3SCiUqI1yQ"

‎_includes/head.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<meta name="msapplication-TileImage" content="{{ "/img/favicons/mstile-144x144.png" | prepend: site.baseurl }}">
4242
<meta name="msapplication-config" content="{{ "/img/favicons/browserconfig.xml" | prepend: site.baseurl }}">
4343

44-
<link href="{{ "/css/main.min.css" | prepend: site.baseurl }}" rel="stylesheet">
44+
<link href="{{ "/css/main.css" | prepend: site.baseurl }}" rel="stylesheet">
4545

4646
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
4747
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->

‎_includes/navigation.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<header id="top-header" class="top-header">
22
<div class="overlay white-solid"></div>
3-
<svg id="menu-trigger" class="menu-trigger icon icon-menu visible-xs" viewBox="0 0 32 32" data-effect="st-effect">
3+
<svg id="menu-trigger" class="menu-trigger icon icon-menu visible-xs" viewBox="0 0 32 32">
44
<use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-menu"></use>
55
</svg>
66
<a href="{{ site.baseurl }}/" id="logo-header" class="logo-header">

‎_includes/schedule.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h5 class="slot-detail track-header-title"></h5>
3737
{% if slot != 404 %}
3838
{% for session in site.data.sessions %}
3939
{% if slot == session.id and session.service == null %}
40-
<div class="slot col-md-{{ slotColWidth }} col-xs-12 flexbox-item-height" data-slot-detail="{{ day.tracks[slotIndex].title }}" data-toggle="modal" data-target="#sessionDetail-{{ session.id }}">
40+
<div id="session-{{ session.id }}" class="slot col-md-{{ slotColWidth }} col-xs-12 flexbox-item-height" data-slot-detail="{{ day.tracks[slotIndex].title }}" data-toggle="modal" data-target="#sessionDetail-{{ session.id }}">
4141
<div class="color-line" style="background: {{ day.tracks[slotIndex].color }}"></div>
4242
<div class="slot-content" style="border-right-color: {{ day.tracks[slotIndex].color }}">
4343
<h5 class="slot-title" itemprop="name">{{ session.title }}</h5>

‎_includes/sessions-modals.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,15 @@
1414
<h4>{{ session.title }}</h4>
1515
<span class="theme-metadata"><span class="caption">Language: </span>{{ session.language }}</span>
1616
<span class="theme-metadata"><span class="caption">Complexity: </span>{{ session.complexity }}</span>
17+
{% if session.video %}
18+
<div class="theme-video embed-responsive embed-responsive-16by9">
19+
<iframe class="embed-responsive-item" src="{{ session.video }}"></iframe>
20+
</div>
21+
{% endif %}
1722
<p class="theme-description">{{ session.description }}</p>
23+
{% if session.presentation %}
24+
<a class="theme-presentation" href="{{ session.presentation }}" title="Presentation" target="_blank">View presentation</a>
25+
{% endif %}
1826
<hr>
1927
<div class="people-details">
2028
{% for speaker in site.data.speakers %}

‎_includes/speakers-modals.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,15 @@
1919
<h4>{{ session.title }}</h4>
2020
<span class="theme-metadata"><span class="caption">Language: </span>{{ session.language }}</span>
2121
<span class="theme-metadata"><span class="caption">Complexity: </span>{{ session.complexity }}</span>
22+
{% if session.video %}
23+
<div class="theme-video embed-responsive embed-responsive-16by9">
24+
<iframe class="embed-responsive-item" src="{{ session.video }}"></iframe>
25+
</div>
26+
{% endif %}
2227
<p class="theme-description">{{ session.description }}</p>
28+
{% if session.presentation %}
29+
<a class="theme-presentation" href="{{ session.presentation }}" title="Presentation" target="_blank">View presentation</a>
30+
{% endif %}
2331
{% endif %}
2432
{% endfor %}
2533
{% endfor %}

‎_layouts/compress.html

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
---
2+
#
3+
# Jekyll layout that compresses HTML
4+
# v0.3.1
5+
# https://github.com/penibelst/jekyll-compress-html
6+
# © 2014 Anatol Broder (http://penibelst.de/)
7+
# MIT License
8+
#
9+
---
10+
11+
{% assign _pres = content | split: '<pre' %}{% for _pre1 in _pres %}{% assign _pre2 = _pre1 | split: '</pre>' %}{% if _pre2.size == 2 %}<pre{{ _pre2.first }}</pre>{% endif %}{% assign _second = _pre2.last | split: ' ' | join: ' ' %}{% for _element in site.compress_html.clippings %}{% assign _edges = ' <element,<element; </element>,</element>;</element> ,</element>' | replace: 'element', _element | split: ';' %}{% for _edge in _edges %}{% assign _replacement = _edge | split: ',' %}{% assign _second = _second | replace: _replacement[0], _replacement[1] %}{% endfor %}{% endfor %}{% for _element in site.compress_html.endings %}{% assign _closing = '</element>' | replace: 'element', _element %}{% assign _second = _second | remove: _closing %}{% endfor %}{{ _second }}{% endfor %}

‎_layouts/default.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
---
2+
layout: compress
3+
---
4+
15
<!DOCTYPE html>
26
<html lang="en">
37

‎_plugins/generator_scss.rb

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#
2+
# Jekyll Generator for SCSS
3+
#
4+
# (File paths in this description relative to jekyll project root directory)
5+
# Place this file in ./_plugins
6+
# Place .scss files in ./_scss
7+
# Compiles .scss files in ./_scss to .css files in whatever directory you indicated in your config
8+
# Config file placed in ./_sass/config.rb
9+
#
10+
11+
require 'sass'
12+
require 'pathname'
13+
require 'compass'
14+
require 'compass/exec'
15+
16+
module Jekyll
17+
18+
class CompassGenerator < Generator
19+
safe true
20+
21+
def generate(site)
22+
Dir.chdir File.expand_path('../_sass', File.dirname(__FILE__)) do
23+
Compass::Exec::SubCommandUI.new(%w(compile)).run!
24+
end
25+
end
26+
27+
end
28+
29+
end

‎_sass/config.rb

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,18 @@
1010
end
1111

1212
http_path = "/"
13-
css_dir = "../css"
1413
sass_dir = "./"
14+
css_dir = "../css"
1515
images_dir = "../img"
1616
javascripts_dir = "../js"
1717

18-
if environment == :development
19-
line_comments = true
20-
relative_assets = true
21-
output_style = :expanded
22-
end
23-
24-
if environment == :production
25-
line_comments = false
26-
relative_assets = true
27-
output_style = :compressed
28-
29-
require 'fileutils'
30-
on_stylesheet_saved do |file|
31-
if File.exists?(file)
32-
filename = File.basename(file, File.extname(file))
33-
File.rename(file, "../css" + "/" + filename + ".min" + File.extname(file))
34-
end
35-
end
36-
end
18+
line_comments = false
19+
relative_assets = true
20+
output_style = :compressed
3721

3822
# Remove multiline comments - monkey patch
3923
class Sass::Tree::Visitors::Perform < Sass::Tree::Visitors::Base
40-
# Removes all comments completely
24+
# # Removes all comments completely
4125
def visit_comment(node)
4226
return []
4327
end

‎_sass/partials/_helper.scss

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
background-position: center center !important;
2525
background-size: cover !important;
2626
&.parallax {
27+
//background-attachment: fixed;
2728
box-shadow: inset 0 0 12px 3px rgba(0, 0, 0, .75);
2829
}
2930
&.standart-height {
@@ -127,7 +128,4 @@
127128
}
128129
.reset-padding {
129130
padding: 0;
130-
}
131-
.disable-scrolling {
132-
overflow: hidden;
133131
}

‎_sass/partials/_modal.scss

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ $modal-highlight-color: #212121;
2828
}
2929
.modal-dialog {
3030
@media (min-width: 768px) {
31-
width: 740px;
32-
margin-top: 100px;
31+
width: 740px;
32+
margin-top: 100px;
3333
}
3434
}
3535
.modal-body {
@@ -44,8 +44,14 @@ $modal-highlight-color: #212121;
4444
color: $modal-highlight-color;
4545
}
4646
}
47+
.theme-video {
48+
margin: 20px 0;
49+
}
4750
.theme-description {
48-
margin: 12px 0 37px;
51+
margin: 12px 0 20px;
52+
}
53+
.theme-presentation {
54+
font-size: 15px;
4955
}
5056
.people-details {
5157
.row {

0 commit comments

Comments
 (0)