From c8f7a3d94057c24d73df6333cffee118c5aad76e Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Tue, 5 Jul 2016 03:13:43 -0300 Subject: [PATCH 1/2] Added issue, pull request, and contributing templates --- contributing.md => .github/contributing.md | 2 +- .github/issue_template.md | 47 ++++++++++++++++++++++ .github/pull_request_template.md | 36 +++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) rename contributing.md => .github/contributing.md (99%) create mode 100755 .github/issue_template.md create mode 100755 .github/pull_request_template.md diff --git a/contributing.md b/.github/contributing.md similarity index 99% rename from contributing.md rename to .github/contributing.md index 673ea4b..cae7157 100644 --- a/contributing.md +++ b/.github/contributing.md @@ -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.* -## 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/). diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100755 index 0000000..712b74f --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,47 @@ + + + +### Version info + + + +**Milligram:** + +**Other (e.g. Normalize.css, Node, Grunt, browser, operating system) (if applicable):** + + +### Test case + + + + +### Steps to reproduce + + + + +### Expected behavior + + + + +### Actual behavior + + diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100755 index 0000000..35921a6 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,36 @@ + + + +### Description + + + +### Code sample + + From 62e26153ebbd73c5feb82337cd8e5d8bc31ee389 Mon Sep 17 00:00:00 2001 From: CJ Patoilo Date: Tue, 5 Jul 2016 05:09:20 -0300 Subject: [PATCH 2/2] Updated README --- readme.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/readme.md b/readme.md index 431b563..ccffcfa 100644 --- a/readme.md +++ b/readme.md @@ -1,12 +1,14 @@ -# [Milligram](http://milligram.github.io) +

+ Milligram - A minimalist CSS framework +

-| 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) -[![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) +[![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? @@ -48,7 +50,7 @@ $ npm install milligram ## 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