Merge pull request nodeday#21 from ckiss/master

Added new speaker (Emily Rose)

Author: totherik

2015-condenast/css/app.css

@@ -294,6 +294,9 @@ body > section h3 {
     background-image: url(../img/Clifton.png);
     background-size: 115%;
 }
+.topic .speaker #emily_rose .hexagon-3 {
+    background-image: url(../img/Emily-Rose.png);
+}
 .topic .speaker-info {
     margin-top: 42px;
     text-align: left;

2015-condenast/img/Emily-Rose.png

@@ -1132,6 +1132,73 @@ <h3 class="title">Clifton Cunningham</h3>
 
 
 
+        <div class="topic topic-talk">
+
+          <div class="wrapper">
+
+            <div class="row">
+
+              <div class="col-sm-2 time">
+
+
+                <!--<div class="icon everywhere"></div>-->
+
+              </div>
+
+              <div class="col-sm-8">
+
+                <h3 class="title">Emily Rose</h3>
+
+                <p class="abstract">
+                </p>
+
+                <p class="link">
+                </p>
+
+                <p class="bio">
+                  <b>About Emily</b> Emily Rose is a transhumanist with a passion for queer cyborg artistry. They are
+                  currently experimenting with ambient intelligence, adaptive automation, and evolving interfaces. Emily
+                  is a world-class speaker who has brought humor and enlightenment to audiences across the globe.
+                  Original NodeBots curator, founder of DanceJS, and one of the most interesting individuals in the
+                  known universe; Emily is an unnatural force of pure, unbridled creativity. Currently at spark.io
+                </p>
+
+              </div>
+
+              <div class="col-sm-2">
+
+                <div class="row speaker">
+
+                  <div class="col-sm-12 col-xs-6 speaker-image">
+
+                    <div class="hexagon-1" id="emily_rose">
+                      <div class="hexagon-2">
+                        <div class="hexagon-3"></div>
+                      </div>
+                    </div>
+
+                  </div>
+
+                  <div class="col-sm-12 col-xs-6 speaker-info">
+
+                    <p class="speaker-name">Emily Rose</p>
+
+                    <p class="speaker-occupation"><br />spark.io</p>
+
+                  </div>
+
+                </div>
+
+              </div>
+
+            </div>
+
+          </div>
+
+        </div>
+
+
+
     </section>
 
     <section id="codeofconduct" aria-labelledby="codeofconductLabel">

2015-condenast/index.html

@@ -1130,6 +1130,71 @@ <h3 class="title">Clifton Cunningham</h3>
 
         </div>
 
+        <div class="topic topic-talk">
+
+          <div class="wrapper">
+
+            <div class="row">
+
+              <div class="col-sm-2 time">
+
+
+                <!--<div class="icon everywhere"></div>-->
+
+              </div>
+
+              <div class="col-sm-8">
+
+                <h3 class="title">Emily Rose</h3>
+
+                <p class="abstract">
+                </p>
+
+                <p class="link">
+                </p>
+
+                <p class="bio">
+                  <b>About Emily</b> Emily Rose is a transhumanist with a passion for queer cyborg artistry. They are
+                  currently experimenting with ambient intelligence, adaptive automation, and evolving interfaces. Emily
+                  is a world-class speaker who has brought humor and enlightenment to audiences across the globe.
+                  Original NodeBots curator, founder of DanceJS, and one of the most interesting individuals in the
+                  known universe; Emily is an unnatural force of pure, unbridled creativity. Currently at spark.io
+                </p>
+
+              </div>
+
+              <div class="col-sm-2">
+
+                <div class="row speaker">
+
+                  <div class="col-sm-12 col-xs-6 speaker-image">
+
+                    <div class="hexagon-1" id="emily_rose">
+                      <div class="hexagon-2">
+                        <div class="hexagon-3"></div>
+                      </div>
+                    </div>
+
+                  </div>
+
+                  <div class="col-sm-12 col-xs-6 speaker-info">
+
+                    <p class="speaker-name">Emily Rose</p>
+
+                    <p class="speaker-occupation"><br />spark.io</p>
+
+                  </div>
+
+                </div>
+
+              </div>
+
+            </div>
+
+          </div>
+
+        </div>
+
 
     </section>