Merging from new styles

aschuerch · Jun 15, 2016 · d281e53 · d281e53
2 parents 26fbce2 + 6316f54
commit d281e53
Show file tree

Hide file tree

Showing 95 changed files with 3,006 additions and 6,453 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,10 +1,5 @@
-README.html
-LAYOUT.html
-FAQ.html
-DESIGN.html
-CONTRIBUTING.html
-CONDUCT.html
 *~
-*.pyc
-_site
 .DS_Store
+.sass-cache
+_site
+__pycache__
diff --git a/01-one.html b/01-one.html
diff --git a/01-one.md b/01-one.md
diff --git a/02-two.html b/02-two.html
diff --git a/02-two.md b/02-two.md
diff --git a/CONDUCT.md b/CONDUCT.md
@@ -1,13 +1,44 @@
-# Contributor Code of Conduct
+---
+layout: page
+title: "Contributor Code of Conduct"
+permalink: /conduct/
+---
+As contributors and maintainers of this project,
+we pledge to respect all people who contribute through reporting issues,
+posting feature requests,
+updating documentation,
+submitting pull requests or patches,
+and other activities.
 
-As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+We are committed to making participation in this project a harassment-free experience for everyone,
+regardless of level of experience,
+gender,
+gender identity and expression,
+sexual orientation,
+disability,
+personal appearance,
+body size,
+race,
+ethnicity,
+age,
+or religion.
 
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, or religion.
+Examples of unacceptable behavior by participants include the use of sexual language or imagery,
+derogatory comments or personal attacks,
+trolling,
+public or private harassment,
+insults,
+or other unprofessional conduct.
 
-Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+Project maintainers have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct.
+Project maintainers who do not follow the Code of Conduct may be removed from the project team.
 
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+Instances of abusive, harassing, or otherwise unacceptable behavior
+may be reported by opening an issue or contacting one or more of the project maintainers.
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+This Code of Conduct is adapted from
+the [Contributor Covenant][contrib-covenant] Version 1.0.0.
 
-This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/).
+[contrib-covenant]: http://contributor-covenant.org/