Updated hackathon page

_config.yml

@@ -87,9 +87,9 @@ eventAddressLocality: "Lviv"
 eventAddressLocalityRegion: "Lvivska"
 eventPostalCode: "79000"
 eventAddressCountry: "Ukraine"
-eventStartTime: "2014-10-24T10:00"
+eventStartTime: "2014-10-25T10:00"
 eventDoorTime: "09:00"
-eventEndTime: "2014-10-24T20:00"
+eventEndTime: "2014-10-25T20:00"
 eventPlaceCoordinates: "49.843237,24.028751"
 mapCenterCoordinates: "49.842537,24.025701"
 mapMobileCenterCoordinates: "49.841620, 24.029411"
@@ -226,3 +226,19 @@ directionDetailsWideCards:
 
 # Hackathon Judges Block
 judgesTitle: "Judges"
+
+#Hackathon Location Block
+hackathonLocationBlockTitle: "Location"
+hackathonLocationName: "Communa"
+hackathonLocationLink: "http://communa.net.ua/"
+hackathonStreetAddress: "1 Halytska St"
+hackathonAddressLocality: "Lviv"
+hackathonAddressLocalityRegion: "Lvivska"
+hackathonPostalCode: "79000"
+hackathonAddressCountry: "Ukraine"
+hackathonStartTime: "2014-10-24T10:00"
+hackathonDoorTime: "09:00"
+hackathonEndTime: "2014-10-25T00:00"
+hackathonPlaceCoordinates: "49.840999, 24.031144"
+hackathonMapCenterCoordinates: "49.840696, 24.028754"
+hackathonMapMobileCenterCoordinates: "49.840291, 24.031248"

_includes/about-hackathon.html

@@ -1,16 +1,45 @@
 <!-- About Hackathon Section -->
 <section id="about-hackathon" class="about-hackathon">
     <div class="content-wrapper">
-        <div class="col-lg-10 col-lg-offset-1">
+        <div class="col-md-8 col-md-offset-2">
-            <div class="col-md-3 animated hiding" data-animation="fadeInLeft" data-delay="500"><img class="img-responsive" src="../img/hackathon-0.png" alt="Hackathon"></div>
+            <div class="hackathon-row float-left col-md-12">
-            <div class="col-md-9 animated hiding" data-animation="fadeInRight" data-delay="500">
+                <div class="hackathon-img-wrapper animated hiding" data-animation="fadeInLeft" data-delay="0">
-                <h3>Android Wear Hackathon</h3>
+                    <img class="img-responsive" src="../img/hackathon-0.png" alt="Hackathon">
-                <p class="hackathon-details text-left">
+                </div>
+                <div class="hackathon-details animated hiding" data-animation="fadeInRight" data-delay="0">
+                    <h4>Android Wear</h4>
+                    <p>
                         The front doors will be locked because this is after hours, please park behind the building and come to the door nearest the parking lot.<br><br>
                         Our last meeting showed that there was a lot of interest in Android Wear so we decided to put on an Android Wear Hackathon to see what you could come up with! We realize that this is pretty short notice so we hope you can help us spread the word! There will be pizza, prizes and a great group of geeks to spend the evening coding with! Even if you don't have an app idea come on in and lend a hand to someone else or maybe find inspiration once you're here!
                     </p>
                 </div>
             </div>
+            <div class="hackathon-row float-right col-md-12">
+                <div class="hackathon-img-wrapper animated hiding" data-animation="fadeInRight" data-delay="0">
+                    <img class="img-responsive" src="../img/hackathon-1.png" alt="Hackathon">
+                </div>
+                <div class="hackathon-details animated hiding" data-animation="fadeInLeft" data-delay="0">
+                    <h4>Google Glass</h4>
+                    <p>
+                        We love wearable computing especially Google Glass for which we want to gather the break up community in order to boost innovation.<br><br>
+                        Coding an app on Google Glass needs its Rockstar Dev : the team needs a fast learner with solid skills on Android. He knows his way around Android SDK, already checked the Glass Developement Kit (GDK) quick start guide allowing him to jump start developing an app for Glass.The Designer has the hard task to build the visual identity from the ground up, he has strong UX knowledge and a deep understanding of the new rules set by the Glass. His design skills give him the credibility to decide the most effective UI and the most compelling Glass experience.
+                    </p>
+                </div>
+            </div>
+            <div class="hackathon-row float-left col-md-12">
+                <div class="hackathon-img-wrapper animated hiding" data-animation="fadeInLeft" data-delay="0">
+                    <img class="img-responsive" src="../img/hackathon-2.png" alt="Hackathon">
+                </div>
+                <div class="hackathon-details animated hiding" data-animation="fadeInRight" data-delay="0">
+                    <h4>Polymer</h4>
+                    <p>
+                        Polymer is a library that introduces web components. Web components are small elements on a page that can be extended and incorporated in web applications. The result is an increase in productivity.<br><br>
+                        We used Polymer mainly to explore the concept of web components. The transition of Google to material design was also a factor.
+                        While the library was never touched by the team, it still was painless to wireframe the application. Later on we incorporated some Polymer components in the design. We didn’t use the full potential of Polymer because of the limited time.
+                    </p>
+                </div>
+            </div>
+        </div>
     </div>
 </section>
 <!-- End About Hackathon Section -->

_includes/hackathon-location.html

@@ -1,29 +1,22 @@
 <!-- Begin Hackathon Location Section -->
-<section id="location-map" class="location-map">
+<section id="hackathon-location" class="hackathon-location">
     <div id="canvas-map" class="canvas-map"></div>
     <div class="content-wrapper">
         <div class="col-lg-3 col-md-4 col-sm-6 col-md-offset-1 animated hiding location-description text-left" data-animation="fadeInLeft" data-delay="0">
-            <div class="row">
+            <div class="row pull-left">
-                <div class="pull-left">
+                <h3>{{ site.hackathonLocationBlockTitle }}</h3>
-                    <h3>{{ site.locationBlockTitle }}</h3>
                 <ul>
-                        {% if site.eventLocationName %}<li>{{ site.eventLocationName }}</li>{% endif %}
+                    {% if site.hackathonLocationName %}<li>{{ site.hackathonLocationName }}</li>{% endif %}
-                        <li>{{ site.eventStreetAddress }}, {{ site.eventAddressLocality }}</li>
+                    <li>{{ site.hackathonStreetAddress }}, {{ site.hackathonAddressLocality }}</li>
                     <li><a href="mailto:{{ site.email }}">{{ site.email }}</a></li>
                     <li>
-                            {% assign startTime = site.eventStartTime | split: "T" %}
+                        {% assign startTime = site.hackathonStartTime | split: "T" %}
                         <time>{{ startTime[1] }}</time> -
-                            {% assign endTime = site.eventEndTime | split: "T" %}
+                        {% assign endTime = site.hackathonEndTime | split: "T" %}
                         <time>{{ endTime[1] }}</time>
                     </li>
                 </ul>
             </div>
-                <a href="{{ site.baseurl | append: '/logistics/#find-way' }}" class="pull-right">
-                    <svg class="icon icon-direction" viewBox="0 0 32 32">
-                        <use xlink:href="{{ site.baseurl }}/img/sprites/sprites.svg#icon-direction"></use>
-                    </svg>
-                </a>
-            </div>
         </div>
     </div>
 </section>

_includes/judges.html

@@ -5,20 +5,19 @@
         <div class="col-lg-10 col-lg-offset-1">
             <h3>{{ site.judgesTitle }}</h3>
             <div class="row">
-                {% assign animationDelay = 0 %}
+                {% assign animationDelay = 0 %} {% for judge in site.data.judges %} 
-                {% for judge in site.data.judges %}
                 {% assign colWidth = 12 | divided_by: forloop.length %}
-                <div class="col-md-{{ colWidth }} col-xs-6 animated hiding" data-animation="fadeInDown" data-delay="{{ animationDelay }}">  
+                <div class="judge col-md-{{ colWidth }} col-xs-6 animated hiding" data-animation="fadeInDown" data-delay="{{ animationDelay }}">
-                    <div class="rockstar-speaker">
                     <div class="flow-img img-circle judge-img" style="background-image: url({{ site.baseurl }}/img/speakers/{{ judge.thumbnailUrl }})"></div>
-                        <div class="name">{{ judge.name }} {{ judge.surname }}</div>
+                    <p class="name">{{ judge.name }} {{ judge.surname }}</p>
-                        <div class="sub">{{ judge.company }}</div>
+                    <span class="company">{{ judge.company }}</span>
-                        <div class="sub">{{ judge.title }}</div>
+                    <span class="title">{{ judge.title }}</span>
-                    </div>
                 </div>
                 {% assign animationDelay = animationDelay | plus:500 %} 
                 {% assign check = forloop.index | modulo:2 %} 
-                {% if check == 0 %} <div class="clearfix visible-xs"></div> {% endif %}
+                {% if check == 0 %}
+                <div class="clearfix visible-xs"></div>
+                {% endif %} 
                 {% endfor %}
             </div>
         </div>

_layouts/default.html

@@ -48,7 +48,7 @@
     {% endif %} 
     <script>
         Waves.displayEffect();
-        {% if page.permalink == '/' or page.permalink == '/hackathon/' %}
+        {% if page.permalink == '/' %}
             var googleMaps = 'index',
                 eventPlace = new google.maps.LatLng({{ site.eventPlaceCoordinates }}),
                 centerMap = new google.maps.LatLng({{ site.mapCenterCoordinates }}),
@@ -90,6 +90,12 @@
                 centerMap = new google.maps.LatLng({{ site.logisticsMapCenterCoordinates }}),
                 mobileCenterMap = new google.maps.LatLng({{ site.logisticsMapMobileCenterCoordinates }}),
                 icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
+        {% elsif page.permalink == '/hackathon/' %}
+            var googleMaps = 'hackathon',
+                eventPlace = new google.maps.LatLng({{ site.hackathonPlaceCoordinates }}),
+                centerMap = new google.maps.LatLng({{ site.hackathonMapCenterCoordinates }}),
+                mobileCenterMap = new google.maps.LatLng({{ site.hackathonMapMobileCenterCoordinates }}),
+                icon = '{{ site.baseurl }}/img/svg/map-marker.svg';
         {% endif %} 
     </script>
     <script src="{{ "/js/scripts.min.js" | prepend: site.baseurl }}"></script>

_sass/main.scss

@@ -39,3 +39,4 @@
 @import "partials/schedule";
 @import "partials/about-hackathon";
 @import "partials/judges";
+@import "partials/hackathon-location";

_sass/partials/_about-hackathon.scss

@@ -0,0 +1,44 @@
+$hackathon-img-width: 250px;
+$small-hackathon-img-width: 150px;
+
+.hackathon-row {
+	margin-bottom: 90px;
+	&.float-left {
+		.hackathon-img-wrapper {
+			float: left;
+		}
+		.hackathon-details {
+			text-align: left;
+			margin-right: 0;
+		}
+	}
+	&.float-right {
+		.hackathon-img-wrapper {
+			float: right;
+		}
+		.hackathon-details {
+			text-align: right;
+			margin-left: 0;
+		}
+	}
+}
+.hackathon-img-wrapper {
+	img {
+		max-width: $hackathon-img-width;
+		margin: 0 auto;
+        @media (max-width: 767px) {
+            max-width: $small-hackathon-img-width;
+        }
+	}
+}
+.hackathon-details {
+	margin-left: $hackathon-img-width + 50px;
+	margin-right: $hackathon-img-width + 50px;
+    @media (max-width: 767px) {
+        margin-left: $small-hackathon-img-width + 20px;
+		margin-right: $small-hackathon-img-width + 20px;
+    }
+    p {
+    	font-size: 16px;
+    }
+}

_sass/partials/_hackathon-location.scss

@@ -0,0 +1,3 @@
+.hackathon-location {
+	padding: 172px 0;
+}

_sass/partials/_helper.scss

@@ -92,7 +92,7 @@
     animation: blink .7s infinite;
     opacity: 1;
 }
-@-keyframes blink {
+@keyframes blink {
     0% {
         opacity: 1;
     }

_sass/partials/_judges.scss

@@ -1,8 +1,22 @@
-.judges {
+$judge-image-size: 160px;
 
+.judge {
+    margin-bottom: 45px;
+	.name {
+		margin: 8px 0 4px;
+		font-size: 25px;
+	}
+	.company {
+		margin-top: 6px;
+		display: block;
+		font-size: 18px;
+		line-height: 1.1;
+	}
 }
 .judge-img {
-	width: 140px;
+	width: $judge-image-size;
-	height: 140px;
+	height: $judge-image-size;
 	margin: 0 auto;
+	border: 3px solid #fff;
+    box-shadow: 0 3px 0 rgba(0, 0, 0, .15), 0 3px 4px rgba(0, 0, 0, .2);
 }