From de74cc7b6926d3eb99449b3db5851f14991772ab Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 20:31:10 -0600 Subject: [PATCH 01/16] Add new docs and some info --- README.md | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index bb672e6..903b8f6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,37 @@ # jekyll-mdl -A Jekyll theme based in Google Material Design Lite library. +> A Jekyll theme based in Google Material Design Lite library. + +## Layout Configs +You can setup 4 types of layout + +- Fixed Nav + Simple Card Grid +- Drawer Nav + Simple Card Grid +- Fixed Nav + Highlight Post + Card Grid +- Drawer Nav + Highlight Post + Card Grid + +For use this in the [_config.yml](https://github.com/gdg-managua/jekyll-mdl/blob/master/_config.yml) select the type of layout, rebuild the website and voilà :smile: + +## Contributing +If you want to contribute to this project, please read the [CONTRIBUTING](https://github.com/gdg-managua/jekyll-mdl/blob/master/CONTRIBUTING.md) file and perform the following steps + + # Fork this repository + # Clone your fork + jekyll serve --watch + + git checkout -b feature_branch + # Implement your feature and tests + git add . && git commit + git push -u origin feature_branch + # Send a pull request for your feature branch + +## Team +[![Oscar Cortez](https://avatars3.githubusercontent.com/u/2553459?v=3&s=460)](http://github.com/oscarmcm) | [![Byron Corrales](https://avatars1.githubusercontent.com/u/99616?v=3&s=460)](https://github.com/byroncorrales) +---|--- +[Oscar Cortez](http://github.com/oscarmcm) | [Byron Corrales](https://github.com/byroncorrales) + +## License +Licensed under the Apache 2.0 license. + +See the [LICENSE](https://github.com/gdg-managua/jekyll-mdl/blob/master/LICENSE.md) file for more details. + +Copyright © 2015 [Google Developers Group Managua](http://www.gdgmanagua.org). From 2b0e40f13638a5559ca507907742647916bfb442 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 20:31:26 -0600 Subject: [PATCH 02/16] Add the layout config --- _config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_config.yml b/_config.yml index 319b318..59e58d5 100644 --- a/_config.yml +++ b/_config.yml @@ -11,7 +11,7 @@ twitter_username: jekyllrb github_username: jekyll # Layout settings -header_type: fixed -post_type: highlight +header_type: default # values [ drawer, default ] +post_type: default # values [ highlight, default ] # Build settings markdown: kramdown From c1c74599f64ecdc17cbfa5290a749e440047b401 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 20:31:52 -0600 Subject: [PATCH 03/16] Fix error with the dropdown menu --- _includes/header.html | 4 ++-- _includes/header_fixed.html | 5 ++--- _includes/highlight_post.html | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index e14f458..b74ede9 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -23,11 +23,11 @@ - -
    +
    • Some Action
    • Another Action
    • Disabled Action
      • diff --git a/_includes/header_fixed.html b/_includes/header_fixed.html index e344419..e9b093e 100644 --- a/_includes/header_fixed.html +++ b/_includes/header_fixed.html @@ -12,12 +12,11 @@ id="fixed-header-drawer-exp" /> - -
        +
        • Some Action
        • Another Action
        • Disabled Action
          • diff --git a/_includes/highlight_post.html b/_includes/highlight_post.html index 9333b1c..b04acca 100644 --- a/_includes/highlight_post.html +++ b/_includes/highlight_post.html @@ -14,10 +14,10 @@ - -
            +
            • Lorem
            • Ipsum
            • Dolor
              • From ffdb6a4f72b6160c436437b0fdcef5922bd7a3d4 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 20:32:15 -0600 Subject: [PATCH 04/16] Add dropdown menu for share options --- index.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index e5c8ad2..351f26b 100644 --- a/index.html +++ b/index.html @@ -20,9 +20,14 @@ layout: default
              - +
                +
              • Facebook
                • +
              • Twitter
                • +
              • Google+
                • +
              {% endfor %} From 9353f0b8a7608c2b4269addd4f373b2d821b6986 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 20:35:34 -0600 Subject: [PATCH 05/16] fix with autors section --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 903b8f6..c7e3f32 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ If you want to contribute to this project, please read the [CONTRIBUTING](https: # Send a pull request for your feature branch ## Team -[![Oscar Cortez](https://avatars3.githubusercontent.com/u/2553459?v=3&s=460)](http://github.com/oscarmcm) | [![Byron Corrales](https://avatars1.githubusercontent.com/u/99616?v=3&s=460)](https://github.com/byroncorrales) +[![Oscar Cortez](https://avatars.githubusercontent.com/u/2553459?v=3&s=100)](http://github.com/oscarmcm) | [![Byron Corrales](https://avatars.githubusercontent.com/u/99616?v=3&s=100)](https://github.com/byroncorrales) ---|--- [Oscar Cortez](http://github.com/oscarmcm) | [Byron Corrales](https://github.com/byroncorrales) From 5ecc1216d1d50bf8ab6edcb855e3ca5ef2a72203 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 21:55:02 -0600 Subject: [PATCH 06/16] Make this dinamic --- _includes/highlight_post.html | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/_includes/highlight_post.html b/_includes/highlight_post.html index b04acca..2a9f04f 100644 --- a/_includes/highlight_post.html +++ b/_includes/highlight_post.html @@ -1,16 +1,17 @@ +{% assign post = site.posts.first %}
              -
              +
              play_circle_filled
              -

              Features

              - Dolore ex deserunt aute fugiat aute nulla ea sunt aliqua nisi cupidatat eu. Nostrud in laboris labore nisi amet do dolor eu fugiat consectetur elit cillum esse. +

              {{ post.title }}

              + {{ post.excerpt }}
              - Read our features + Read More
              @@ -18,9 +19,9 @@ more_vert
                -
              • Lorem
                • -
              • Ipsum
                • -
              • Dolor
                • +
              • Facebook
                • +
              • Twitter
                • +
              • Google+
              From 7a52bc51593b955354b58b131a7b1a94983a7505 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 21:56:21 -0600 Subject: [PATCH 07/16] add validation for the layout type --- index.html | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/index.html b/index.html index 351f26b..b03478c 100644 --- a/index.html +++ b/index.html @@ -2,6 +2,41 @@ layout: default --- +{% if site.post_type == 'highlight' %} + +
              + {% for post in site.posts offset:1 %} +
              +
              +

              {{ post.title }}

              +
              +
              + {{ post.excerpt }} +
              + +
              + + {{ post.date | date: "%b %-d, %Y" }} + +
              +
              + +
                +
              • Facebook
                • +
              • Twitter
                • +
              • Google+
                • +
              +
              +
              + {% endfor %} +
              + +{% else %} +
              {% for post in site.posts %}
              @@ -32,3 +67,5 @@ layout: default
              {% endfor %}
              + +{% endif %} From bb341c6300fc3dc4b86ef999cf6ea9e877f42f20 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 22:05:07 -0600 Subject: [PATCH 08/16] create CHANGELOG.md file --- CHANGELOG.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..6ec179f --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,17 @@ +# (July 17, 2015) +* add validation for the layout type +* Make this dinamic +* fix with autors section +* Add dropdown menu for share options +* Fix error with the dropdown menu +* Add the layout config +* Add new docs and some info +* Create highlight post layout +* New Header Type +* fixed footer layout +* improve new layout for post list +* adding MDL html structure +* add material desing lite library +* Setup the jekyll project +* Initial commit + From c25984c3dad631aaa3a4a6162c96508252d64f1c Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 22:05:49 -0600 Subject: [PATCH 09/16] Create the History file --- History.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 History.md diff --git a/History.md b/History.md new file mode 100644 index 0000000..fa257f7 --- /dev/null +++ b/History.md @@ -0,0 +1,19 @@ + +0.0.1 / 2015-07-17 +================== + + * add validation for the layout type + * Make this dinamic + * fix with autors section + * Add dropdown menu for share options + * Fix error with the dropdown menu + * Add the layout config + * Add new docs and some info + * Create highlight post layout + * New Header Type + * fixed footer layout + * improve new layout for post list + * adding MDL html structure + * add material desing lite library + * Setup the jekyll project + * Initial commit From a40227fd67ad055448b648efc110ce11567b8df9 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 22:38:17 -0600 Subject: [PATCH 10/16] create the post layout --- _layouts/post.html | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/_layouts/post.html b/_layouts/post.html index a2b4e52..d4659cc 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,15 +1,18 @@ --- layout: default --- -
              - -
              -

              {{ page.title }}

              -

              {{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %}

              -
              - -
              - {{ content }} -
              - -
              +
              +
              +
              +
              +
              +
              + {{ page.date | date: "%b %-d, %Y" }}{% if page.author %} • {{ page.author }}{% endif %}{% if page.meta %} • {{ page.meta }}{% endif %} +
              +

              {{ page.title }}

              +
              +

              {{ content }}

              +
              +
              +
              +
              From eb281d6a59ec30eaffa8b3e9820b5ebe78f37717 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Fri, 17 Jul 2015 22:38:50 -0600 Subject: [PATCH 11/16] some styles for the post layout --- _sass/_post.scss | 29 +++++++++++++++++++++++++++++ css/main.scss | 3 ++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 _sass/_post.scss diff --git a/_sass/_post.scss b/_sass/_post.scss new file mode 100644 index 0000000..b4ff31f --- /dev/null +++ b/_sass/_post.scss @@ -0,0 +1,29 @@ +.post-ribbon { + width: 100%; + height: 40vh; + background-color: #3F51B5; + flex-shrink: 0; +} + +.post-main { + margin-top: -35vh; + flex-shrink: 0; + + .post-container { + max-width: 1600px; + width: calc(100% - 16px); + margin: 0 auto; + } + + .post-section { + border-radius: 2px; + padding: 80px 56px; + margin-bottom: 80px; + + h3 { + margin-top: 48px; + } + } + + +} diff --git a/css/main.scss b/css/main.scss index beee4e3..f576892 100755 --- a/css/main.scss +++ b/css/main.scss @@ -48,5 +48,6 @@ $on-laptop: 800px; @import "base", "layout", - "syntax-highlighting" + "syntax-highlighting", + "post" ; From 157c7353f42d61eeb048831f27469a89dddf5a0c Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Sat, 18 Jul 2015 21:40:13 -0600 Subject: [PATCH 12/16] Create CONTRIBUTING.md file for guides --- CONTRIBUTING.md | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..95cc9b9 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,76 @@ +# Contributing to jekyll-mdl + +:+1::tada: First off, thanks for taking the time to contribute! :tada::+1: + +The following is a set of guidelines for contributing to jekyll-mdl. +These are just guidelines, not rules, use your best judgment and feel free to +propose changes to this document in a pull request. + +## Submitting Issues + +* You can create an issue [here](https://github.com/gdg-managua/jekyll-mdl/issues/new), + and include as many details as possible with your report. +* Include the version of Jekyll you are using, the OS and the browser version and name. +* Include screenshots and animated GIFs whenever possible; they are immensely + helpful. +* Include the behavior you expected and other places you've seen that behavior + such as Emacs, vi, Xcode, etc. +* Check the web console for errors to include. If you can reproduce the error, use this approach to get the + full stack trace and include it in the issue. +* Perform a [cursory search](https://github.com/gdg-managua/jekyll-mdl/issues?utf8=%E2%9C%93&q=is%3Aissue+is%3Aopen+) + to see if a similar issue has already been submitted. +* Please setup a [profile picture](https://help.github.com/articles/how-do-i-set-up-my-profile-picture) + to make yourself recognizable and so we can all get to know each other better. + +## Pull Requests + +* Include screenshots and animated GIFs in your pull request whenever possible. +* Follow the [Material Design](https://www.google.com/design/spec/material-design/introduction.html) styleguides. +* End files with a newline. +* Please open an issue and reference this with your pull request +* See the [pull request guide](#pull-request-and-issue-styleguide) + +## Git Commit Messages + +* Use the present tense ("Add feature" not "Added feature") +* Use the imperative mood ("Move cursor to..." not "Moves cursor to...") +* Limit the first line to 72 characters or less +* Reference issues and pull requests liberally +* Consider starting the commit message with an applicable emoji: + * :art: `:art:` when improving the format/structure of the code + * :racehorse: `:racehorse:` when improving performance + * :non-potable_water: `:non-potable_water:` when plugging memory leaks + * :memo: `:memo:` when writing docs + * :penguin: `:penguin:` when fixing something on Linux + * :apple: `:apple:` when fixing something on Mac OS + * :checkered_flag: `:checkered_flag:` when fixing something on Windows + * :bug: `:bug:` when fixing a bug + * :fire: `:fire:` when removing code or files + * :white_check_mark: `:white_check_mark:` when adding tests + * :lock: `:lock:` when dealing with security + * :arrow_up: `:arrow_up:` when upgrading dependencies + * :arrow_down: `:arrow_down:` when downgrading dependencies + * :shirt: `:shirt:` when removing linter warnings + +## Pull request and Issue Styleguide + +``` +### DESCRIPTION +The jekyll-mdl exploded my browser, some performance errors appear. + +### Trace +Here is the stack trace. + +### STEPS +1. Make a bomb. +2. Activate the bomb. +3. Place the bomb near of your browser. +4. RUN!. +5. The browser exploded. + +### EXPECTED +The jekyll-mdl dont exploded my browser. + +### REALITY +The jekyll-mdl exploded my browser. +``` From 0e5a0ae6ef003a0797b46e92cd4c5e38b3c94f12 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Sat, 18 Jul 2015 23:19:58 -0600 Subject: [PATCH 13/16] :docs: Add configs for the post layout --- README.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c7e3f32..e60ac5c 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,25 @@ # jekyll-mdl > A Jekyll theme based in Google Material Design Lite library. +## Post Configs + +All the post, require an image and maybe an author, the image are used in the cards and the autor used for the footer in the cards. For use the images and author, just add a new key in the post config, something like this: + + --- + layout: post + title: "Welcome to jekyll-mdl" + date: 2015-07-11 11:34:20 + categories: jekyll + image: http://www.wchs4pets.org/wp-content/uploads/2015/03/cat_1-jpg.jpg + author: Google Developers Group Managua + --- + ## Layout Configs You can setup 4 types of layout - Fixed Nav + Simple Card Grid -- Drawer Nav + Simple Card Grid - Fixed Nav + Highlight Post + Card Grid +- Drawer Nav + Simple Card Grid - Drawer Nav + Highlight Post + Card Grid For use this in the [_config.yml](https://github.com/gdg-managua/jekyll-mdl/blob/master/_config.yml) select the type of layout, rebuild the website and voilà :smile: From 1ef514ff87772eefe230cb27175e92206ad10814 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Sat, 18 Jul 2015 23:20:25 -0600 Subject: [PATCH 14/16] remove unused style --- _sass/_layout.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/_sass/_layout.scss b/_sass/_layout.scss index b43d45e..ac0e3d2 100644 --- a/_sass/_layout.scss +++ b/_sass/_layout.scss @@ -53,10 +53,6 @@ -ms-flex-pack: center; justify-content: center; min-height: 200px; - - .material-icons { - font-size: 3rem; - } } button { From 89ee9009474257da8592bbc7b1d220817030f4db Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Sat, 18 Jul 2015 23:21:16 -0600 Subject: [PATCH 15/16] Add validation for use images in the post --- _includes/highlight_post.html | 4 +--- index.html | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/_includes/highlight_post.html b/_includes/highlight_post.html index 2a9f04f..9728130 100644 --- a/_includes/highlight_post.html +++ b/_includes/highlight_post.html @@ -1,9 +1,7 @@ {% assign post = site.posts.first %}
              -
              - play_circle_filled -
              +
              diff --git a/index.html b/index.html index b03478c..9577bb4 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ layout: default
              {% for post in site.posts offset:1 %}
              -
              +

              {{ post.title }}

              @@ -40,7 +40,7 @@ layout: default
              {% for post in site.posts %}
              -
              +

              {{ post.title }}

              From 8979ac88104c845ff75870603251bbc3d486d32f Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Sat, 18 Jul 2015 23:40:25 -0600 Subject: [PATCH 16/16] Add post data to the cards --- index.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/index.html b/index.html index 9577bb4..0e104e2 100644 --- a/index.html +++ b/index.html @@ -20,6 +20,16 @@ layout: default {{ post.date | date: "%b %-d, %Y" }} + + {% if post.author %} + + {{ post.author }} + + {% endif %} + + + {% for cat in post.categories %}{{ cat }}, {% endfor %} +