Added sitemap, fixed animation bug

gdg-x · Aug 25, 2014 · 59106ff · 59106ff
1 parent f056f8d
commit 59106ff
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 21 deletions.
diff --git a/_config.yml b/_config.yml
@@ -116,7 +116,7 @@ subscribeInfo: "Registration will be open around end of August. Number of ticket
 
 # Tickets Block
 ticketsTitle: "Pricetable"
-ticketsInfo: "Tickets grant access to all conference sections, coffee brakes, lunches and parties. Accommodation is NOT included in the ticket price."
+ticketsInfo: "Tickets grant access to all conference sections, coffee brakes, lunch and party. Accommodation is NOT included in the ticket price."
 ticketsOffers:
  -
   name: "Early Bird"

diff --git a/_includes/hero.html b/_includes/hero.html
@@ -1,6 +1,7 @@
 <!-- Begin Hero Section -->
 <section id="top-section-hero" class="top-section-hero top-section image-section" style="background-image: url('{{ site.baseurl }}/img/hero.jpg');">
     {% include navigation.html %}
+    <div class="content-wrapper">
     <div class="jumbotron">
         <div class="animated hiding" data-animation="fadeInDown" data-delay="500">
             {% assign heroText = site.heroTitle | split:"<typeout>" %}
@@ -16,5 +17,6 @@ <h1>{{ heroText[0] }}<span id="typeout-text" class="hidden-xs"></span><span clas
             <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-arrow-down"></use>
         </svg>
     </a>
+    </div>
 </section>
 <!-- End Hero Section -->
diff --git a/_includes/tickets-2.html b/_includes/tickets-2.html
@@ -13,13 +13,13 @@ <h3>{{ site.ticketsTitle }}</h3>
 							{% if ticketsOffer.additionalInfo != null %}
 								<span class="ticket-additional-info">{{ ticketsOffer.additionalInfo }}</span>
 							{% endif %}
+							{% if ticketsOffer.disabled != true %}
+							{% assign ticketValidTo = ticketsOffer.validThrough | split: "T" %}
+								<span class="ticket-additional-info">Before {{ ticketValidTo[0] | date: "%-d %B %Y"}} {{ ticketValidTo[1] }} or {{ ticketsOffer.ticketsNumber }} tickets</span>
+							{% endif %}
 						</div>
 						<div class="col-md-3 col-xs-12">
 							<p class="price">{{ ticketsOffer.price }} {{ ticketsOffer.priceCurrency }}</p>
-							{% if ticketsOffer.disabled != true %}
-								{% assign ticketValidTo = ticketsOffer.validThrough | split: "T" %}
-								<span class="ticket-sales">Before {{ ticketValidTo[0] | date: "%-d %B %Y"}} {{ ticketValidTo[1] }} or {{ ticketsOffer.ticketsNumber }} tickets</span>
-							{% endif %}
 						</div>
 						<div class="col-md-3 col-xs-12">
 							{% if ticketsOffer.disabled != true %}

diff --git a/_sass/partials/_global.scss b/_sass/partials/_global.scss
@@ -82,10 +82,6 @@ h6 {
 time {
     display: block;
 }
-.content-wrapper {
-    position: relative;
-    z-index: 1;
-}
 .st-content, .st-container, .st-pusher {
     height: 100%;
 }

diff --git a/_sass/partials/_helper.scss b/_sass/partials/_helper.scss
@@ -1,3 +1,8 @@
+.content-wrapper {
+    position: relative;
+    z-index: 1;
+    height: 100%;
+}
 .bordered {
     display: inline-block;
     color: rgba(255, 255, 255, .6);

diff --git a/_sass/partials/_hero.scss b/_sass/partials/_hero.scss
@@ -28,12 +28,14 @@
     }
 }
 .explore {
-    margin-left: -12px;
+    margin-left: -16px;
     position: absolute;
-    bottom: 25px;
+    bottom: -25px;
     left: 50%;
     animation: callToAction 3.5s linear 0s infinite;
     @media (max-width: 767px) {
+        margin-left: -12.5px;
+        bottom: 30px;
         animation: none;
     }
 }

diff --git a/_sass/partials/_tickets-2.scss b/_sass/partials/_tickets-2.scss
@@ -42,15 +42,7 @@ $border-color: rgba(51, 51, 51, .6);
             text-align: center;
         }
     }
-    .ticket-sales {
-        @extend .ticket-additional-text;
-        padding: 0 10px;
-        @media (max-width: 767px) {
-            padding: 0;
-        }
-    }
     .ticket-fallback {
-        margin-top: 20px;
         padding-top: 2px;
         line-height: 1.2;;
     }

diff --git a/css/main.min.css b/css/main.min.css
diff --git a/sitemap.xml b/sitemap.xml
@@ -0,0 +1,25 @@
+---
+title : "Sitemap"
+sitemap_exclude: y
+---
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+            http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+
+    {% for page in site.pages %}
+    {% if page.sitemap_exclude != 'y' %}
+    <url>
+        <loc>{{ page.url | prepend: site.baseurl | prepend: site.url }}</loc>
+    </url>
+    {% endif %}
+    {% endfor %}
+
+    {% for post in site.posts %}
+    <url>
+        <loc>{{ post.url | prepend: site.baseurl | prepend: site.url }}</loc>
+    </url>
+    {% endfor %}
+</urlset>