From 3dbb3c6e36b7e7e2ac9745a2d85f7dcbf98501e7 Mon Sep 17 00:00:00 2001 From: Samarjeet Date: Fri, 13 Nov 2015 15:00:57 +0530 Subject: [PATCH 1/7] Move to jekyll --- .gitignore | 6 +- README.md | 1 - _config.yml | 11 + _data/downloads.json | 32 ++ .../footer.ejs => _includes/footer.html | 0 _includes/head.html | 11 + .../header.ejs => _includes/header.html | 4 +- _layouts/default.html | 16 + _layouts/page.html | 14 + _layouts/post.html | 15 + _layouts/quickstart.html | 8 + _posts/2015-11-13-welcome-to-jekyll.markdown | 24 ++ {public/css => _sass}/_global.scss | 0 _sass/_normalize.scss | 406 ++++++++++++++++++ {public/css => _sass}/components/_footer.scss | 0 {public/css => _sass}/components/_header.scss | 0 {public/css => _sass}/pages/_blog.scss | 0 {public/css => _sass}/pages/_docs.scss | 0 {public/css => _sass}/pages/_download.scss | 0 {public/css => _sass}/pages/_index.scss | 1 + {public/css => _sass}/pages/_quickstart.scss | 0 blog.md | 9 + bower.json | 19 - config.js | 36 -- {public/css => css}/style.scss | 3 + design/Quick Start.png | Bin 501596 -> 639594 bytes docs/index.md | 8 + {views/docs => docs}/quickstart.md | 39 +- download.md | 8 + feed.xml | 30 ++ {public/img => img}/arrow_blue.png | Bin {public/img => img}/arrow_dark.png | Bin {public/img => img}/arrow_white.png | Bin {public/img => img}/bg_pattern.png | Bin {public/img => img}/bg_pattern_dark.png | Bin {public/img => img}/bg_pattern_light.png | Bin {public/img => img}/download_32.png | Bin {public/img => img}/download_64.png | Bin {public/img => img}/header_l.png | Bin {public/img => img}/header_r.png | Bin {public/img => img}/icon_code.png | Bin {public/img => img}/icon_connect.png | Bin {public/img => img}/icon_instances.png | Bin {public/img => img}/icon_platforms.png | Bin {public/img => img}/icon_puzzle.png | Bin {public/img => img}/icon_tech.png | Bin {public/img => img}/logo.png | Bin index.html | 60 +++ package.json | 25 -- public/css/style.css | 136 ------ server.js | 49 --- views/components/head.ejs | 10 - views/pages/blog.ejs | 19 - views/pages/docs.ejs | 18 - views/pages/download.ejs | 18 - views/pages/index.ejs | 70 --- views/pages/quickstart.ejs | 18 - 57 files changed, 682 insertions(+), 442 deletions(-) delete mode 100644 README.md create mode 100644 _config.yml create mode 100644 _data/downloads.json rename views/components/footer.ejs => _includes/footer.html (100%) create mode 100644 _includes/head.html rename views/components/header.ejs => _includes/header.html (67%) create mode 100644 _layouts/default.html create mode 100644 _layouts/page.html create mode 100644 _layouts/post.html create mode 100644 _layouts/quickstart.html create mode 100644 _posts/2015-11-13-welcome-to-jekyll.markdown rename {public/css => _sass}/_global.scss (100%) create mode 100644 _sass/_normalize.scss rename {public/css => _sass}/components/_footer.scss (100%) rename {public/css => _sass}/components/_header.scss (100%) rename {public/css => _sass}/pages/_blog.scss (100%) rename {public/css => _sass}/pages/_docs.scss (100%) rename {public/css => _sass}/pages/_download.scss (100%) rename {public/css => _sass}/pages/_index.scss (98%) rename {public/css => _sass}/pages/_quickstart.scss (100%) create mode 100644 blog.md delete mode 100644 bower.json delete mode 100644 config.js rename {public/css => css}/style.scss (93%) create mode 100644 docs/index.md rename {views/docs => docs}/quickstart.md (56%) create mode 100644 download.md create mode 100644 feed.xml rename {public/img => img}/arrow_blue.png (100%) rename {public/img => img}/arrow_dark.png (100%) rename {public/img => img}/arrow_white.png (100%) rename {public/img => img}/bg_pattern.png (100%) rename {public/img => img}/bg_pattern_dark.png (100%) rename {public/img => img}/bg_pattern_light.png (100%) rename {public/img => img}/download_32.png (100%) rename {public/img => img}/download_64.png (100%) rename {public/img => img}/header_l.png (100%) rename {public/img => img}/header_r.png (100%) rename {public/img => img}/icon_code.png (100%) rename {public/img => img}/icon_connect.png (100%) rename {public/img => img}/icon_instances.png (100%) rename {public/img => img}/icon_platforms.png (100%) rename {public/img => img}/icon_puzzle.png (100%) rename {public/img => img}/icon_tech.png (100%) rename {public/img => img}/logo.png (100%) create mode 100644 index.html delete mode 100644 package.json delete mode 100644 public/css/style.css delete mode 100644 server.js delete mode 100644 views/components/head.ejs delete mode 100644 views/pages/blog.ejs delete mode 100644 views/pages/docs.ejs delete mode 100644 views/pages/download.ejs delete mode 100644 views/pages/index.ejs delete mode 100644 views/pages/quickstart.ejs diff --git a/.gitignore b/.gitignore index ff5e698..ebd21e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -.idea -lib/ -node_modules/ -npm-debug.log \ No newline at end of file +.sass-cache +_site diff --git a/README.md b/README.md deleted file mode 100644 index 2f799e0..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -===================== \ No newline at end of file diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..6e82b7e --- /dev/null +++ b/_config.yml @@ -0,0 +1,11 @@ +# Site settings +title: nw.js +email: your-email@domain.com +description: nwjs +baseurl: "" # the subpath of your site, e.g. /blog/ +url: "http://nwjs.io" # the base hostname & protocol for your site +github_repo: nwjs/nw.js +permalink: pretty + +# Build settings +markdown: kramdown diff --git a/_data/downloads.json b/_data/downloads.json new file mode 100644 index 0000000..24530d2 --- /dev/null +++ b/_data/downloads.json @@ -0,0 +1,32 @@ +{ + "version_title": "v0.12.0-alpha1", + "download32Bit": [ + { + "label": "Windows 32bit", + "link": "http://dl.nwjs.io/v0.12.0-alpha1/nwjs-v0.12.0-alpha1-win-ia32.zip" + }, + { + "label": "Mac 32bit", + "link": "http://dl.nwjs.io/v0.12.0-alpha1/nwjs-v0.12.0-alpha1-osx-ia32.zip" + }, + { + "label": "Linux 32bit", + "link": "http://dl.nwjs.io/v0.12.0-alpha1/nwjs-v0.12.0-alpha1-linux-ia32.tar.gz" + } + ], + "download64Bit": [ + { + "label": "Windows 64bit", + "link": "http://dl.nwjs.io/v0.12.0-alpha1/nwjs-v0.12.0-alpha1-win-x64.zip" + }, + { + "label": "Mac 64bit", + "link": "http://dl.nwjs.io/v0.12.0-alpha1/nwjs-v0.12.0-alpha1-osx-x64.zip" + }, + { + "label": "Linux 64bit", + "link": "http://dl.nwjs.io/v0.12.0-alpha1/nwjs-v0.12.0-alpha1-linux-x64.tar.gz" + } + ], + "release_notes": "https://groups.google.com/d/msg/nwjs-general/qWJczc-E92E/9lmIiMfysU8J" +} \ No newline at end of file diff --git a/views/components/footer.ejs b/_includes/footer.html similarity index 100% rename from views/components/footer.ejs rename to _includes/footer.html diff --git a/_includes/head.html b/_includes/head.html new file mode 100644 index 0000000..f125504 --- /dev/null +++ b/_includes/head.html @@ -0,0 +1,11 @@ + + + + + + + NWJS.io + + + + \ No newline at end of file diff --git a/views/components/header.ejs b/_includes/header.html similarity index 67% rename from views/components/header.ejs rename to _includes/header.html index f2b90e2..18ac631 100644 --- a/views/components/header.ejs +++ b/_includes/header.html @@ -1,10 +1,10 @@
- +
\ No newline at end of file diff --git a/_sass/_global.scss b/_sass/_global.scss index 0085720..48f329a 100644 --- a/_sass/_global.scss +++ b/_sass/_global.scss @@ -2,4 +2,7 @@ font-weight: 600; color: #1ca0da; font-size: 1.8em; +} +nav .current { + color: #1ca0da; } \ No newline at end of file diff --git a/docs/quickstart.md b/quickstart.md similarity index 100% rename from docs/quickstart.md rename to quickstart.md From d5a9703d85c8aafa52fd3699b19a2c33471ca1f5 Mon Sep 17 00:00:00 2001 From: Samarjeet Date: Fri, 13 Nov 2015 16:20:48 +0530 Subject: [PATCH 6/7] Add blogging --- _layouts/post.html | 7 ++++-- _posts/2015-11-13-welcome-to-nwjs.markdown | 6 ----- _sass/pages/_blog.scss | 10 +++++++++ blog.md | 9 -------- .../_posts/2015-11-12-another-sample.markdown | 8 +++++++ .../2015-11-13-welcome-to-nwjs.markdown | 15 +++++++++++++ blog/index.md | 22 +++++++++++++++++++ 7 files changed, 60 insertions(+), 17 deletions(-) delete mode 100644 _posts/2015-11-13-welcome-to-nwjs.markdown delete mode 100644 blog.md create mode 100644 blog/_posts/2015-11-12-another-sample.markdown create mode 100644 blog/_posts/2015-11-13-welcome-to-nwjs.markdown create mode 100644 blog/index.md diff --git a/_layouts/post.html b/_layouts/post.html index a2b4e52..3eb27ef 100644 --- a/_layouts/post.html +++ b/_layouts/post.html @@ -1,10 +1,11 @@ --- layout: default --- -
+
+
-

{{ page.title }}

+

{{ page.title }}

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

@@ -13,3 +14,5 @@

{{ page.title }}

+ +
\ No newline at end of file diff --git a/_posts/2015-11-13-welcome-to-nwjs.markdown b/_posts/2015-11-13-welcome-to-nwjs.markdown deleted file mode 100644 index 6e11ec1..0000000 --- a/_posts/2015-11-13-welcome-to-nwjs.markdown +++ /dev/null @@ -1,6 +0,0 @@ ---- -layout: post -title: "Welcome to Node Webkit!" -date: 2015-11-13 13:18:34 ---- -Welcome to node webkit \ No newline at end of file diff --git a/_sass/pages/_blog.scss b/_sass/pages/_blog.scss index c9d97b8..6742eba 100644 --- a/_sass/pages/_blog.scss +++ b/_sass/pages/_blog.scss @@ -7,4 +7,14 @@ margin: 0 auto; padding: 10px 30px; } + .post-meta { + color: #646464; + } + .post-link { + font-weight: 600; + } + .post-list { + list-style-type: none; + padding: 0 1em; + } } \ No newline at end of file diff --git a/blog.md b/blog.md deleted file mode 100644 index c365099..0000000 --- a/blog.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -layout: default ---- -
-
-

Blog Entry

-

content

-
-
\ No newline at end of file diff --git a/blog/_posts/2015-11-12-another-sample.markdown b/blog/_posts/2015-11-12-another-sample.markdown new file mode 100644 index 0000000..37e14a3 --- /dev/null +++ b/blog/_posts/2015-11-12-another-sample.markdown @@ -0,0 +1,8 @@ +--- +layout: post +title: "Another sample" +date: 2015-11-13 13:18:34 +--- +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Laborum beatae sequi aliquid nobis commodi ratione vero, eius id cumque odio saepe est cum magnam ducimus architecto facere maiores corrupti sit. + + \ No newline at end of file diff --git a/blog/_posts/2015-11-13-welcome-to-nwjs.markdown b/blog/_posts/2015-11-13-welcome-to-nwjs.markdown new file mode 100644 index 0000000..8bf5c46 --- /dev/null +++ b/blog/_posts/2015-11-13-welcome-to-nwjs.markdown @@ -0,0 +1,15 @@ +--- +layout: post +title: "Welcome to Node Webkit!" +date: 2015-11-13 13:18:34 +--- +Welcome to node webkit. This is just an example post. Lorem ipsum dolor sit amet, consectetur adipisicing elit. Ipsam, provident laborum officia? Perferendis aliquam consectetur minus error delectus at. Dicta, molestias praesentium eaque repellendus voluptatibus eum! Ut magnam totam libero. +{% highlight json %} +{ + "version": "0.13" +} +{% endhighlight %} + +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Laudantium, nam modi maxime earum amet explicabo cum odio. Molestias, sequi, dolor. Voluptatum impedit iure ut non cupiditate, maiores possimus ex nobis. + +Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aliquam quos dignissimos doloremque! Delectus fuga laboriosam consectetur tempore, tenetur minima quam ullam culpa maiores id assumenda officiis, impedit minus suscipit placeat. \ No newline at end of file diff --git a/blog/index.md b/blog/index.md new file mode 100644 index 0000000..4424627 --- /dev/null +++ b/blog/index.md @@ -0,0 +1,22 @@ +--- +layout: default +--- +
+
+

Blog Entry

+
    + {% for post in site.posts %} +
  • +

    + {{ post.title }} +

    + {{ post.date | date: "%b %-d, %Y" }} +
    + {{ post.excerpt }} +
    +
    • + {% endfor %} +
+ +
+
\ No newline at end of file From 373df18e89872ff84e2d8ca57e6828f9b91196fe Mon Sep 17 00:00:00 2001 From: Samarjeet Date: Fri, 13 Nov 2015 16:28:11 +0530 Subject: [PATCH 7/7] Increase Header nav whitespace --- _sass/components/_header.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/_sass/components/_header.scss b/_sass/components/_header.scss index b98b0d3..ea828ad 100644 --- a/_sass/components/_header.scss +++ b/_sass/components/_header.scss @@ -29,6 +29,7 @@ header { color: $text-light-color; text-align: center; a { + // padding: 0 0.2em; text-transform: uppercase; } }