Add gitter, Fix templates

diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
index 5e7835dc1a57fb1242b5a80c1b656238721611e1..c546fbaa66503efdd22f60d6f03ec44b286d1908 100644 (file)
--- a/ISSUE_TEMPLATE.md
+++ b/ISSUE_TEMPLATE.md
@@ -1,18 +1,24 @@
-Thanks for helping out! 😇
+### Instructions
 
-### Prerequisites
+**THIS IS AN EXAMPLE TEMPLATE.**  
+**If it's a bug on the website, submit an issue on the appropriate repository: [https://github.com/jgthms/bulma-website](https://github.com/jgthms/bulma-website)**  
+**Screenshots are more than welcome!**  
+**Please remove any unused content (including these instructions) before submitting your issue.**  
+**Thanks for helping out!** 😇
 
-If it's a bug on the **website**, submit an issue on the appropriate repository: [https://github.com/jgthms/bulma-website](https://github.com/jgthms/bulma-website)
+_[Remove this line and all of the above before submitting your issue]_
 
-* [ ] Is this about Bulma the **CSS framework** and **not** about the Bulma website?
-* [ ] Which **version** of Bulma are you using?
-* [ ] Which **browser** are you using?
-* [ ] If it's a **Sass** issue, which version of Sass are you using?
-* [ ] Are you sure this issue is not a **duplicate**?
+### Checklist
+
+* [ ] This is about Bulma the **CSS framework** and **not** about the Bulma website
+* [ ] I'm using Bulma **version** [x.x.x]
+* [ ] My **browser** is:
+* [ ] This is a **Sass** issue: I'm using version [x.x.x]
+* [ ] I am sure this issue is **not a duplicate**?
 
 ### Description
 
-[Description of the bug, enhancement, or question]
+[Description of the bug, enhancement, or question]  
 [Please tag accordingly]
 
 ### Steps to Reproduce
@@ -24,5 +30,3 @@ If it's a bug on the **website**, submit an issue on the appropriate repository:
 _Expected behavior:_ [What you expected to happen]
 
 _Actual behavior:_ [What actually happened]
-
-**Screenshots** are more than welcome!

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 1e373cd9525e195ab934722ee72d2205eac5a92b..8ab1b5701c5227bf5c569e02b40e0847993dc4d1 100644 (file)
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,3 +1,21 @@
+### Instructions
+
+**THIS IS AN EXAMPLE TEMPLATE.**  
+**Screenshots are more than welcome!**  
+**Please remove any unused content (including these instructions) before submitting your PR.**  
+**Thanks for helping out!** 😇
+
+* Pull the latest master branch
+* Run `npm install` to install all Bulma dependencies
+* Make sure your Sass code is compliant with the [Bulma Sass styleguide](https://github.com/jgthms/bulma/blob/master/CONTRIBUTING.md#bulma-sass-styleguide)
+* If your PR fixes an issue, reference that issue
+* If your PR has lots of commits, **squash** your commits first
+* Run `npm run build` before submitting your PR
+
+_[Remove this line and all of the above before submitting your PR]_
+
+### Pull Request
+
 Fixes #
 
 Changes proposed:
@@ -6,14 +24,3 @@ Changes proposed:
 * [ ] Fix
 * [ ] Remove
 * [ ] Update
-
-### Requirements
-
-* [ ] Pull the latest master branch
-* [ ] Run `npm install` to install all Bulma dependencies
-* [ ] Make sure your Sass code is compliant with the [Bulma Sass styleguide](https://github.com/jgthms/bulma/blob/master/CONTRIBUTING.md#bulma-sass-styleguide)
-* [ ] If your PR fixes an issue, reference that issue
-* [ ] If your PR has lots of commits, **squash** your commits first
-* [ ] Run `npm run build` before submitting your PR
-
-Thanks for helping out! 😇

diff --git a/README.md b/README.md
index cca06195d094d328771c5fb4a5edcc90c1ce1f39..8575289fd78efba2bf860c7d4a04a665cb2c9a1e 100644 (file)
--- a/README.md
+++ b/README.md
@@ -2,6 +2,7 @@
 
 [![npm](https://img.shields.io/npm/v/bulma.svg)](https://www.npmjs.com/package/bulma)
 [![npm](https://img.shields.io/npm/dm/bulma.svg)](https://www.npmjs.com/package/bulma)
+[![Join the chat at https://gitter.im/jgthms/bulma](https://badges.gitter.im/jgthms/bulma.svg)](https://gitter.im/jgthms/bulma)
 
 Bulma is a modern CSS framework based on [Flexbox](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Flexible_Box_Layout/Using_CSS_flexible_boxes).
 
@@ -13,7 +14,7 @@ Bulma is in early but active development! Try it out now:
 
 ### NPM
 
-```
+```sh
 npm install bulma
 ```