Skip to content

Commit 5d51e69

Browse files
mylesmyles
committed
Fixed up some more page stuff.
1 parent ec291c6 commit 5d51e69

12 files changed

+78
-37
lines changed

‎web/markdown/code-of-conduct_en.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Code of Conduct
2+
13
PyCon Canada is a community conference intended for networking and collaboration in the developer community.
24

35
We value the participation of each member of the Python community and want all attendees to have an enjoyable and fulfilling experience. Accordingly, all attendees are expected to show respect and courtesy to other attendees throughout the conference and at all conference events, whether officially sponsored by PyCon Canada or not.

‎web/markdown/code-of-conduct_fr.markdown

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
## Code de conduite
2+
13
PyCon Canada s'engage à fournir à tous une conférence sans harcèlement, sans égard au genre, l'orientation sexuelle, les handicaps, l'apparence physique, la taille, la race, ou la religion. Nous ne tolérons aucune forme d'harcèlement envers les participants à la conférence.
24

35
Toute communication devrait être appropriée pour une audience de professionnels incluant des personnes de différents horizons. Le langage et les images à caractère sexuel n'est pas approprié en aucun lieu de la conférence incluant les présentations.

‎web/markdown/venue-hotel_en.markdown

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
## Hotel
2+
3+
Coming to Toronto for PyCon Canada and need a place to stay? We have a preferred rate with a Holiday Inn near the venue:
4+
5+
Holiday Inn Toronto Bloor Yorkville<br/>
6+
280 Bloor Street West, Toronto, ON<br/>
7+
M5S 1V8<br/>
8+
9+
Mention the code PYC and tell them you are with PyCon Canada.

‎web/markdown/venue-hotel_fr.markdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TODO

‎web/markdown/venue-public-transit_en.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Public Transit
2+
3+
The nearest TTC subway stops is Queen's Park Station on Line 1 Yonge-University. College streetcars also stop at St. George Street. Cash fare is $3, or multiple tokens can be purchased at discounted rates. Check with the TTC for more details.

‎web/markdown/venue-public-transit_fr.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Transport en commun
2+
3+
La station de Metro du TTC la plus près est la station Queen's Park sur la ligne 1 Yonge-University. Les tramways de la rue College font également un arrêt à la rue St. George. Le prix du billet est de 3$ et plusieurs billets peuvent être achetés à un prix réduit. Plus de détails sur le site du TTC.

‎web/markdown/venue-toronto_en.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## What do to in Toronto
2+
3+
Tourism Toronto's [website](http://www.seetorontonow.com/) has information on things to see and do in Toronto, as well as a "Deals" section including coupons. They also have a [mobile app](http://www.seetorontonow.com/mobile-app/) available for download.

‎web/markdown/venue-toronto_fr.markdown

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
## Quoi faire à Toronto
2+
3+
[Tourisme Toronto](http://www.seetorontonow.com/) offre de l'information sur des choses à voir et sur des activités disponible à Toronto. Le site web offre également un nombre de coupon-rabais. Ils offrent également une [application mobile](http://www.seetorontonow.com/mobile-app/) à télécharger.

‎web/static/scss/pages/_pages.scss

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,22 @@
4040
}
4141

4242
@at-root #{&}__content {
43-
margin: 0 auto;
44-
max-width: 50em;
43+
4544
}
4645

4746
@at-root #{&}__section {
4847
margin-top: 1em;
4948
margin-bottom: 1em;
49+
margin: 0 auto;
50+
max-width: 50em;
5051

5152
@at-root #{&}--border-bottom {
5253
border-bottom: $base-border;
5354
}
55+
56+
@at-root #{&}--full-width {
57+
max-width: 100%;
58+
}
5459
}
5560

5661
@at-root #{&}__row {

‎web/templates/pages/about.html

Lines changed: 39 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,31 +11,37 @@ <h1>{{ _("PyCon Canada is an initiative to strengthen the Canadian Python commun
1111
{% endblock %}
1212

1313
{% block page_content %}
14-
<div class="page__section page__section--border-bottom">
14+
<div class="page__section">
1515
{{ content|safe }}
1616
</div>
1717

18-
<div class="page__row page__section page__section--border-bottom">
19-
<div class="page__col page__col--left">
20-
<h2>{{ _("Join the Conversation") }}</h2>
18+
<div class="page__section page__section--full-width">
19+
<img src="https://placekitten.com/g/1200/400">
20+
</div>
21+
22+
<div class="page__section">
23+
<div class="page__row">
24+
<div class="page__col page__col--left">
25+
<h2>{{ _("Join the Conversation") }}</h2>
2126

22-
<p>{{ _('Be sure to use <a href="https://twitter.com/intent/tweet?button_hashtag=PyConCA2016">#PyConCA2016</a>. We love hearing from our community members!') }}</p>
27+
<p>{{ _('Be sure to use <a href="https://twitter.com/intent/tweet?button_hashtag=PyConCA2016">#PyConCA2016</a>. We love hearing from our community members!') }}</p>
2328

24-
<h2>{{ _('Key Contacts') }}</h2>
29+
<h2>{{ _('Key Contacts') }}</h2>
2530

26-
<ul>
27-
<li>{{ _('The organizing committee can be contacted at <a href="mailto:[email protected]">[email protected]</a>.') }}</li>
28-
<li>{{ _('The board can be contacted privately at <a href="mailto:[email protected]">[email protected]</a>.') }}</li>
29-
<li>{{ _('You can also find us on: <a href="https://github.com/pyconca/">github.com/pyconca/</a>.') }}</li>
30-
</ul>
31-
</div>
31+
<ul>
32+
<li>{{ _('The organizing committee can be contacted at <a href="mailto:[email protected]">[email protected]</a>.') }}</li>
33+
<li>{{ _('The board can be contacted privately at <a href="mailto:[email protected]">[email protected]</a>.') }}</li>
34+
<li>{{ _('You can also find us on: <a href="https://github.com/pyconca/">github.com/pyconca/</a>.') }}</li>
35+
</ul>
36+
</div>
3237

33-
<div class="page__col page__col--right">
34-
<a class="twitter-timeline" data-dnt="true" href="https://twitter.com/hashtag/PyConCA2016" data-widget-id="765372112991358978">{{ _('#PyConCA2016 Tweets') }}</a>
38+
<div class="page__col page__col--right">
39+
<a class="twitter-timeline" data-dnt="true" href="https://twitter.com/hashtag/PyConCA2016" data-widget-id="765372112991358978">{{ _('#PyConCA2016 Tweets') }}</a>
40+
</div>
3541
</div>
3642
</div>
3743

38-
<div class="page__section page__section--border-bottom">
44+
<div class="page__section">
3945
<h2>{{ _('Organisers') }}</h2>
4046

4147
<p>
@@ -46,25 +52,27 @@ <h2>{{ _('Organisers') }}</h2>
4652
</div>
4753

4854
{#
49-
<div class="page__row page__section page__section--border-bottom">
50-
<div class="page__col page__col--left">
51-
<h2>{{ _('Organisers') }}</h2>
55+
<div class="page__section">
56+
<div class="page__row">
57+
<div class="page__col page__col--left">
58+
<h2>{{ _('Organisers') }}</h2>
5259

53-
<p>
54-
{% for person in team['organisers'] %}
55-
<a href="{{ person.link }}">{{ person.name }}</a> {% if not loop.last %}<span class="separator">&bull;</span>{% endif %}
56-
{% endfor %}
57-
</p>
58-
</div>
60+
<p>
61+
{% for person in team['organisers'] %}
62+
<a href="{{ person.link }}">{{ person.name }}</a> {% if not loop.last %}<span class="separator">&bull;</span>{% endif %}
63+
{% endfor %}
64+
</p>
65+
</div>
5966

60-
<div class="page__col page__col--right">
61-
<h2>{{ _('Volunteers') }}</h2>
67+
<div class="page__col page__col--right">
68+
<h2>{{ _('Volunteers') }}</h2>
6269

63-
<p>
64-
{% for person in team['volunteers'] %}
65-
<a href="{{ person.link }}">{{ person.name }}</a> {% if not loop.last %}<span class="separator">&bull;</span>{% endif %}
66-
{% endfor %}
67-
</p>
70+
<p>
71+
{% for person in team['volunteers'] %}
72+
<a href="{{ person.link }}">{{ person.name }}</a> {% if not loop.last %}<span class="separator">&bull;</span>{% endif %}
73+
{% endfor %}
74+
</p>
75+
</div>
6876
</div>
6977
</div>
7078
#}

‎web/templates/pages/code-of-conduct.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99

1010
{% block page_header %}
11-
<h1>{{ _('Code of Conduct') }}</h1>
11+
<h1>{{ _('PyCon Canada is committed to providing a safe and welcoming atmosphere for all attendees.') }}</h1>
1212
{% endblock %}
1313

1414
{% block page_content %}
15-
{{ content|safe }}
15+
<div class="page__section">
16+
{{ content|safe }}
17+
</div>
1618
{% endblock %}

‎web/templates/pages/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
</div>
1717

1818
<div class="homepage__content">
19-
<h1 class="homepage__heading--primary">{{ _('PyCon Canada') }}</h1>
19+
<img src="{{ url_for('static', filename='images/logo.svg') }}" alt="PyCon Canada">
2020

21-
<h2 class="homepage__heading--secondary">{{ _('12-13 November 2016') }}, {{ _('Toronto') }}</h2>
21+
<h2 class="homepage__heading">{{ _('12-13 November 2016') }}, {{ _('Toronto') }}</h2>
2222

2323
<p class="homepage__copy">{{ _('Join your fellow Pythonistas for the fourth annual PyCon Canada, a weekend of talks, activities, fun and code!') }}</p>
2424

0 commit comments

Comments
 (0)