Permalink
Browse files

v.0.5.1

  • Loading branch information...
ozasadnyy committed Feb 20, 2015
1 parent 2615279 commit 554378b49b0524ff887b92f8bae06cc4947d4726
Showing with 828 additions and 719 deletions.
  1. +2 −2 .gitignore
  2. +6 −0 Gemfile
  3. +13 −30 README.md
  4. +1 −1 _config.yml
  5. +1 −1 _sass/partials/_global.scss
  6. +0 −7 _sass/vendor/_bootstrap-compass.scss
  7. +20 −0 _sass/vendor/_bootstrap-custom.scss
  8. +0 −17 _sass/vendor/_bootstrap-mincer.scss
  9. +0 −7 _sass/vendor/_bootstrap-sprockets.scss
  10. +0 −50 _sass/vendor/_bootstrap.scss
  11. +112 −112 _sass/vendor/_waves.scss
  12. +5 −0 _sass/vendor/bootstrap/_alerts.scss
  13. +11 −1 _sass/vendor/bootstrap/_badges.scss
  14. +0 −50 _sass/vendor/bootstrap/_bootstrap.scss
  15. +20 −17 _sass/vendor/bootstrap/_button-groups.scss
  16. +9 −6 _sass/vendor/bootstrap/_buttons.scss
  17. +27 −1 _sass/vendor/bootstrap/_carousel.scss
  18. +1 −0 _sass/vendor/bootstrap/_close.scss
  19. +1 −0 _sass/vendor/bootstrap/_code.scss
  20. +5 −2 _sass/vendor/bootstrap/_component-animations.scss
  21. +6 −7 _sass/vendor/bootstrap/_dropdowns.scss
  22. +81 −49 _sass/vendor/bootstrap/_forms.scss
  23. +69 −5 _sass/vendor/bootstrap/_glyphicons.scss
  24. +4 −4 _sass/vendor/bootstrap/_grid.scss
  25. +7 −5 _sass/vendor/bootstrap/_jumbotron.scss
  26. +2 −10 _sass/vendor/bootstrap/_list-group.scss
  27. +35 −30 _sass/vendor/bootstrap/_media.scss
  28. +4 −6 _sass/vendor/bootstrap/_modals.scss
  29. +37 −33 _sass/vendor/bootstrap/_navbar.scss
  30. +5 −3 _sass/vendor/bootstrap/_navs.scss
  31. +5 −3 _sass/vendor/bootstrap/_normalize.scss
  32. +2 −3 _sass/vendor/bootstrap/_pager.scss
  33. +1 −1 _sass/vendor/bootstrap/_pagination.scss
  34. +27 −5 _sass/vendor/bootstrap/_panels.scss
  35. +6 −4 _sass/vendor/bootstrap/_popovers.scss
  36. +102 −96 _sass/vendor/bootstrap/_print.scss
  37. +2 −20 _sass/vendor/bootstrap/_progress-bars.scss
  38. +2 −1 _sass/vendor/bootstrap/_responsive-embed.scss
  39. +4 −1 _sass/vendor/bootstrap/_responsive-utilities.scss
  40. +3 −3 _sass/vendor/bootstrap/_scaffolding.scss
  41. +14 −13 _sass/vendor/bootstrap/_tables.scss
  42. +28 −13 _sass/vendor/bootstrap/_theme.scss
  43. +2 −2 _sass/vendor/bootstrap/_thumbnails.scss
  44. +12 −4 _sass/vendor/bootstrap/_tooltip.scss
  45. +10 −16 _sass/vendor/bootstrap/_type.scss
  46. +3 −4 _sass/vendor/bootstrap/_utilities.scss
  47. +35 −27 _sass/vendor/bootstrap/_variables.scss
  48. +2 −0 _sass/vendor/bootstrap/mixins/_buttons.scss
  49. +5 −1 _sass/vendor/bootstrap/mixins/_forms.scss
  50. +2 −2 _sass/vendor/bootstrap/mixins/_grid.scss
  51. +2 −2 _sass/vendor/bootstrap/mixins/_hide-text.scss
  52. +0 −1 _sass/vendor/bootstrap/mixins/_image.scss
  53. +1 −1 _sass/vendor/bootstrap/mixins/_labels.scss
  54. +1 −1 _sass/vendor/bootstrap/mixins/_opacity.scss
  55. +1 −1 _sass/vendor/bootstrap/mixins/_progress-bar.scss
  56. +6 −3 _sass/vendor/bootstrap/mixins/_vendor-prefixes.scss
  57. +2 −2 css/main.css
  58. +4 −3 js/bootstrap.min.js
  59. +26 −17 js/default.js
  60. +1 −1 js/scripts.js
  61. +23 −1 js/scripts.min.js
  62. +7 −7 js/sources/jquery.sticky-kit.min.js
  63. +1 −1 js/sources/typed.min.js
  64. +2 −2 js/sources/waves.min.js
  65. +0 −1 js/sources/waves.min.js.map
View
@@ -1,5 +1,5 @@
### Idea ###
.idea
### General ###
*.lock
### Jekyll ###
_site/
View
@@ -0,0 +1,6 @@
source "http://rubygems.org"
gem 'github-pages'
gem 'compass'
gem 'sass-media_query_combiner'
gem 'autoprefixer-rails'
View
@@ -3,7 +3,7 @@
### About
Project Zeppelin allows you to setup awesome GDG DevFest site in 5 minutes.
Project is builded on top of [Jekyll](http://jekyllrb.com/) - simple, blog-aware, static site generator. Jekyll also happens to be the engine behind GitHub Pages, which means you can use Jekyll to host your website from GitHub’s servers for free. [Learn more about Jekyll](http://jekyllrb.com/).
Project is built on top of [Jekyll](http://jekyllrb.com/) - simple, blog-aware, static site generator. Jekyll also happens to be the engine behind GitHub Pages, which means you can use Jekyll to host your website from GitHub’s servers for free. [Learn more about Jekyll](http://jekyllrb.com/).
Template is brought by [GDG Lviv](http://lviv.gdg.org.ua/) team.
@@ -30,11 +30,16 @@ Or watch project presentation from [GDG[x] Townhall meeting](http://www.youtube.
## Local development
Check if you have [all requirments for local environment](http://jekyllrb.com/docs/installation/), install [Jekyll server](http://jekyllrb.com/docs/quickstart/) gem.
Install GitHub pages
Check if you have [all requirements for local environment](http://jekyllrb.com/docs/installation/).
To install all development dependencies install [Bundler](http://bundler.io/).
```bash
gem install github-pages
gem install bundler
```
and run next command from root folder:
```bash
bundle install
```
Run this command from project root folder:
```bash
@@ -45,22 +50,7 @@ Site will be available at http://127.0.0.1:4000/zeppelin/ or http://localhost:40
**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.
### Sass(Compass) support
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:
```bash
gem install compass --pre
```
Then for combining media queries you can use [Sass::MediaQueryCombiner](https://github.com/aaronjensen/sass-media_query_combiner) plugin. Install with command
```bash
gem install sass-media_query_combiner
```
And for prefixing css3 properties use [Autoprefixer](https://github.com/ai/autoprefixer)
```bash
gem install autoprefixer-rails
```
**Note:** Also you need to install [Node.js](http://nodejs.org/download/)
**Note:** You need to install [Node.js](http://nodejs.org/download/)
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`.
**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)**
@@ -70,7 +60,7 @@ Learn more about Sass development from [documentation](https://github.com/gdg-x/
### Resource optimizations (optional)
You can optimize images and minify css and javascript automaticaly (for now only on Windows).
You can optimize images and minify css and javascript automatically (for now only on Windows).
But for Mac OS users available amazing tool - [imageoptim](https://imageoptim.com/). Thanks [@raphaelsavina](https://github.com/raphaelsavina) for link.
Optimize all images by running this script from `/automation/images/` folder:
```bash
@@ -87,13 +77,6 @@ Learn more about available optimization options from [documentation](https://git
### Documentation
Quick-start guide is not enough? Checkout [full documentation](https://github.com/gdg-x/zeppelin/wiki).
### TODO List
* Optimization scripts for mac and linux
### Known issues
* Scrolling on open navbar
### Used libraries
* [Bootstrap](https://github.com/twbs/bootstrap)
* [Animate.css](https://github.com/daneden/animate.css)
@@ -129,7 +112,7 @@ Going to use template? Go on! The only thing we ask - let us know at [*lviv@gdg.
* Design and web development: [Oleh Zasadnyy](https://github.com/ozasadnyy)
* Idea: [Vitaliy Zasadnyy](https://github.com/zasadnyy)
### Licence
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 :)
### License
Project is published under the [MIT license](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 :)
View
@@ -215,7 +215,7 @@ findWayTransit: "TRANSIT"
findWayFindFlight: "Find Flight"
logisticsMapCenterCoordinates: "49.056728, 3.117289"
logisticsMapMobileCenterCoordinates: "48.335365, 23.711648"
logisticsMapAutoDirections: true
logisticsMapAutoDirections: false
# Logistics Direction Details Block
directionDetailsImage: "direction-details.jpg"
@@ -42,7 +42,7 @@ b, strong {
}
a {
@include linkColor($link-color);
&:hover {
&:hover, &:active, &:focus {
text-decoration: none;
}
}

This file was deleted.

Oops, something went wrong.
@@ -5,25 +5,45 @@
// Reset and dependencies
@import "bootstrap/normalize";
@import "bootstrap/print";
// @import "bootstrap/glyphicons";
// Core CSS
@import "bootstrap/scaffolding";
@import "bootstrap/type";
@import "bootstrap/code";
@import "bootstrap/grid";
// @import "bootstrap/tables";
@import "bootstrap/forms";
@import "bootstrap/buttons";
// Components
@import "bootstrap/component-animations";
// @import "bootstrap/dropdowns";
// @import "bootstrap/button-groups";
// @import "bootstrap/input-groups";
// @import "bootstrap/navs";
// @import "bootstrap/navbar";
// @import "bootstrap/breadcrumbs";
// @import "bootstrap/pagination";
// @import "bootstrap/pager";
// @import "bootstrap/labels";
// @import "bootstrap/badges";
@import "bootstrap/jumbotron";
@import "bootstrap/thumbnails";
// @import "bootstrap/alerts";
// @import "bootstrap/progress-bars";
@import "bootstrap/media";
// @import "bootstrap/list-group";
// @import "bootstrap/panels";
@import "bootstrap/responsive-embed";
// @import "bootstrap/wells";
@import "bootstrap/close";
// Components w/ JavaScript
@import "bootstrap/modals";
// @import "bootstrap/tooltip";
// @import "bootstrap/popovers";
// @import "bootstrap/carousel";
// Utility classes
@import "bootstrap/utilities";

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 554378b

Please sign in to comment.