Skip to content

Commit 153f459

Browse files
authored
Merge pull request #144 from PythonBalkan/katia/template-fixes
conference: fix templates
2 parents bc3cdd7 + f93ca5d commit 153f459

File tree

10 files changed

+43
-43
lines changed

10 files changed

+43
-43
lines changed

pyconbalkan/about/templates/about.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66

77
{# About #}
88

9+
<h1 class="title title--yellow mb-xs-20">About Us</h1>
10+
<hr class="line line--blue line--short line--spaced">
911
{% if about %}
10-
<h1 class="title title--yellow mb-xs-20">{{ about.title|safe }}</h1>
11-
<hr class="line line--blue line--short line--spaced">
12-
1312
<div class="column">
1413
<p>
1514
{{ about.description|safe }}

pyconbalkan/cfp/templates/cfp_form.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
{% block main_content %}
44

55
{# Call For Proposals #}
6+
<h1 class="title title--yellow mb-xs-20">Proposal Request and Info</h1>
7+
<hr class="line line--blue line--short line--spaced">
68

79
<div class="column">
8-
<h1>Proposal Request and Info</h1>
9-
<hr class="line">
1010

1111
<p>We value any proposal you may submit. As it is our goal to put Balkan on the map when it comes to quality, we will consider any talks and/or workshop proposals submitted by experts and qualified professionals. It does not matter to us if you are new to the stage or a veteran presenter – if you know that you have something to contribute to PyCon Balkan 2018 we would love to hear from you.</p>
1212

@@ -44,8 +44,9 @@ <h3>Be sure you include the following elements in your submission:</h3>
4444
<h1>Call For Proposals</h1>
4545
<hr class="line">
4646

47-
<p><b>The Rounds of CFPs have been closed. Thanks everyone for applying.</b></p>
48-
<p>The CFPs are being reviewed now by our Reviewers Team so stay tuned! :)</p>
47+
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
48+
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
49+
</h2>
4950

5051
</div>
5152

pyconbalkan/coc/templates/coc.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
{% block main_content %}
44

55
{# Code of Conduct #}
6+
<h1 class="title title--yellow mb-xs-20">{% if coc %}{{ coc.title|safe }}{% else %}Code Of Conduct{% endif %}</h1>
7+
<hr class="line line--blue line--short line--spaced">
68

79
{% if coc %}
8-
<h1 class="title title--yellow mb-xs-20">{{ coc.title|safe }}</h1>
9-
<hr class="line line--blue line--short line--spaced">
1010

1111
<div class="long-text">
1212
{{ coc.description|safe }}

pyconbalkan/conference/templates/home.html

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,9 @@ <h1>{{ count_down.title }}</h1>
3939
<div class="row">
4040
<p>{{ mission_statement.content|safe }}</p>
4141
</div>
42-
42+
<hr class="line long">
4343
{% endif %}
4444

45-
<hr class="line long">
4645

4746
{# Keynote Speakers #}
4847

@@ -70,13 +69,13 @@ <h2 class="centered">
7069
</div>
7170
{% endfor %}
7271
</div>
72+
<hr class="line long">
7373
{% else %}
74-
<h2>
74+
<h2 class="centered">
7575
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
7676
</h2>
7777
{% endif %}
7878

79-
<hr class="line long">
8079

8180
{# Sponsors #}
8281

@@ -108,9 +107,8 @@ <h2 class="centered">
108107
</div>
109108
{% endfor %}
110109
</div>
111-
{% endif %}
112-
113110
<hr class="line long">
111+
{% endif %}
114112

115113
{% if platinum_sponsors %}
116114
<h2 class="platinum">Platinum</h2>
@@ -130,9 +128,8 @@ <h2 class="centered">
130128
</div>
131129
{% endfor %}
132130
</div>
133-
{% endif %}
134-
135131
<hr class="line long">
132+
{% endif %}
136133

137134
{% if gold_sponsors %}
138135
<h2 class="gold">Gold</h2>
@@ -152,9 +149,8 @@ <h2 class="centered">
152149
</div>
153150
{% endfor %}
154151
</div>
155-
{% endif %}
156-
157152
<hr class="line long">
153+
{% endif %}
158154

159155
{% if silver_sponsors %}
160156
<h2 class="silver">Silver</h2>
@@ -174,9 +170,8 @@ <h2 class="centered">
174170
</div>
175171
{% endfor %}
176172
</div>
177-
{% endif %}
178-
179173
<hr class="line long">
174+
{% endif %}
180175

181176
{% if partners %}
182177
<h2 class="partner">Partners</h2>
@@ -196,9 +191,8 @@ <h2 class="centered">
196191
</div>
197192
{% endfor %}
198193
</div>
199-
{% endif %}
200-
201194
<hr class="line long">
195+
{% endif %}
202196

203197
{# Buy Tickets #}
204198

pyconbalkan/contact/templates/contact.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44

55
{# Contact #}
66

7-
<h1 class="title title--yellow mb-xs-40">Contact Us!</h1>
7+
<h1 class="title title--yellow mb-xs-20">Contact Us!</h1>
8+
<hr class="line line--blue line--short line--spaced">
9+
810
<p>We'd love to hear from you!</p>
911
<p>If you have any questions, feel free to contact us.</p>
10-
<hr class="line line--blue line--short line--spaced">
12+
13+
<hr class="line line--blue line--short line--spaced">
1114

1215
{% if success %}
1316
<h2 class="success-message">

pyconbalkan/faq/templates/faq.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77

88
{# Faq #}
99

10+
<h1>F.A.Q - Frequently Asked Questions</h1>
11+
<hr class="line line--blue line--short line--spaced">
1012

1113
{% if faq %}
1214
<div class="row">
13-
<h1 class="centered">F.A.Q - Frequently Asked Questions</h1>
1415
<div class="column">
15-
1616
{% for item in faq %}
1717
<button class="accordion">{{ item.question }}<a style="margin-left:10px; float:right;" class="headerlink" href="#faq-{{ item.id}}" title="Permalink to this speaker"></a>
1818
</button>

pyconbalkan/news/templates/news.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
{# News #}
66

7-
<h1>News</h1>
8-
<hr class="line">
7+
<h1 class="title title--yellow mb-xs-20">News</h1>
8+
<hr class="line line--blue line--short line--spaced">
99

1010
{% if news %}
1111
<div class="post">
@@ -30,7 +30,9 @@ <h2>
3030
{% endfor %}
3131
</div>
3232
{% else %}
33-
<h2>Coming soon!</h2>
33+
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
34+
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
35+
</h2>
3436
{% endif %}
3537

3638
<!-- END of Main Content -->

pyconbalkan/organizers/templates/organizers.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
{# Organizers #}
66

7-
<h1 class="centered">Organizers</h1>
8-
<p class="centered">
7+
<h1 class="title title--yellow mb-xs-20">Organizers</h1>
8+
<hr class="line line--blue line--short line--spaced">
9+
<p>
910
These people have work hard and helped make PyCon a reality.
1011
Shout out to these awesome humans and great co-workers. :)
1112
</p>
12-
<hr class="line line__centered">
1313

1414
{% if organizers %}
1515
<div class="card">
@@ -44,16 +44,16 @@ <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
4444

4545
{# Volunteers #}
4646

47-
<h1 class="centered">Volunteers</h1>
48-
<p class="centered">
47+
<h1 class="title title--yellow mb-xs-20">Volunteers</h1>
48+
<hr class="line line--blue line--short line--spaced">
49+
<p>
4950
There’s no way we could do all the work needed for PyCon Balkan without the help from our volunteers.
5051
They’ve been grinding all the time to make sure everything goes smoothly for the big event.
5152
</p>
52-
<p class="centered">
53+
<p>
5354
If you’re interested in helping organize the next PyCon Balkan (yeah, we’re not stopping), please contact us.
5455
We’d be thrilled to meet a fellow Python enthusiast. ;)
5556
</p>
56-
<hr class="line line__centered">
5757

5858
<div class="card">
5959
<a class="button button--yellow mb-xs-40 event-button" href="https://docs.google.com/forms/d/e/1FAIpQLSdJO6rP5jtHvpioYWMoimIRaQx-W7TR3uLmeu-hFg-ad4ZpgA/viewform" target="_blank">
@@ -85,7 +85,7 @@ <h2 class="card__name title--blue">
8585
{% endfor %}
8686
</div>
8787
{% else %}
88-
<h2 class="title title--white title--medium title--uppercase mt-xs-20">
88+
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
8989
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
9090
</h2>
9191
{% endif %}

pyconbalkan/speaker/templates/speakers.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
{# Speakers #}
66

7-
<h1 class="centered">Speakers</h1>
7+
<h1 class="title title--yellow mb-xs-20">Speakers</h1>
8+
<hr class="line line--blue line--short line--spaced">
9+
810
<p>
911
We love Python because it’s a high-level language that creates elegant solutions to intricate problems.
1012
Right now, it's really popular with data scientists and startups. The reason why is simple, you can do a
@@ -14,7 +16,6 @@ <h1 class="centered">Speakers</h1>
1416
<p>
1517
Get your ticket now and let’s enjoy this wild ride with some really smart people.
1618
</p>
17-
<hr class="line line__centered">
1819

1920
{% if speakers %}
2021
<div class="card">
@@ -49,7 +50,7 @@ <h2>{{ presentation.title }}</h2>
4950
{% endfor %}
5051
</div>
5152
{% else %}
52-
<h2>
53+
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
5354
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
5455
</h2>
5556
{% endif %}

pyconbalkan/timetable/templates/timetable.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
{% block main_content %}
55
{# Timetable #}
6-
<h1 class="title title--yellow mb-xs-40">Timetable</h1>
6+
<h1 class="title title--yellow mb-xs-20">Timetable</h1>
77
<hr class="line line--blue line--short line--spaced">
88
<div class="rooms">
99
{% if rooms %}
@@ -42,7 +42,7 @@ <h2 class="name">{{ slot.talk.speaker.name }}</h2>
4242
</div>
4343
{% endfor %}
4444
{% else %}
45-
<h2 class="title title--white title--medium title--uppercase mt-xs-20">
45+
<h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
4646
<span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
4747
</h2>
4848
{% endif %}

0 commit comments

Comments
 (0)