Merge branch 'feature/updating-documentation' into develop

This commit is contained in:
CJ Patoilo 2016-07-05 05:13:03 -03:00
commit 69103b9be4
4 changed files with 92 additions and 7 deletions

View File

@ -80,7 +80,7 @@ Milligram use [Sass](http://sass-lang.com/) to give super powers to CSS. Look at
*Note: This style guide was inspired by [Idiomatic.css](https://github.com/necolas/idiomatic-css). Milligram uses an `.editorconfig` file, which most editors support, to enforce these coding standards.* *Note: This style guide was inspired by [Idiomatic.css](https://github.com/necolas/idiomatic-css). Milligram uses an `.editorconfig` file, which most editors support, to enforce these coding standards.*
## Code of conduct ## Code of Conduct
Help us keep Milligram open and inclusive. Please read and follow our thoughts on [Code of Conduct](http://confcodeofconduct.com/). Help us keep Milligram open and inclusive. Please read and follow our thoughts on [Code of Conduct](http://confcodeofconduct.com/).

47
.github/issue_template.md vendored Executable file
View File

@ -0,0 +1,47 @@
<!--
We would love for you to contribute to Milligram and help us make this even better! Start reading this [document](https://github.com/milligram/milligram/blob/master/.github/contributing.md) to see it is not difficult as you might have imagined.
Open an Issue
==============================
[Open an Issue](https://github.com/milligram/milligram/issues/new) to report any problems or improvements. When necessary, use [Codepen](http://codepen.io/) to show the problem. Be sure to include some description to explain the problem.
Code of Conduct
==============================
Help us keep Milligram open and inclusive. Please read and follow our thoughts on [Code of Conduct](http://confcodeofconduct.com/).
License
==============================
By contributing your code, you agree to license your contribution under the [MIT license](https://github.com/milligram/milligram#license).
-->
### Version info
<!-- What versions of the following libraries are you using? Note that your issue may already
be fixed in the latest versions. -->
**Milligram:**
**Other (e.g. Normalize.css, Node, Grunt, browser, operating system) (if applicable):**
### Test case
<!-- Provide code samples on [Codepen](http://codepen.io/). -->
### Steps to reproduce
<!-- Provide the steps needed to reproduce the issue given the above test case. -->
### Expected behavior
<!-- What is the expected behavior? -->
### Actual behavior
<!-- What is the actual behavior? -->

36
.github/pull_request_template.md vendored Executable file
View File

@ -0,0 +1,36 @@
<!--
We would love for you to contribute to Milligram and help us make this even better! Start reading this [document](https://github.com/milligram/milligram/blob/master/.github/contributing.md) to see it is not difficult as you might have imagined.
Submit a Pull Request
==============================
To submit a new feature, make sure that changes are done to the source code. [Follow our style guide](https://github.com/milligram/milligram/blob/master/.github/contributing.md#style-guide) and do not forget the tests and attach the link [Codepen](http://codepen.io/) along with the description.
Try to solve a problem for each pull request, this increases the chances of acceptance. When in doubt, open a [new issue](https://github.com/milligram/milligram/blob/master/.github/contributing.md#open-an-issue) so we can answer you. Look existing issues for ideas or to see if a similar issue has already been submitted.
1. Fork the Github repo: `git clone https://github.com/milligram/milligram.git`
1. Create a new branch: `git checkout -b issuenumber-feature-name`
1. Commit your changes: `git commit -m 'issuenumber-feature-name'`
1. Push to the branch: `git push origin my-feature-name`
1. Submit a pull request!
*Note: For issues relating to the site, please use the [milligram.github.io](https://github.com/milligram/milligram.github.io)*
Code of Conduct
==============================
Help us keep Milligram open and inclusive. Please read and follow our thoughts on [Code of Conduct](http://confcodeofconduct.com/).
License
==============================
By contributing your code, you agree to license your contribution under the [MIT license](https://github.com/milligram/milligram#license).
-->
### Description
<!-- Are you fixing a bug? Implementing a new feature? Updating the documentation? Describe here something about your changes. Don't forget to add the link to the open issue, or to other pull request related. -->
### Code sample
<!-- Provide code samples on [Codepen](http://codepen.io/). -->

View File

@ -1,12 +1,14 @@
# [Milligram](http://milligram.github.io) <p align="center">
<a href="http://milligram.github.io"><img width="100%" src="https://raw.githubusercontent.com/milligram/milligram.github.io/master/img/thumbnail.jpg" alt="Milligram - A minimalist CSS framework"></a>
</p>
| A minimalist CSS framework. > A minimalist CSS framework.
[![Build Status](https://travis-ci.org/milligram/milligram.svg?branch=master)](https://travis-ci.org/milligram/milligram) [![Build Status](https://travis-ci.org/milligram/milligram.svg?branch=master)](https://travis-ci.org/milligram/milligram)
[![GitHub version](https://badge.fury.io/gh/milligram%2Fmilligram.svg)](https://badge.fury.io/gh/milligram%2Fmilligram)
[![Bower version](https://badge.fury.io/bo/milligram.svg)](https://badge.fury.io/bo/milligram)
[![npm version](https://badge.fury.io/js/milligram.svg)](https://badge.fury.io/js/milligram)
[![Dependencies Status](https://david-dm.org/milligram/milligram.svg)](https://travis-ci.org/milligram/milligram) [![Dependencies Status](https://david-dm.org/milligram/milligram.svg)](https://travis-ci.org/milligram/milligram)
[![npm version](https://badge.fury.io/js/milligram.svg)](https://badge.fury.io/js/milligram)
[![Bower version](https://badge.fury.io/bo/milligram.svg)](https://badge.fury.io/bo/milligram)
[![Gitter chat](https://img.shields.io/badge/gitter-join_the_chat-4cc61e.svg)](https://gitter.im/milligram/milligram)
## Why it's awesome? ## Why it's awesome?
@ -48,7 +50,7 @@ $ npm install milligram
## Contributing ## Contributing
Want to contribute? Follow these [recommendations](https://github.com/milligram/milligram/blob/master/contributing.md). Want to contribute? Follow these [recommendations](https://github.com/milligram/milligram/blob/master/.github/contributing.md).
## License ## License