From 78dc5f216ddd817825d50a995d9042e82fb7c241 Mon Sep 17 00:00:00 2001 From: Hariadi Hinta Date: Sat, 22 Mar 2014 11:59:31 +0800 Subject: [PATCH 1/4] update template * add doctype * default charset --- app/templates/_layouts/default.html | 2 ++ app/templates/_layouts/handlebars-default.html | 3 +++ app/templates/_layouts/handlebars-post.html | 3 +++ app/templates/_layouts/post.html | 3 +++ 4 files changed, 11 insertions(+) diff --git a/app/templates/_layouts/default.html b/app/templates/_layouts/default.html index c3419f3..5ba1e17 100644 --- a/app/templates/_layouts/default.html +++ b/app/templates/_layouts/default.html @@ -1,5 +1,7 @@ + + <%= _.capitalize(msTitle) %> - {{ title }} diff --git a/app/templates/_layouts/handlebars-default.html b/app/templates/_layouts/handlebars-default.html index 8cdddbe..4d4e380 100644 --- a/app/templates/_layouts/handlebars-default.html +++ b/app/templates/_layouts/handlebars-default.html @@ -1,8 +1,11 @@ + + <%= _.capitalize(msTitle) %> - {{ title }} +

Blog Posts

{{#if articles }} diff --git a/app/templates/_layouts/handlebars-post.html b/app/templates/_layouts/handlebars-post.html index b39d581..c1ed147 100644 --- a/app/templates/_layouts/handlebars-post.html +++ b/app/templates/_layouts/handlebars-post.html @@ -1,8 +1,11 @@ + + <%= _.capitalize(msTitle) %> - {{ title }} +

{{ title }}

diff --git a/app/templates/_layouts/post.html b/app/templates/_layouts/post.html index 93dd881..ad02899 100644 --- a/app/templates/_layouts/post.html +++ b/app/templates/_layouts/post.html @@ -1,8 +1,11 @@ + + <%= _.capitalize(msTitle) %> - {{ title }} +

{{ title }}

From 87534f95a479572fdff0da4d082ae6823e00fe1b Mon Sep 17 00:00:00 2001 From: Hariadi Hinta Date: Sat, 22 Mar 2014 12:00:06 +0800 Subject: [PATCH 2/4] ignore _site build --- app/templates/gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/app/templates/gitignore b/app/templates/gitignore index 3c3629e..18ce53a 100644 --- a/app/templates/gitignore +++ b/app/templates/gitignore @@ -1 +1,2 @@ node_modules +_site From 55e21cec834dd6856798aadb2c6d2cd0f7c368e8 Mon Sep 17 00:00:00 2001 From: Hariadi Hinta Date: Sat, 22 Mar 2014 12:08:18 +0800 Subject: [PATCH 3/4] update metalsmith --- app/templates/_package.json | 6 +++--- metalsmith.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/templates/_package.json b/app/templates/_package.json index 89e19df..102dd41 100644 --- a/app/templates/_package.json +++ b/app/templates/_package.json @@ -14,10 +14,10 @@ "metalsmith-ignore": "^0.1.2",<% } %><% if(drafts){ %> "metalsmith-drafts": "0.0.1",<% } %><% if(templates){ %> "metalsmith-templates": "^0.3.0", - "<%= templateEngine %>": "*",<% } %><% if(markdown){ %> + "<%= templateEngine %>": "<%= metalsmith.engine[templateEngine] %>",<% } %><% if(markdown){ %> "metalsmith-markdown": "^0.2.1",<% } %><% if(permalinks){ %> - "metalsmith-permalinks": "^0.2.0",<% } %><% if(collections){ %> + "metalsmith-permalinks": "^0.2.2",<% } %><% if(collections){ %> "metalsmith-collections": "^0.1.0",<% } %> - "metalsmith": "^0.3.0" + "metalsmith": "^0.5.0" } } diff --git a/metalsmith.json b/metalsmith.json index e55ced9..a0f8f93 100644 --- a/metalsmith.json +++ b/metalsmith.json @@ -6,7 +6,7 @@ "metalsmith-drafts": "^0.0.1", "metalsmith-templates": "^0.3.0", "metalsmith-markdown": "^0.2.1", - "metalsmith-permalinks": "^0.2.0", + "metalsmith-permalinks": "^0.2.2", "metalsmith-collections": "^0.1.0" }, "engine": { From 215d2831f405b47324ca0078da4439e2d9f48efe Mon Sep 17 00:00:00 2001 From: Hariadi Hinta Date: Sat, 22 Mar 2014 19:20:10 +0800 Subject: [PATCH 4/4] v0.2.2 --- README.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0641af6..d4a4133 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,12 @@ The following directory structure is generated after running `yo metalsmith`: . ├── .gitignore - ├── .yo-rc.json ├── Makefile ├── metalsmith.json ├── package.json ├── README.md ├── _layouts + │ ├── defaul.html │ └── post.html ├── _posts │ ├── 2012-08-20-first-post.md diff --git a/package.json b/package.json index 7aee674..6f229b9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "generator-metalsmith", - "version": "0.2.1", + "version": "0.2.2", "homepage": "https://github.com/hariadi/generator-metalsmith", "description": "Yeoman generator for Metalsmith", "author": {