From 2d264bfe7485688e7eb75972f45a96ffdf332b33 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Wed, 2 Sep 2015 21:47:05 -0600 Subject: [PATCH 1/2] Highlight multiple post Now the highlight post is based on the post data, so now we have more than only one highlight post. If you want make a highlighted post add highlight: true in your post data. --- README.md | 3 +- _includes/highlight_post.html | 25 --------------- ...015-10-11-google-developers-group.markdown | 1 + index.html | 31 +++++++++++++++++-- 4 files changed, 32 insertions(+), 28 deletions(-) delete mode 100644 _includes/highlight_post.html diff --git a/README.md b/README.md index d244031..8c139b5 100644 --- a/README.md +++ b/README.md @@ -23,13 +23,14 @@ Now add this in the _includes/head.html file, under the main css and enjoy your ## Post Options -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: +All the post, require an image and maybe an author and declare if the post is highlighted or not, the image are used in the cards and the autor used for the footer in the cards, the highlighted post is used for make this 12 cols and not a card, if you want to use the custom images and set the author and the highlight post, 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 + highlight: true image: http://www.wchs4pets.org/wp-content/uploads/2015/03/cat_1-jpg.jpg author: Google Developers Group Managua --- diff --git a/_includes/highlight_post.html b/_includes/highlight_post.html deleted file mode 100644 index 2ee8622..0000000 --- a/_includes/highlight_post.html +++ /dev/null @@ -1,25 +0,0 @@ -{% assign post = site.posts.first %} -
- -
- -
-
-

{{ post.title }}

- {{ post.excerpt }} -
-
- Read More -
-
- - - - -
diff --git a/_posts/2015-10-11-google-developers-group.markdown b/_posts/2015-10-11-google-developers-group.markdown index ec2c5e6..451946a 100644 --- a/_posts/2015-10-11-google-developers-group.markdown +++ b/_posts/2015-10-11-google-developers-group.markdown @@ -3,6 +3,7 @@ layout: post title: "Google Developers Group" date: 2015-10-11 04:34:20 categories: GDG +highlight: true image: http://4.bp.blogspot.com/-IOD6VutWGlA/UW8Jq05M0DI/AAAAAAAAAeA/OVckWFybKqg/s1600/DSC01317.JPG --- Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Donec odio. Quisque volutpat mattis eros. Nullam malesuada erat ut turpis. Suspendisse urna nibh, viverra non, semper suscipit, posuere a, pede.Donec nec justo eget felis facilisis fermentum. Aliquam porttitor mauris sit amet orci. diff --git a/index.html b/index.html index 2ffc2c7..d1965e9 100644 --- a/index.html +++ b/index.html @@ -5,9 +5,35 @@ layout: default
{% if site.post_type == 'highlight' %} - {% include highlight_post.html %} + {% for post in site.posts %} + {% if post.highlight %} - {% for post in site.posts offset:1 %} +
+ +
+ +
+
+

{{ post.title }}

+ {{ post.excerpt }} +
+
+ Read More +
+
+ + + + +
+ + {% else %}
@@ -35,6 +61,7 @@ layout: default
+ {% endif %} {% endfor %} {% else %} From a2fcdfe1cddaaffeeaea3ecc51e0177e2f2e9fe2 Mon Sep 17 00:00:00 2001 From: Oscar Cortez Date: Sun, 4 Oct 2015 19:58:06 -0600 Subject: [PATCH 2/2] Release v1.4.0 add v1.4.0 to changelog --- CHANGELOG.md | 99 ++++++++++++++++++++++------------------------------ History.md | 57 ------------------------------ 2 files changed, 41 insertions(+), 115 deletions(-) delete mode 100644 History.md diff --git a/CHANGELOG.md b/CHANGELOG.md index f688c29..601d342 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,59 +1,42 @@ -1.0.0 / 2015-07-21 -================== +# Change Log -* Fix broken link with image demo -* Add demo links to the README.md -* Small typo fix -* Add links in the post date -* Edit the about page -* Change color in read-more button -* Some simple styles changed -* Create default post for demos -* load highlight post -* remove some resets styles -* some changes on readme file -* Merge branch 'master' of github.com:gdg-managua/jekyll-mdl -* restore the card title -* restore the header title -* :memo: add docs for custom theme -* cleaning and ordering sass files -* Add link in the cards title -* Fixed broken vertical more menu #7 -* add categories in post layout -* Style for the page layout -* Merge branch 'master' of github.com:gdg-managua/jekyll-mdl -* Fixed post ribbon in post layout -* Updating some readme content -* Remove author and categories from cards -* Highlight post use default image instead of background color -* Button in card post #3 -* Highlight post layout #1 y #2 -* Merge pull request #5 from gdg-managua/jkm-1 -* remove the pagination, this is not ready -* create the ajax pagination -* Native javascript pagination -* Add post data to the cards -* Add validation for use images in the post -* remove unused style -* :docs: Add configs for the post layout -* Create CONTRIBUTING.md file for guides -* some styles for the post layout -* create the post layout -* Create the History file -* create CHANGELOG.md file -* 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 -* jkm-1 testing blog pagination -* 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 +## [v1.4.0](https://github.com/gdg-managua/jekyll-mdl/tree/v1.4.0) (2015-10-05) +[Full Changelog](https://github.com/gdg-managua/jekyll-mdl/compare/v1.3.0...v1.4.0) + +**Implemented enhancements:** + +- JKM-2 Search layout [\#20](https://github.com/gdg-managua/jekyll-mdl/pull/20) ([oscarmcm](https://github.com/oscarmcm)) + +## [v1.3.0](https://github.com/gdg-managua/jekyll-mdl/tree/v1.3.0) (2015-09-03) +[Full Changelog](https://github.com/gdg-managua/jekyll-mdl/compare/v1.2.0...v1.3.0) + +**Implemented enhancements:** + +- Highlight multiple post [\#13](https://github.com/gdg-managua/jekyll-mdl/pull/13) ([oscarmcm](https://github.com/oscarmcm)) + +## [v1.2.0](https://github.com/gdg-managua/jekyll-mdl/tree/v1.2.0) (2015-07-26) +[Full Changelog](https://github.com/gdg-managua/jekyll-mdl/compare/v1.1.0...v1.2.0) + +## [v1.1.0](https://github.com/gdg-managua/jekyll-mdl/tree/v1.1.0) (2015-07-25) +[Full Changelog](https://github.com/gdg-managua/jekyll-mdl/compare/v1.0.0...v1.1.0) + +**Merged pull requests:** + +- Add a Bitdeli Badge to README [\#8](https://github.com/gdg-managua/jekyll-mdl/pull/8) ([bitdeli-chef](https://github.com/bitdeli-chef)) + +## [v1.0.0](https://github.com/gdg-managua/jekyll-mdl/tree/v1.0.0) (2015-07-21) +**Fixed bugs:** + +- Broken vertical "more" menu [\#7](https://github.com/gdg-managua/jekyll-mdl/issues/7) +- Post Layout Template [\#4](https://github.com/gdg-managua/jekyll-mdl/issues/4) +- Button in card post [\#3](https://github.com/gdg-managua/jekyll-mdl/issues/3) +- Highlight post and cards [\#2](https://github.com/gdg-managua/jekyll-mdl/issues/2) +- Highlight post layout [\#1](https://github.com/gdg-managua/jekyll-mdl/issues/1) + +**Merged pull requests:** + +- JKM-1 Create site pagination [\#5](https://github.com/gdg-managua/jekyll-mdl/pull/5) ([oscarmcm](https://github.com/oscarmcm)) + + + +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file diff --git a/History.md b/History.md deleted file mode 100644 index e895b9e..0000000 --- a/History.md +++ /dev/null @@ -1,57 +0,0 @@ -# (July 21, 2015) -* Fix broken link with image demo -* Add demo links to the README.md -* Small typo fix -* Add links in the post date -* Edit the about page -* Change color in read-more button -* Some simple styles changed -* Create default post for demos -* load highlight post -* remove some resets styles -* some changes on readme file -* Merge branch 'master' of github.com:gdg-managua/jekyll-mdl -* restore the card title -* restore the header title -* :memo: add docs for custom theme -* cleaning and ordering sass files -* Add link in the cards title -* Fixed broken vertical more menu #7 -* add categories in post layout -* Style for the page layout -* Merge branch 'master' of github.com:gdg-managua/jekyll-mdl -* Fixed post ribbon in post layout -* Updating some readme content -* Remove author and categories from cards -* Highlight post use default image instead of background color -* Button in card post #3 -* Highlight post layout #1 y #2 -* Merge pull request #5 from gdg-managua/jkm-1 -* remove the pagination, this is not ready -* create the ajax pagination -* Native javascript pagination -* Add post data to the cards -* Add validation for use images in the post -* remove unused style -* :docs: Add configs for the post layout -* Create CONTRIBUTING.md file for guides -* some styles for the post layout -* create the post layout -* Create the History file -* create CHANGELOG.md file -* 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 -* jkm-1 testing blog pagination -* 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