From ed277258c7eea8e5a799d6ef534a9b23848e1c1c Mon Sep 17 00:00:00 2001 From: Jon Schlinkert Date: Fri, 22 Mar 2013 08:28:23 -0400 Subject: [PATCH] removed contributing.md, cleaned up junk in root. rebuilt readme. --- .gitattributes | 20 ----------- CHANGELOG | 4 +++ CONTRIBUTING.md | 66 ------------------------------------ Gruntfile.js | 2 +- README.md | 4 +-- ROADMAP | 3 -- component.json | 2 +- package.json | 2 +- .jshintrc => tasks/.jshintrc | 0 9 files changed, 9 insertions(+), 94 deletions(-) delete mode 100644 CONTRIBUTING.md delete mode 100644 ROADMAP rename .jshintrc => tasks/.jshintrc (100%) diff --git a/.gitattributes b/.gitattributes index 1c796e419..2a0210396 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,26 +3,6 @@ * text eol=lf *.* eol=lf -*.coffee text eol=lf -*.conf text eol=lf -*.config text eol=lf -*.css text eol=lf -*.hbs text eol=lf -*.handlebars text eol=lf -*.htm text eol=lf -*.html text eol=lf -*.jade text eol=lf -*.js text eol=lf -*.less text eol=lf -*.markdown text eol=lf -*.md text eol=lf -*.mustache text eol=lf -*.txt text eol=lf -*.yml text eol=lf -*.yaml text eol=lf -grunt text eol=lf -lessc text eol=lf - *.jpg binary *.gif binary *.png binary diff --git a/CHANGELOG b/CHANGELOG index 6a7b02160..c87543895 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +v0.3.21: + date: "2013-03-22 " + changes: + - Valid YAML now allowed in options.data object (along with JSON) v0.3.14: date: "2013-03-18 " changes: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 3686243a2..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,66 +0,0 @@ -# Contributing to Assemble - -Looking to contribute something to Assemble? **Here's how you can help.** - - -## Key branches - -- `master` is the latest, deployed version. -- `gh-pages` is the hosted docs (not to be used for pull requests). -- `*-wip` is the official work in progress branch for the next release. - - -## Pull requests - -- Try to submit pull requests against the latest `*-wip` branch for easier merging -- Any changes to the docs must be made to the Mustache templates, not just the compiled HTML pages -- CSS changes must be done in the `./src/less/*.less` files first, never just the compiled files -- If modifying the `./src/less/*.less` files, always recompile and commit the compiled files `assemble.css` and `assemble.min.css` -- Try not to pollute your pull request with unintended changes--keep them simple and small -- Try to share which browsers your code has been tested in before submitting a pull request - - -## Reporting issues - -Please read the following guidelines before opening any issue. - -1. **Search for existing issues.** Try to avoid duplicate issues, it would help us out a lot if you could first check if someone else has reported the same issue. Moreover, the issue may have already been resolved with a fix available. -2. **Create an isolated and reproducible test case.** Be sure the problem exists in Assemble's code with a [reduced test cases](http://css-tricks.com/reduced-test-cases/) that should be included in each bug report. -3. **Include a live example.** Make use of jsFiddle or jsBin to share your isolated test cases. -4. **Share as much information as possible.** Include operating system and version, browser and version, version of Assemble, customized or vanilla build, etc. where appropriate. Also include steps to reproduce the bug. - -## Coding standards: Templates - -- Single space before and after variables in templates (e.g. `{{ page.title }}`) - - -## Coding standards: HTML - -- Two spaces for indentation, never tabs -- Double quotes only, never single quotes -- Always use proper indentation -- Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags) - - -## Coding standards: CSS - -- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/) -- Multiple-line approach (one property and value per line) -- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`) -- End all lines with a semi-colon -- For multiple, comma-separated selectors, place each selector on it's own line -- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks). - - -## Coding standards: JS - -- No semicolons -- Comma first -- 2 spaces (no tabs) -- Strict mode -- "Attractive" - - -## License - -By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/assemble/assemble/blob/master/LICENSE-MIT \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 1018aee23..328e48233 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -23,7 +23,7 @@ module.exports = function(grunt) { }, jshint: { options: { - jshintrc: '.jshintrc' + jshintrc: 'tasks/.jshintrc' }, files: [ 'Gruntfile.js', diff --git a/README.md b/README.md index 0bd1d25c0..91b6486ee 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Assemble v0.3.2](http://github.com/assemble/assemble) [![Build Status](https://travis-ci.org/assemble/assemble.png)](https://travis-ci.org/assemble/assemble) +# [Assemble v0.3.21](http://github.com/assemble/assemble) [![Build Status](https://travis-ci.org/assemble/assemble.png)](https://travis-ci.org/assemble/assemble) > Get the rocks out of your socks. Assemble helps you **quickly launch static web projects** by emphasizing a strong separation of concerns between structure, style, content and configuration. @@ -584,7 +584,7 @@ _(Big plans in the works)_ --- Authored by [assemble](https://github.com/assemble/assemble) -_This file was generated using Grunt and [assemble](http://github.com/assemble/assemble) on Fri Mar 22 2013 08:11:53._ +_This file was generated using Grunt and [assemble](http://github.com/assemble/assemble) on Fri Mar 22 2013 08:27:25._ diff --git a/ROADMAP b/ROADMAP deleted file mode 100644 index b6e37233f..000000000 --- a/ROADMAP +++ /dev/null @@ -1,3 +0,0 @@ -roadmap: - tasks: - - nothing yet. \ No newline at end of file diff --git a/component.json b/component.json index 67b6efb80..4022cfb81 100644 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { "name": "assemble", - "version": "0.3.2", + "version": "0.3.21", "main": [ "./lib/assemble.js" ], diff --git a/package.json b/package.json index 3d1d74faa..bb848360c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "assemble", "description": "Get the rocks out of your socks. Assemble helps you **quickly launch static web projects** by emphasizing a strong separation of concerns between structure, style, content and configuration.", - "version": "0.3.2", + "version": "0.3.21", "homepage": "https://github.com/assemble/assemble", "author": { "name": "assemble", diff --git a/.jshintrc b/tasks/.jshintrc similarity index 100% rename from .jshintrc rename to tasks/.jshintrc