Merge branch 'lektor' of github.com:pybee/pybee.github.io into lektor

Conflicts:
	templates/home.html
	templates/page.html
This commit is contained in:
Russell Keith-Magee 2016-06-27 19:27:54 +08:00
commit d9c8bd7814
15 changed files with 97 additions and 30 deletions

View file

@ -106,6 +106,14 @@ nav {
padding: 1rem;
background-color: #eceeef;
border-radius: 1rem;
}
.gutter h2 {
font-size: 1rem;
margin: 1rem 0 0.6rem;
}
.home-gutter {
text-align: center;
}
@ -190,11 +198,16 @@ body {
text-align: center;
}
.gutter ul {
list-style-type: none;
.projects-gutter h6 {
text-align: center;
}
.gutter li {
text-align: left;
.projects-gutter ul {
list-style-type: none;
cursor: pointer;
}
}
.project-gutter li {
text-align: left;
}

View file

@ -8,7 +8,7 @@ As contributors and maintainers of this project, and in the interest of fosterin
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, religion, or nationality.
Examples of unacceptable behavior by participants include:
Examples of unacceptable behaviour by participants include:
* The use of sexualized language or imagery
* Personal attacks
@ -17,13 +17,13 @@ Examples of unacceptable behavior by participants include:
* Publishing other's private information, such as physical or electronic addresses, without explicit permission
* Other unethical or 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, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
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, or to ban temporarily or permanently any contributor for other behaviours that they deem inappropriate, threatening, offensive, or harmful.
By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
This code of conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at russell@pybee.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
To report an issue, please see `Making a CoC Complaint </community/code-of-conduct/making-a-coc-complaint>`__
This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from `http://contributor-covenant.org/version/1/3/0/`_.

View file

@ -2,6 +2,6 @@ _model: page
---
title: Making a CoC complaint
---
body: processes go here.
body: Instances of abusive, harassing, or otherwise unacceptable behaviour may be reported by contacting the lead project maintainer at russell@pybee.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
---
summary: Has something or someone in the BeeWare made you feel uncomfortable? Here's how to report the problem.

View file

@ -31,5 +31,9 @@ check-manifest
Are you a Python developer? Have you uploaded packages to the Python Package Index? Have you accidentally uploaded broken packages with some files missing? If so, `check-manifest <https://github.com/mgedmin/check-manifest>`__ is for you.
octohatrack
-----------------
All contributions count, not just code. `octohatrack <https://github.com/LABHR/octohatrack>`__ allows you to see all the contributors to a GitHub repo, not just the ones GitHub says are 'contributors'. Also available in a `shiny website <labhr.github.io/hatrack/>`__.

View file

@ -135,17 +135,6 @@ Github emails will notify you for the follow up process.
---------------
Learn more about the git process
----------------------------------
There are many useful resources to help you learn how to log issues and
raise Pull Requests in GitHub
`Contributing to Open
Source <https://guides.github.com/activities/contributing-to-open-source/#contributing>`__
from GitHub.com
`How to Fork a Repo <https://help.github.com/articles/fork-a-repo/>`__
from GitHub.com
.. |Fork button| image:: fork.png
@ -164,3 +153,19 @@ from GitHub.com
summary: How to submit a pull request using GitHub
---
sort_key: 3
---
gutter:
Learn more about the git process
------------------------------------------
There are many useful resources to help you learn how to log issues and
raise Pull Requests in GitHub
`Contributing to Open
Source <https://guides.github.com/activities/contributing-to-open-source/#contributing>`__
from GitHub.com
`How to Fork a Repo <https://help.github.com/articles/fork-a-repo/>`__
from GitHub.com

View file

@ -24,3 +24,10 @@ Now it's time to roll up your sleeves, and `pick a project where you can contrib
sort_key: 1
---
summary: Don't think you're ready to be an open source contributor? You're wrong.
---
gutter:
Connecting with Confident Authenticity
----------------------------------------------
Learn more about how to combat imposter syndrome: watch `"Bake the Cookies, Wear the Dress <https://www.youtube.com/watch?v=6Uj746j9Heo>`__ by Adrienne Lowe

View file

@ -49,3 +49,10 @@ If you speak a language with a non-latin character set (e.g., Russian or Chinese
sort_key: 2
---
summary: So you want to help - but where should you start?
---
gutter:
First Timers Only
-------------------------
Want to start small? Check out the BeeWare issues marked `[first-timers-only] <https://github.com/search?utf8=%E2%9C%93&q=org%3Apybee+is%3Aissue+is%3Aopen+label%3Aup-for-grabs&type=Issues&ref=searchresults>`__

View file

@ -44,7 +44,7 @@ Is the documentation up to date? Do you think things could be worded differently
This Website
--------------------
Is there anything wrong or missing from this website? Please feel free to make edits and submit a pull request!
Is there anything wrong or missing from this website? Please feel free to `make edits <https://github.com/pybee/pybee.github.io>`__ and submit a pull request!
@ -64,3 +64,10 @@ any questions or walk you through any problems you may encounter.
---
gutter:
All Contributions Welcome
----------------------------------
But it's not just about code. A successful software project requires documentation, design skills, feedback and bug reports. The BeeWare community acknowledges that all contributions are important - not just the ones that come as a pull request on GitHub.

View file

@ -4,6 +4,6 @@ pub_date: 2016-06-04
---
author: Russell Keith-Magee
---
body:
This is a second blog post.
body: This is a second blog post.
---
twitter_handle: freakboy3742

View file

@ -0,0 +1,13 @@
title: Tips for Becoming a Core Contributor
---
author: Philip James
---
body:
At PyCon US 2016, Philip James became a Core Contributor to BeeWare!
He wrote up some of his thoughts about the process in his article `Tips for Becoming a Core Contributor <https://www.wordfugue.com/tips-becoming-core-contributor/>`__
---
pub_date: 2016-06-05
---
twitter_handle: phildini

View file

@ -17,6 +17,10 @@ type = string
label = Body
type = rst
[fields.gutter]
label = Gutter
type = rst
[fields.sort_key]
label = Sort order
type = sort_key
type = sort_key

View file

@ -9,7 +9,7 @@
<h1>{{ this.title }}</h1>
<p>posted by
{% if this.twitter_handle %}
<a href="https://twitter.com/{{ this.twitter_handle }}">{{ post.author or post.twitter_handle }}</a>
<a href="https://twitter.com/{{ this.twitter_handle }}">{{ this.author or this.twitter_handle }}</a>
{% else %}
{{ this.author }}
{% endif %}

View file

@ -64,7 +64,7 @@
</div>
<div class="col-sm-12 col-md-4 gutter">
<div class="col-sm-12 col-md-4 gutter home-gutter">
<h5>Many thanks to</h5>
<div id="carousel-sponsors" class="carousel slide" data-ride="carousel">

View file

@ -19,6 +19,13 @@
<p>{{ child.summary }}</p>
{% endfor %}
</div>
<div class="hidden-sm-down col-md-4"></div>
{% if this.gutter %}
<div class="col-sm-12 col-md-4">
{{ this.gutter }}
</div>
{% else %}
<div class="hidden-sm-down col-md-4">
</div>
{% endif %}
</div>
{% endblock %}

View file

@ -53,14 +53,14 @@
<div class="col-sm-12 col-md-8">
<h2 class="clearfix">The BeeWare Projects</h2>
{% for child in this.children %}
<div class="clearfix">
<div class="clearfix type-{{ child.project_type}}{% for lang in child.languages %} lang-{{ lang }}{% endfor %} {% for plat in child.platforms %} plat-{{ plat }}{% endfor %} maturity-{{ child.maturity }}">
<img src="./{{ child._id }}/{{ child._id }}-72.png" class="pull-xs-left">
<h2><a href="{{ child|url }}">{{ child.name }}</a></h2>
<p>{{ child.short_description }}</p>
</div>
{% endfor %}
</div>
<div class="col-sm-12 col-md-4 gutter">
<div class="col-sm-12 col-md-4 gutter projects-gutter">
<h6>Project type</h6>
<ul>
<li onclick="toggle('app')">Application</a>