v.0.1.1

gdg-x · Mar 9, 2015 · 23cbec8 · 23cbec8
1 parent f0af279
commit 23cbec8
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 6 deletions.
diff --git a/app/_assets/scss/partials/general/_modal.scss b/app/_assets/scss/partials/general/_modal.scss
@@ -1,6 +1,7 @@
 $modal-color: #757575;
 $modal-highlight-color: #212121;
 .modal {
+    z-index: 1050;
     .icon-cross {
         width: 19px;
         height: 19px;
@@ -22,6 +23,14 @@ $modal-highlight-color: #212121;
         }
     }
 }
+.modal-backdrop {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    right: 0;
+    left: 0;
+    z-index: 1040;
+}
 .modal-content {
     border-radius: 4px;
     box-shadow: 0 5px 15px rgba(0, 0, 0, .3);

diff --git a/app/_assets/scss/partials/general/_navigation.scss b/app/_assets/scss/partials/general/_navigation.scss
@@ -139,10 +139,13 @@ nav {
     }
 }
 .right-nav-button {
-    margin: 11px 65px 0 0;
+    margin: 11px 11px 0 0;
     transition: $base-transition;
     opacity: 1;
     display: block;
+    &:nth-of-type(1) {
+        margin-right: 65px;
+    }
     a {
         font-size: $base-font-size * 90 / 100;
     }

diff --git a/app/_assets/scss/partials/schedule/_schedule.scss b/app/_assets/scss/partials/schedule/_schedule.scss
@@ -185,3 +185,6 @@ $small-label-width: 80px;
     right: 15px;
     top: 20px;
 }
+.service-description {
+    margin-top: 15px;
+}
diff --git a/app/_data/en/schedule/sessions-data.yml b/app/_data/en/schedule/sessions-data.yml
@@ -3,6 +3,7 @@
   title: "Coffee Break"
   place: "Hall"
   service: true
+  description: "The best time to talk with speakers and attendees"
 -
   id: 503
   title: "Lunch Break"

diff --git a/app/_data/uk/schedule/sessions-data.yml b/app/_data/uk/schedule/sessions-data.yml
@@ -3,6 +3,7 @@
   title: "Coffee Break"
   place: "Hall"
   service: true
+  description: "The best time to talk with speakers and attendees"
 -
   id: 503
   title: "Lunch Break"

diff --git a/app/_includes/general/footer.html b/app/_includes/general/footer.html
@@ -51,7 +51,7 @@ <h5>{{ site.data.[site.lang].general.footer.languagesTitle }}</h5>
 		<!-- Please don't delete this line-->
 		<div class="col-md-6">
 			<p class="copyright">
-				&copy; 2015 Based on <a href="https://github.com/gdg-x/zeppelin" target="_blank">Project Zeppelin</a>. Designed and created by <a href="http://o.zasadnyy.com/" target="_blank">Oleh Zasadnyy</a> &middot; <a href="http://lviv.gdg.org.ua" target="_blank">GDG Lviv</a>
+				&copy; 2015 Based on <a href="https://github.com/gdg-x/zeppelin-grunt" target="_blank">Project Zeppelin-Grunt</a>. Designed and created by <a href="http://o.zasadnyy.com/" target="_blank">Oleh Zasadnyy</a> &middot; <a href="http://lviv.gdg.org.ua" target="_blank">GDG Lviv</a>
 			</p>
 		</div>
 	</div>

diff --git a/app/_includes/schedule/schedule.html b/app/_includes/schedule/schedule.html
@@ -62,6 +62,9 @@ <h5 class="slot-title" itemprop="name">{{ session.title }}</h5>
                                     <div class="color-line"></div>
                                     <div class="slot-content">
                                         <h5 class="slot-title" itemprop="name">{{ session.title }}</h5>
+                                        {% if session.description != null %}
+                                        <p class="service-description">{{ session.description }}</p>
+                                        {% endif %}
                                     </div>
                                 </div>
                                 {% endif %}

diff --git a/app/_includes/schedule/sessions-modals.html b/app/_includes/schedule/sessions-modals.html
@@ -12,8 +12,12 @@
 							<div class="close-mask" data-dismiss="modal"></div>
 						</div>
 						<h4>{{ session.title }}</h4>
+						{% if session.language != null %}
 						<span class="theme-metadata"><span class="caption">Language: </span>{{ session.language }}</span>
+						{% endif %}
+						{% if session.complexity != null %}
 						<span class="theme-metadata"><span class="caption">Complexity: </span>{{ session.complexity }}</span>
+						{% endif %}
 						{% if session.video %}
 						<div class="theme-video embed-responsive embed-responsive-16by9">
 						    <iframe class="embed-responsive-item" src="{{ session.video }}"></iframe>

diff --git a/app/_includes/speakers/speakers-list.html b/app/_includes/speakers/speakers-list.html
@@ -44,7 +44,7 @@ <h2 class="name">{{ speaker.name }} <span>{{ speaker.surname }}</span></h2>
                                     <p class="position">{{ speaker.company }}</p>
                                 {% endif %}
                             </ul>
-                            <a href="#" class="slider-next-item {% if sessionsNumber == 1 %}hidden{% endif %}">Next</a>
+                            <a href="#" class="slider-next-item {% if sessionsNumber < 1 %}hidden{% endif %}">Next</a>
                         </div>
                     </div>
                 </div>

diff --git a/app/_includes/speakers/speakers-modals.html b/app/_includes/speakers/speakers-modals.html
@@ -17,8 +17,12 @@
 								{% for session_speaker in session.speakers %}
 									{% if session_speaker == speaker.id %}
 										<h4>{{ session.title }}</h4>
+										{% if session.language != null %}
 										<span class="theme-metadata"><span class="caption">Language: </span>{{ session.language }}</span>
+										{% endif %}
+										{% if session.complexity != null %}
 										<span class="theme-metadata"><span class="caption">Complexity: </span>{{ session.complexity }}</span>
+										{% endif %}
 										{% if session.video %}
 										<div class="theme-video embed-responsive embed-responsive-16by9">
 										    <iframe class="embed-responsive-item" src="{{ session.video }}"></iframe>

diff --git a/app/_layouts/default.html b/app/_layouts/default.html
@@ -90,7 +90,7 @@
                 rockstarSpeakers.sort(function() {return 0.5 - Math.random()});
                 if(rockstarSpeakers.length > 0) {
                     var animationDelay = 1500,
-                        count = {{ site.data.[site.lang].index.rockstar-speakers.count }},
+                        count = Math.min({{ site.data.[site.lang].index.rockstar-speakers.count }}, rockstarSpeakers.length),
                         colWidth = 12/count;
                     for(i=0; i<count; i++) {
                         var clearfix = '<div class="clearfix visible-xs"></div>';

diff --git a/package.json b/package.json
@@ -15,9 +15,9 @@
         "grunt-contrib-imagemin": "~0.9.3",
         "grunt-contrib-uglify": "~0.8.0",
         "grunt-contrib-watch": "~0.6.1",
-        "grunt-critical": "~0.1.1",
+        "grunt-critical": "~0.1.2",
         "grunt-jekyll": "~0.4.2",
-        "grunt-sass": "~0.18.0",
+        "grunt-sass": "~0.18.1",
         "grunt-svgmin": "~2.0.1",
         "jit-grunt": "~0.9.1",
         "time-grunt": "~1.1.0"