X-Git-Url: https://jfr.im/git/irc/freenode/web-7.0.git/blobdiff_plain/b854cfc369289aa8bd5f00f8f3fe12e4e66c20b3..b353e12465aa4ad871ff740f19a3303d1005b6ba:/CONTRIBUTE.md diff --git a/CONTRIBUTE.md b/CONTRIBUTE.md index 4e4c92ad9..5610c4f48 100644 --- a/CONTRIBUTE.md +++ b/CONTRIBUTE.md @@ -1,19 +1,19 @@ ## Dev Requirements: * [Myth](http://www.myth.io/) +* [svgo](https://github.com/svg/svgo) * [cms7](https://github.com/edk0/cms7) -## Git +## Building + +With dependencies installed, just run `cms7`. -* Master is whats on [freenode](https://freenode.net) please do only merge to this branch with permission from at least two of the following: spb, christel, mist, kloeri, edk or Swant -* design/ prefix is for design changes of the website, ONE CHANGE PER BRANCH -* template/ prefix is for template changes, ONE CHANGE PER BRANCH -* content/ prefix is for new content, blogposts and faq md files, ONE ARTICLE PER BRANCH -* hotfix/ prefix is for urgent bugs, these might be fast forwarded without deeper testing +## Git -Branches should be tested on both big and small screens. -No direct merges to master, use Pull Requests. +`master` is automatically deployed to https://freenode.github.io/web-7.0/. It +is also configured to reject commits that haven't had a build succeed in a +branch or pull request; make one and ideally get someone else to confirm. -## Editing Rules +Branches are cheap; use one per feature. -Do not edit static/css/style.css as it'll be overwritten on next compile, instead edit static/css/source.css and run myth static/css/source.css static/css/style.css \ No newline at end of file +Changes should be tested on both big and small screens.