Merge pull request #152 from bsidesnyc/master

Merge in staging

_config.yml

@@ -72,12 +72,12 @@ socialImageSrcFacebook: "/img/seo/sharing-facebook.png"
 #-----------------------------------------------
 navigationLinks:
  - {permalink: "/venue/", text: "Venue"}
+ - {permalink: "/schedule/", text: "Schedule"}
  - {permalink: "/speakers/", text: "Speakers"}
  - {permalink: "/registration/", text: "Registration"}
  - {permalink: "/sponsors/", text: "Sponsors"}
  - {permalink: "/cfp/", text: "CFP"}
  - {permalink: "/about/", text: "About"}
-# - {permalink: "/schedule/", text: "Schedule"}
 bottomNavigationLinks:
 rightNavigationButtons:
 
@@ -302,4 +302,5 @@ twitterFeed: ""
 sessionizeJsonSpeakerList: https://sessionize.com/api/v2/1kzdzu2h/view/Speakers
 sessionizeJsonSessionList: https://sessionize.com/api/v2/1kzdzu2h/view/Sessions
 sessionizeJsonAllData: https://sessionize.com/api/v2/1kzdzu2h/view/All
+# Important: Select "Use UTC timezone for schedule" for the schedule grid in sessionize
 sessionizeJsonScheduleGrid: https://sessionize.com/api/v2/1kzdzu2h/view/GridSmart

_layouts/default.html

@@ -37,9 +37,11 @@
         Page-dependant Javascript
     -->
     {% if page.permalink == '/speakers/' %}
+        <script src="{{ "/js/schedule.js" | prepend: site.baseurl }}"></script>
         <script src="{{ "/js/speakers.js" | prepend: site.baseurl }}"></script>
         <script>
             onLoad("{{ site.sessionizeJsonAllData }}", "{{ site.baseurl }}");
+            scheduleBuilder("{{ site.sessionizeJsonSpeakerList }}", "{{ site.baseurl }}", "speakerBackfill");
         </script>
     {% elsif page.permalink == '/schedule/' %}
         <script src="{{ "/js/schedule.js" | prepend: site.baseurl }}"></script>

css/main.css

@@ -2734,7 +2734,8 @@ time {
     color: #fff;
     font-weight: 100;
     background-repeat: no-repeat;
-    background-position: center center !important;
+    /* background-position: center center !important; */
+    background-position: 0% 25% !important;
     background-size: cover !important
 }
 
@@ -4269,8 +4270,8 @@ nav li a.current,nav li a:hover {
 }
 
 .lily-effect:hover figure {
-    background-position: center left;
-    background-size: 105%
+    /* background-position: center left; */
+    background-size: 100%
 }
 
 .lily-effect:hover figcaption h2,.lily-effect:hover figcaption .position {
@@ -4298,8 +4299,19 @@ nav li a.current,nav li a:hover {
     height: 100%;
     -webkit-transition: all 0.3s;
     transition: all 0.3s;
-    background-position: -30px;
-    background-size: 115%
+    background-position: -5px; 
+    background-size: 100%
+}
+
+.lily-effect figure.figure-circle {
+    overflow: hidden;
+    width: 55%;
+    height: 100%;
+    border-radius: 50%;
+    -webkit-transition: all 0.3s;
+    transition: all 0.3s;
+    background-position: top; 
+    background-size: 100%
 }
 
 .lily-effect figcaption {
@@ -4352,6 +4364,11 @@ nav li a.current,nav li a:hover {
     height: 200px
 }
 
+.lily-effect .lily-head.lily-head-dark {
+    height: 200px;
+    background: #333;
+}
+
 .lily-effect .lily-bottom {
     clear: both;
     height: 80px;
@@ -6328,24 +6345,24 @@ nav li a.current,nav li a:hover {
         border-right-style: solid;
         border-right-color: #ccc
     }
-    .slot-content.tech-blue{
-        border-right-color: #0000ff
+    .slot-content.tech-blue {
+        border-right-color: #0000ff /* Blue */ 
     }
 
-    .slot-content.tech-other {
-        border-right-color: #ff0000
+    .slot-content.tech-red {
+        border-right-color: #ff0000 /* Red */
     }
 
     .slot-content.tech-other {
-        border-right-color: #ffa500
+        border-right-color: #ffa500 /* Orange */
     }
 
     .slot-content.entrepreneur {
-        border-right-color: #00ff00
+        border-right-color: #00ff00 /* Lime */
     }
 
     .slot-content.workshop {
-        border-right-color: #ffc0cb
+        border-right-color: #ffc0cb /* Pink */
     }