Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ummahusla/PotatoCSS into …
Browse files Browse the repository at this point in the history
…PotatoCSS-master
  • Loading branch information
ummahusla committed Nov 30, 2016
2 parents 91f7a80 + a6b4685 commit 7f032e4
Show file tree
Hide file tree
Showing 40 changed files with 2,423 additions and 1,221 deletions.
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,10 @@
# Cloud 9 #
.c9/
/.c9
/.c9/
/.c9/

# Node
node_modules/

# Test folders
test/
21 changes: 13 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,31 @@
# Contributing
When contributing to this repository, please first discuss the change you wish to make via an issue.

# Add new feature
## Fork it!

* via HTTPS: `git clone https://github.com/ummahusla/PotatoCSS.git`
* via SSH: `git clone git@github.com:ummahusla/PotatoCSS.git`

## Add new feature
You can request a new feature by submitting it in the `feature` branch.

1. Fork it!
1. [Fork it](#fork-it)!
2. Create your feature branch: `git checkout -b feature/NEW_FEATURE`
3. Commit your changes: `git commit -am 'Added feature/NEW_FEATURE'`
4. Push to the branch: `git push origin feature/NEW_FEATURE`
5. Submit a pull request!

# Bug report
## Bug report
Found a critical bug in the source code or a mistake in the documentation? Please consider submitting a [**new issue**](https://github.com/PotatoCSS/PotatoCSS/issues) and with a description what went wrong. Moreover, if you know how to fix it, please don't hesitate and send me a `Pull Request`.

1. Fork it!
1. [Fork it](#fork-it)!
2. Create your hotfix branch: `git checkout -b hotfix/POTATO_BUG`
3. Commit your changes: `git commit -am 'Fixed hotfix/POTATO_BUG'`
4. Push to the branch: `git push origin hotfix/POTATO_BUG`
5. Submit a pull request!

# Notes
Please reference issues by issue id (e.g. `#1337`) and write a detailed `Pull Request` description.

# Issues
## Issues
All current issues are listed [**here**](https://github.com/PotatoCSS/PotatoCSS/issues).

## Notes
Please reference issues by issue id (e.g. `#1337`) and write a detailed `Pull Request` description.
18 changes: 12 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<h3 align="center">PotatoCSS</h3>
<p align="center"><small><code>Simple CSS framework for hackers. Simple as potato.</code></small></p>

[![npm version](https://badge.fury.io/js/potato-css.svg)](https://badge.fury.io/js/potato-css)

___

PotatoCSS is a beautiful CSS framework for hackers: boasting a responsive 12 column grid, ready to use built-in forms and buttons, it's clean, simple and easy-to-use.
Expand All @@ -11,15 +13,19 @@ PotatoCSS is a beautiful CSS framework for hackers: boasting a responsive 12 col

[**PotatoCSS**](http://potatocss.com/) can be installed via the methods below,

* [Download](https://github.com/ummahusla/PotatoCSS/archive/master.zip)
* `git clone https://github.com/PotatoCSS/PotatoCSS.git`
* `npm install potato-css`
* Manual: [Download](https://github.com/ummahusla/PotatoCSS/archive/master.zip)
* via NPM: `npm install potato-css`
* via git: `git clone https://github.com/ummahusla/PotatoCSS.git`

## How to use

Just grab `potato.css` or `potato.min.css` from the `dist/css` folder and shove it where you store the CSS files (usually `assets/css`) for your project.

You can also build from LESS / SASS source by installing my NPM (example above) and running the command `gulp __build`. Happy coding!

You can see PotatoCSS in action at [**http://potatocss.com**](http://potatocss.com).

Alternately, you can find examples/snippets for you to insert into your HTML (assuming PotatoCSS has been included into your file).
Alternately, you can find examples and snippets to use with PotatoCSS in the [example folder](https://github.com/ummahusla/PotatoCSS/examples).

## Browser Support

Expand All @@ -31,7 +37,7 @@ The following details are estimates, assume [evergreen browser](http://stackover
* **Opera** : 11+
* **Opera Mini** : ALL
* **Edge** : ALL
* **Internet Explorer** : 8+
* **Internet Explorer** : 9+

## Contributing

Expand All @@ -47,4 +53,4 @@ Thanks for taking interest!

[**PotatoCSS**](https://github.com/PotatoCSS/PotatoCSS) was created for [**Hacktoberfest**](https://hacktoberfest.digitalocean.com/) by [**Edvins Antonovs**](https://twitter.com/edvinsantonovs).

Big thanks to all the [**contributors**](https://github.com/ummahusla/PotatoCSS/graphs/contributors) who work and have worked on PotatoCSS.
Big thanks to all the [**contributors**](https://github.com/ummahusla/PotatoCSS/graphs/contributors) who work and have worked on PotatoCSS.
Loading

0 comments on commit 7f032e4

Please sign in to comment.