From f93ca5d58ff681ed2b6cffa337ce91afdc083771 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?K=C3=A1tia=20Nakamura?= <katia@kiwi.com>
Date: Sun, 3 Mar 2019 21:59:49 +0100
Subject: [PATCH] fix templates

---
 pyconbalkan/about/templates/about.html        |  5 ++---
 pyconbalkan/cfp/templates/cfp_form.html       |  9 ++++----
 pyconbalkan/coc/templates/coc.html            |  4 ++--
 pyconbalkan/conference/templates/home.html    | 22 +++++++------------
 pyconbalkan/contact/templates/contact.html    |  7 ++++--
 pyconbalkan/faq/templates/faq.html            |  4 ++--
 pyconbalkan/news/templates/news.html          |  8 ++++---
 .../organizers/templates/organizers.html      | 16 +++++++-------
 pyconbalkan/speaker/templates/speakers.html   |  7 +++---
 .../timetable/templates/timetable.html        |  4 ++--
 10 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/pyconbalkan/about/templates/about.html b/pyconbalkan/about/templates/about.html
index 5cb98ac3..3b8f36f7 100644
--- a/pyconbalkan/about/templates/about.html
+++ b/pyconbalkan/about/templates/about.html
@@ -6,10 +6,9 @@
 
    {# About #}
 
+    <h1 class="title title--yellow mb-xs-20">About Us</h1>
+    <hr class="line line--blue line--short line--spaced">
     {% if about %}
-        <h1 class="title title--yellow mb-xs-20">{{ about.title|safe }}</h1>
-        <hr class="line line--blue line--short line--spaced">
-
         <div class="column">
             <p>
                  {{ about.description|safe }}
diff --git a/pyconbalkan/cfp/templates/cfp_form.html b/pyconbalkan/cfp/templates/cfp_form.html
index 3792c2f3..e5b71c89 100644
--- a/pyconbalkan/cfp/templates/cfp_form.html
+++ b/pyconbalkan/cfp/templates/cfp_form.html
@@ -3,10 +3,10 @@
 {% block main_content %}
 
     {# Call For Proposals #}
+    <h1 class="title title--yellow mb-xs-20">Proposal Request and Info</h1>
+    <hr class="line line--blue line--short line--spaced">
 
     <div class="column">
-        <h1>Proposal Request and Info</h1>
-        <hr class="line">
 
         <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>
 
@@ -44,8 +44,9 @@ <h3>Be sure you include the following elements in your submission:</h3>
         <h1>Call For Proposals</h1>
         <hr class="line">
 
-        <p><b>The Rounds of CFPs have been closed. Thanks everyone for applying.</b></p>
-        <p>The CFPs are being reviewed now by our Reviewers Team so stay tuned! :)</p>
+        <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
+            <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
+        </h2>
 
     </div>
 
diff --git a/pyconbalkan/coc/templates/coc.html b/pyconbalkan/coc/templates/coc.html
index 63e3e0af..333e013b 100644
--- a/pyconbalkan/coc/templates/coc.html
+++ b/pyconbalkan/coc/templates/coc.html
@@ -3,10 +3,10 @@
 {% block main_content %}
 
     {# Code of Conduct #}
+        <h1 class="title title--yellow mb-xs-20">{% if coc %}{{ coc.title|safe }}{% else %}Code Of Conduct{% endif %}</h1>
+        <hr class="line line--blue line--short line--spaced">
 
     {% if coc %}
-        <h1 class="title title--yellow mb-xs-20">{{ coc.title|safe }}</h1>
-        <hr class="line line--blue line--short line--spaced">    
 
         <div class="long-text">
              {{ coc.description|safe }}
diff --git a/pyconbalkan/conference/templates/home.html b/pyconbalkan/conference/templates/home.html
index 2e985fa7..ecba4459 100644
--- a/pyconbalkan/conference/templates/home.html
+++ b/pyconbalkan/conference/templates/home.html
@@ -39,10 +39,9 @@ <h1>{{ count_down.title }}</h1>
     <div class="row">
         <p>{{ mission_statement.content|safe }}</p>
     </div>
-
+    <hr class="line long">
     {% endif %}
 
-    <hr class="line long">
 
     {# Keynote Speakers #}
 
@@ -70,13 +69,13 @@ <h2 class="centered">
                 </div>
             {% endfor %}
         </div>
+        <hr class="line long">
     {% else %}
-        <h2>
+        <h2 class="centered">
             <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
         </h2>
     {% endif %}
 
-    <hr class="line long">
 
     {# Sponsors #}
 
@@ -108,9 +107,8 @@ <h2 class="centered">
             </div>
         {% endfor %}
     </div>
-    {% endif %}
-
     <hr class="line long">
+    {% endif %}
 
     {% if platinum_sponsors %}
     <h2 class="platinum">Platinum</h2>
@@ -130,9 +128,8 @@ <h2 class="centered">
             </div>
         {% endfor %}
     </div>
-    {% endif %}
-
     <hr class="line long">
+    {% endif %}
 
     {% if gold_sponsors %}
     <h2 class="gold">Gold</h2>
@@ -152,9 +149,8 @@ <h2 class="centered">
             </div>
         {% endfor %}
     </div>
-    {% endif %}
-
     <hr class="line long">
+    {% endif %}
 
     {% if silver_sponsors %}
     <h2 class="silver">Silver</h2>
@@ -174,9 +170,8 @@ <h2 class="centered">
             </div>
         {% endfor %}
     </div>
-    {% endif %}
-
     <hr class="line long">
+    {% endif %}
 
     {% if partners %}
     <h2 class="partner">Partners</h2>
@@ -196,9 +191,8 @@ <h2 class="centered">
             </div>
         {% endfor %}
     </div>
-    {% endif %}
-
     <hr class="line long">
+    {% endif %}
 
     {# Buy Tickets #}
 
diff --git a/pyconbalkan/contact/templates/contact.html b/pyconbalkan/contact/templates/contact.html
index 8263ceb5..98c59bde 100644
--- a/pyconbalkan/contact/templates/contact.html
+++ b/pyconbalkan/contact/templates/contact.html
@@ -4,10 +4,13 @@
 
 {# Contact #}
 
-    <h1 class="title title--yellow mb-xs-40">Contact Us!</h1>
+    <h1 class="title title--yellow mb-xs-20">Contact Us!</h1>
+    <hr class="line line--blue line--short line--spaced">
+
     <p>We'd love to hear from you!</p>
     <p>If you have any questions, feel free to contact us.</p>
-    <hr class="line line--blue line--short line--spaced">    
+
+    <hr class="line line--blue line--short line--spaced">
 
     {% if success %}
         <h2 class="success-message">
diff --git a/pyconbalkan/faq/templates/faq.html b/pyconbalkan/faq/templates/faq.html
index 9cc58500..3dc66b40 100644
--- a/pyconbalkan/faq/templates/faq.html
+++ b/pyconbalkan/faq/templates/faq.html
@@ -7,12 +7,12 @@
 
 	{# Faq #}
 
+    <h1>F.A.Q - Frequently Asked Questions</h1>
+    <hr class="line line--blue line--short line--spaced">
 
 	{% if faq %}
 		<div class="row">
-			<h1 class="centered">F.A.Q - Frequently Asked Questions</h1>
 			<div class="column">
-
 				{% for item in faq %}
 					<button class="accordion">{{ item.question }}<a style="margin-left:10px; float:right;" class="headerlink" href="#faq-{{ item.id}}" title="Permalink to this speaker">¶</a>
                     </button>
diff --git a/pyconbalkan/news/templates/news.html b/pyconbalkan/news/templates/news.html
index e9cabeca..c50eb0f4 100644
--- a/pyconbalkan/news/templates/news.html
+++ b/pyconbalkan/news/templates/news.html
@@ -4,8 +4,8 @@
 
     {# News #}
 
-    <h1>News</h1>
-    <hr class="line">    
+    <h1 class="title title--yellow mb-xs-20">News</h1>
+    <hr class="line line--blue line--short line--spaced">
 
     {% if news %}
         <div class="post">
@@ -30,7 +30,9 @@ <h2>
             {% endfor %}
         </div>
     {% else %}
-        <h2>Coming soon!</h2>
+        <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
+            <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
+        </h2>
     {% endif %}
 
     <!-- END of Main Content -->
diff --git a/pyconbalkan/organizers/templates/organizers.html b/pyconbalkan/organizers/templates/organizers.html
index bd7717a2..274c77c6 100644
--- a/pyconbalkan/organizers/templates/organizers.html
+++ b/pyconbalkan/organizers/templates/organizers.html
@@ -4,12 +4,12 @@
 
     {# Organizers #}
 
-    <h1 class="centered">Organizers</h1>
-    <p class="centered">
+    <h1 class="title title--yellow mb-xs-20">Organizers</h1>
+    <hr class="line line--blue line--short line--spaced">
+    <p>
         These people have work hard and helped make PyCon a reality.
         Shout out to these awesome humans and great co-workers. :)
     </p>
-    <hr class="line line__centered">
 
     {% if organizers %}
         <div class="card">
@@ -44,16 +44,16 @@ <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
 
     {# Volunteers #}
 
-    <h1 class="centered">Volunteers</h1>
-    <p class="centered">
+    <h1 class="title title--yellow mb-xs-20">Volunteers</h1>
+    <hr class="line line--blue line--short line--spaced">
+    <p>
         There’s no way we could do all the work needed for PyCon Balkan without the help from our volunteers.
         They’ve been grinding all the time to make sure everything goes smoothly for the big event.
     </p>
-    <p class="centered">
+    <p>
         If you’re interested in helping organize the next PyCon Balkan (yeah, we’re not stopping), please contact us.
         We’d be thrilled to meet a fellow Python enthusiast. ;)
     </p>
-    <hr class="line line__centered">
 
     <div class="card">
         <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">
             {% endfor %}
         </div>
     {% else %}
-        <h2 class="title title--white title--medium title--uppercase mt-xs-20">
+        <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
             <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
         </h2>
     {% endif %}
diff --git a/pyconbalkan/speaker/templates/speakers.html b/pyconbalkan/speaker/templates/speakers.html
index ec97dc61..09d418bd 100644
--- a/pyconbalkan/speaker/templates/speakers.html
+++ b/pyconbalkan/speaker/templates/speakers.html
@@ -4,7 +4,9 @@
 
 {# Speakers #}
 
-    <h1 class="centered">Speakers</h1>
+    <h1 class="title title--yellow mb-xs-20">Speakers</h1>
+    <hr class="line line--blue line--short line--spaced">
+
     <p>
         We love Python because it’s a high-level language that creates elegant solutions to intricate problems.
         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>
     <p>
         Get your ticket now and let’s enjoy this wild ride with some really smart people.
     </p>
-    <hr class="line line__centered">
 
     {% if speakers %}
         <div class="card">
@@ -49,7 +50,7 @@ <h2>{{ presentation.title }}</h2>
             {% endfor %}
         </div>
     {% else %}
-        <h2>
+        <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
             <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
         </h2>
     {% endif %}
diff --git a/pyconbalkan/timetable/templates/timetable.html b/pyconbalkan/timetable/templates/timetable.html
index 67c461ef..25d4610e 100644
--- a/pyconbalkan/timetable/templates/timetable.html
+++ b/pyconbalkan/timetable/templates/timetable.html
@@ -3,7 +3,7 @@
 
 {% block main_content %}
   {# Timetable #}
-  <h1 class="title title--yellow mb-xs-40">Timetable</h1>
+  <h1 class="title title--yellow mb-xs-20">Timetable</h1>
   <hr class="line line--blue line--short line--spaced">
   <div class="rooms">
     {% if rooms %}
@@ -42,7 +42,7 @@ <h2 class="name">{{ slot.talk.speaker.name }}</h2>
         </div>
       {% endfor %}
     {% else %}
-      <h2 class="title title--white title--medium title--uppercase mt-xs-20">
+      <h2 class="title title--white title--medium title--uppercase mt-xs-20 mb-xs-80">
         <span class="featured-letter featured-letter--blue">C</span>oming <span class="featured-letter featured-letter--yellow">S</span>oon
       </h2>
     {% endif %}