Add upcoming events

emorikawa · May 4, 2016 · 3f1f0c8 · 3f1f0c8
1 parent f40a1a7
commit 3f1f0c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/css/main.scss b/css/main.scss
@@ -156,7 +156,7 @@ a {
 
   &:checked ~ .talk-list {
     @include transition(height 250ms cubic-bezier(0, 0, 0, 1));
-    height: 176px;
+    height: 317px;
   }
 
   &:checked ~ .talk-text {

diff --git a/index.html b/index.html
@@ -24,6 +24,12 @@ <h1>Evan Morikawa</h1>
   </label>
   <div class="talk-list">
     <ul>
+      <li><a href="https://dinosaurjs.org/speakers">Dinosaur JS</a> &mdash; 2016 June</li>
+      <li><a href="http://oslo.nodeconf.com/#speakers">Node Conf Oslo</a> &mdash; 2016 June</li>
+      <li><a href="http://scotlandjs.com/">Scotland JS</a> &mdash; 2016 June</li>
+      <li><a href="http://2016.empirejs.org/#speakers">Empire JS</a> &mdash; 2016 May</li>
+      <li><a href="http://www.meetup.com/ReactJS-San-Francisco/events/229270815/">SF React</a> &mdash; 2016 May</li>
+      <li><a href="http://www.spacecityjs.com/#Speakers">Space City JS</a> &mdash; 2016 May</li>
       <li><a href="talks/waffle-js-2016-04">Waffle.js</a> &mdash; 2016 Apr</li>
       <li><a href="https://www.youtube.com/watch?v=jRPUB-D1Wx0">Forward Web Technology Summit</a> &mdash; 2016 Feb</li>
       <li><a href="https://www.youtube.com/watch?v=Y0bN7WmMGmg">Manhattan.js</a> &mdash; 2016 Jan</li>