Update templates

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index ac5fd9ef008d1b4c93c127dc060fb0e95394b6b3..e97299b2f9f5c1bf941a90e6b22a931eeb4f742f 100644 (file)
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,38 +1,36 @@
-### PLEASE READ THE FOLLOWING INSTRUCTIONS
+<!-- PLEASE READ THE FOLLOWING INSTRUCTIONS -->
 
-Tag your issue accordingly:
+<!-- Is it about Bulma or about the Docs? -->
+<!-- Is it a bug/feature/question or do you need help? -->
+<!-- If it's a bug, is it a browser bug? -->
 
-* is it about Bulma or about the Docs?
-* is it a bug/feature/question or do you need help?
-* if it's a bug, is it a browser bug?
+### Overview of the problem
 
-Thanks for helping out! 😇
+<!-- UNCOMMENT THE APPROPRIATE LINES -->
 
-Please remove any unused content (including these instructions) before submitting your issue.
-
-### Checklist
-
-* [ ] This is about the Bulma **CSS framework**
-* [ ] This is about the Bulma **Docs**
-* [ ] 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**?
+<!-- This is about the Bulma **CSS framework** -->
+<!-- This is about the Bulma **Docs** -->
+<!-- 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 -->
 
 ### Steps to Reproduce
 
-1. _[First Step]_
-2. _[Second Step]_
-3. _[and so on...]_
+<!--
+1. First Step
+2. Second Step
+3. and so on...
+-->
 
 ### Expected behavior
 
-_[What you expected to happen]_
+<!-- What you expected to happen -->
 
 ### Actual behavior
 
-_[What actually happened]_
+<!-- What actually happened -->

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 11d976d943f18950de0df08e8f3bdbb2a24d6f73..482d97a5059a1afc54300e1ca33a91b9b89eb730 100644 (file)
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,23 +1,21 @@
-### PLEASE READ THE FOLLOWING INSTRUCTIONS
+<!-- PLEASE READ THE FOLLOWING INSTRUCTIONS -->
 
-Thanks for helping out! 😇
+### Proposed solution
+<!-- Which specific problem does this PR solve and how?  -->
+<!-- If it fixes a particular Issue, add "Fixes #ISSUE_NUMBER" in your title -->
 
-* 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/.github/CONTRIBUTING.md#bulma-sass-styleguide)
-* If your PR fixes an issue, reference that issue
-* If your PR has lots of commits, **rebase** first
-* Run `npm run build` and `npm run docs` before submitting your PR
+### Tradeoffs
+<!-- What are the drawbacks of this solution? Are there alternative ones? -->
+<!-- Think of performance, build time, usability, complexity, coupling…) -->
 
-Please remove any unused content (including these instructions) before submitting your issue.
 
-### Pull Request
+### Testing Done
+<!-- How have you confirmed this feature works? -->
 
-Fixes #
-
-Changes proposed:
-
-* [ ] Add
-* [ ] Fix
-* [ ] Remove
-* [ ] Update
+<!-- BEFORE SUBMITTING YOUR PR, MAKE SURE TO FOLLOW THESE STEPS: -->
+<!-- 1. Pull the latest `master` branch -->
+<!-- 2. Run `npm install` to install all Bulma dependencies -->
+<!-- 3. Make sure your Sass code is compliant with the [Bulma Sass styleguide](https://github.com/jgthms/bulma/blob/master/.github/CONTRIBUTING.md#bulma-sass-styleguide) -->
+<!-- 4. If your PR fixes an issue, reference that issue -->
+<!-- 5. If your PR has lots of commits, **rebase** first -->
+<!-- 6. Run `npm run deploy` before submitting your PR -->

diff --git a/LICENSE b/LICENSE
index 4290a29da35789030e2e79ab4e71bb471a1336c8..e51b32b7abe6919ff04969dc6d9c1be966de0530 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Jeremy Thomas
+Copyright (c) 2017 Jeremy Thomas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
index 17b65d7c980160c9ed83b916fa8db6ac525fed46..9867e9345cb57b73620875ccd00468e990062e8a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -38,12 +38,6 @@ You can either use that file, "out of the box", or download the Sass source file
 
 There is **no** JavaScript included. People generally want to use their own JS implementation (and usually already have one). Bulma can be considered "environment agnostic": it's just the style layer on top of the logic.
 
-## Roadmap
-
-Bulma keeps track of the upcoming fixes and features on Trello: [Bulma roadmap](https://trello.com/b/5Lzqejo3/bulma-roadmap)
-
-It's more a tasklist than a roadmap, but it will give you an overview of where things are going!
-
 ## Browser Support
 
 Bulma uses [autoprefixer](https://github.com/postcss/autoprefixer) to make (most) Flexbox features compatible with earlier browser versions. According to [Can I use](http://caniuse.com/#feat=flexbox), Bulma is compatible with:
@@ -64,4 +58,4 @@ Bulma uses [autoprefixer](https://github.com/postcss/autoprefixer) to make (most
 
 ## Copyright and license
 
-Code copyright 2016 Jeremy Thomas. Code released under [the MIT license](https://github.com/jgthms/bulma/blob/master/LICENSE).
+Code copyright 2017 Jeremy Thomas. Code released under [the MIT license](https://github.com/jgthms/bulma/blob/master/LICENSE).

diff --git a/docs/LICENSE b/docs/LICENSE
index 4290a29da35789030e2e79ab4e71bb471a1336c8..e51b32b7abe6919ff04969dc6d9c1be966de0530 100644 (file)
--- a/docs/LICENSE
+++ b/docs/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2016 Jeremy Thomas
+Copyright (c) 2017 Jeremy Thomas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal