From 6ae87cde6d1ffeb14b703bc7fa822e05a8d258b9 Mon Sep 17 00:00:00 2001 From: Adriaan Cronje Date: Wed, 28 Jan 2015 20:32:22 +0200 Subject: [PATCH 1/2] Schedule links to popup speaker profile --- site/index.html | 380 ++++++++++++++----------- site/stylesheets/screen.css | 120 ++++---- src/partials/_schedule.haml | 290 ++++++++++--------- src/stylesheets/partials/_content.sass | 48 ++-- 4 files changed, 469 insertions(+), 369 deletions(-) diff --git a/site/index.html b/site/index.html index 91c31a6..ec11e59 100755 --- a/site/index.html +++ b/site/index.html @@ -786,114 +786,144 @@

@@ -904,114 +934,144 @@

diff --git a/site/stylesheets/screen.css b/site/stylesheets/screen.css index 1d82c0b..24276e6 100755 --- a/site/stylesheets/screen.css +++ b/site/stylesheets/screen.css @@ -822,44 +822,50 @@ nav#main a { /* line 145, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #schedule li { border-top: 1px solid rgba(255, 255, 255, 0.08); - display: table; + padding: 0px; +} +/* line 148, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a { padding: 10px; + display: table; width: 100%; + text-decoration: none; + color: #eeeeee; } -/* line 150, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ -#schedule li > * { +/* line 154, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a > * { display: table-cell; } -/* line 152, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ -#schedule li time { +/* line 156, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a time { color: #98c9ee; width: 50px; } -/* line 155, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ -#schedule li p { +/* line 159, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a p { padding: 0 0 0 10px; } -/* line 157, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ -#schedule li p span { +/* line 161, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a p span { display: block; font-weight: normal; font-style: italic; } -/* line 161, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ -#schedule li p.speaker { +/* line 165, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a p.speaker { font-weight: bold; } -/* line 164, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ -#schedule li a { +/* line 168, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a a { font-weight: normal; margin-left: 3px; text-align: right; } -/* line 168, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ -#schedule li:hover, #schedule li:focus { +/* line 172, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +#schedule li a:hover, #schedule li a:focus { background: rgba(0, 0, 0, 0.03); } -/* line 170, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 174, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #schedule img { float: left; margin-right: 10px; @@ -872,7 +878,7 @@ nav#main a { border-radius: 50%; } -/* line 176, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 180, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ .highlight { background: rgba(0, 0, 0, 0.1); font-family: "Open Sans", arial; @@ -882,47 +888,47 @@ nav#main a { text-align: center; } -/* line 186, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 190, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors h1 { margin-bottom: 1em; } -/* line 189, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 193, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .big-sponsor { display: table; margin-bottom: 40px; height: 110px; } -/* line 193, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 197, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .big-sponsor p, #sponsors .big-sponsor a { display: table-cell; vertical-align: middle; } -/* line 196, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 200, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .big-sponsor p { margin-bottom: 1em; padding-left: 5%; width: 65%; } -/* line 200, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 204, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .big-sponsor a { width: 30%; } -/* line 202, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 206, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .big-sponsor a img { max-width: 380px; width: 100%; } -/* line 205, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 209, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .big-sponsor.hidden { display: none; } -/* line 207, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 211, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .big-sponsor p { position: absolute; height: 100px; overflow-y: auto; } -/* line 212, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 216, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors ul { *zoom: 1; } @@ -932,11 +938,11 @@ nav#main a { display: table; clear: both; } -/* line 214, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 218, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors ul li { margin-bottom: 40px; } -/* line 216, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 220, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors ul a { display: block; opacity: 0.75; @@ -946,36 +952,36 @@ nav#main a { -o-transition: opacity 0.5s; transition: opacity 0.5s; } -/* line 221, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 225, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors ul a:hover, #sponsors ul a:focus { opacity: 1; } -/* line 223, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 227, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors ul img { max-width: 380px; width: 80%; } -/* line 226, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 230, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors ul.sponsors-list li { text-align: center; } -/* line 229, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 233, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .row { color: #98c9ee; display: block; letter-spacing: 0.05em; margin-top: 7px; } -/* line 234, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 238, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .row a { display: inline; padding: 3px; } -/* line 238, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 242, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .fifth .row { font-size: 0.9em; } -/* line 241, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 245, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors small { background-color: rgba(0, 0, 0, 0.1); color: #c93131; @@ -990,12 +996,12 @@ nav#main a { -khtml-border-radius: 5px; border-radius: 5px; } -/* line 250, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 254, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #sponsors .detail { display: none; } -/* line 254, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 258, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #venue .wrapper > a { background: #1e3146; background: rgba(0, 0, 0, 0.15); @@ -1006,28 +1012,28 @@ nav#main a { padding: 10px 30px 10px 70px; text-decoration: none; } -/* line 263, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 267, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #venue .wrapper > a:hover, #venue .wrapper > a:focus { background: rgba(0, 0, 0, 0.1); } -/* line 265, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 269, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #venue .wrapper > a.more { margin-left: 10px; padding-left: 30px; } -/* line 268, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 272, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #venue img { border: 5px solid white; margin: 10px 0 30px; width: 100%; } -/* line 272, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 276, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #venue .map { border: 5px solid white; margin: 0 20px 0 0; max-width: 200px; } -/* line 276, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 280, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #venue iframe { float: left; position: relative; @@ -1039,12 +1045,12 @@ nav#main a { -khtml-border-radius: 50%; border-radius: 50%; } -/* line 282, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 286, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #venue p { margin-top: 15px; } -/* line 287, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 291, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog .wrapper > a { border-top: 1px solid rgba(255, 255, 255, 0.07); display: block; @@ -1052,7 +1058,7 @@ nav#main a { padding: 15px 0; text-align: center; } -/* line 293, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 297, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog ul { *zoom: 1; } @@ -1062,31 +1068,31 @@ nav#main a { display: table; clear: both; } -/* line 295, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 299, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article { margin-left: 20px; padding: 0 45px; position: relative; } -/* line 299, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 303, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article header { padding-bottom: 12px; } -/* line 301, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 305, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article h2 { line-height: 1.3; } -/* line 303, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 307, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article small { color: #98c9ee; } -/* line 305, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 309, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article time { left: 0; position: absolute; top: 2px; } -/* line 309, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 313, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article time span { color: #98c9ee; font-family: "Patua One", "open sans", arial, sans-serif; @@ -1094,34 +1100,34 @@ nav#main a { letter-spacing: 0.075em; text-transform: uppercase; } -/* line 315, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 319, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article time span.day { font-size: 2.5em; line-height: 0.9; } -/* line 318, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 322, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article time span.month { font-size: 1.3em; line-height: 1; } -/* line 321, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 325, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ #blog article time span.year { font-size: 1.05em; line-height: 1; } -/* line 325, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 329, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ .light { background: rgba(0, 0, 0, 0.2); } -/* line 328, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 332, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ .subtle { color: #dddddd; font-size: 0.8em; } -/* line 332, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ +/* line 336, /Users/adriaan/Dev/rubyfuza/src/stylesheets/partials/_content.sass */ strong { font-weight: bold; } diff --git a/src/partials/_schedule.haml b/src/partials/_schedule.haml index b59855b..0fa7f2e 100644 --- a/src/partials/_schedule.haml +++ b/src/partials/_schedule.haml @@ -9,170 +9,200 @@ %span Thursday, 5 February 2015 %ul %li - %time TBA - %p - %strong Welcome + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Welcome %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/aaron.jpg"}/ - Aaron Patterson - %span The Joy of Programming + %a{href: '#speaker11', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/aaron.jpg"}/ + Aaron Patterson + %span The Joy of Programming %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/kenneth_kalmer.jpg"}/ - Kenneth Kalmer - %span Shattered dreams & broken promises + %a{href: '#speaker5', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/kenneth_kalmer.jpg"}/ + Kenneth Kalmer + %span Shattered dreams & broken promises %li - %time TBA - %p - %strong Break + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Break %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/jackline_mutua.jpg"}/ - Jackline Mutua - %span Yet Another Technical Intimidation Talk + %a{href: '#speaker4', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/jackline_mutua.jpg"}/ + Jackline Mutua + %span Yet Another Technical Intimidation Talk %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/brendon_mclean.jpg"}/ - Brendon McLean - %span Extending Ruby by harnessing other languages + %a{href: '#speaker1', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/brendon_mclean.jpg"}/ + Brendon McLean + %span Extending Ruby by harnessing other languages %li - %time TBA - %p - %strong Lightning talks + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Lightning talks %li - %time TBA - %p - %strong Lunch + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Lunch %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/loren_segal.jpg"}/ - Loren Segal - %span How not to rewrite your library: tips on stable APIs + %a{href: '#speaker9', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/loren_segal.jpg"}/ + Loren Segal + %span How not to rewrite your library: tips on stable APIs %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/che_nxusani.jpg"}/ - Ché Nxusani - %span I drank the Single Page App kool-aid + %a{href: '#speaker17', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/che_nxusani.jpg"}/ + Ché Nxusani + %span I drank the Single Page App kool-aid %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/theo_bohnen.jpg"}/ - Theo Bohnen - %span Why I'm a polyglot and why you should care! + %a{href: '#speaker16', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/theo_bohnen.jpg"}/ + Theo Bohnen + %span Why I'm a polyglot and why you should care! %li - %time TBA - %p - %strong Break + %a{href: '#speaker13', class: 'fancybox'} + %time TBA + %p + %strong Break %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/grant_speelman.jpg"}/ - Grant Speelman - %span The not so very Short Migration to Rails 3.0 + %a{href: '#speaker13', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/grant_speelman.jpg"}/ + Grant Speelman + %span The not so very Short Migration to Rails 3.0 %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/raymond_t_hightower.png"}/ - Ray Hightower - %span Citizen Science With OpenROV + %a{href: '#speaker20', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/raymond_t_hightower.png"}/ + Ray Hightower + %span Citizen Science With OpenROV %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/steven_mcd.png"}/ - Steven McDonald - %span Mentoring and being mentored - tips and tricks + %a{href: '#speaker19', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/steven_mcd.png"}/ + Steven McDonald + %span Mentoring and being mentored - tips and tricks .half %h2 Day Two %span Friday, 6 February 2015 %ul %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/charles_nutter.jpg"}/ - Charles Nutter - %span Over 9000: JRuby in 2015 + %a{href: '#speaker10', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/charles_nutter.jpg"}/ + Charles Nutter + %span Over 9000: JRuby in 2015 %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/garren_smith.jpg"}/ - Garren Smith - %span Introducing Couchdb 2.0 + %a{href: '#speaker3', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/garren_smith.jpg"}/ + Garren Smith + %span Introducing Couchdb 2.0 %li - %time TBA - %p - %strong Break + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Break %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/simon_stewart.jpg"}/ - Simon Stewart - %span How to be an effective Freelancer by not learning from corporates + %a{href: '#speaker8', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/simon_stewart.jpg"}/ + Simon Stewart + %span How to be an effective Freelancer by not learning from corporates %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/chris_stefano.jpg"}/ - Chris Stefano - %span Riveting Rails + %a{href: '#speaker2', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/chris_stefano.jpg"}/ + Chris Stefano + %span Riveting Rails %li - %time TBA - %p - %strong Lightning talks + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Lightning talks %li - %time TBA - %p - %strong Lunch + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Lunch %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/lydia_abel.jpg"}/ - Lydia Abel - %span Rebranding the 3R’s: reading, reasoning and robotics + %a{href: '#speaker18', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/lydia_abel.jpg"}/ + Lydia Abel + %span Rebranding the 3R’s: reading, reasoning and robotics %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/simon_van_dyk.png"}/ - Simon van Dyk - %span Diagnosing cancer with Machine Learning + %a{href: '#speaker14', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/simon_van_dyk.png"}/ + Simon van Dyk + %span Diagnosing cancer with Machine Learning %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/pawel_janiak.png"}/ - Pawel Janiak - %span Should we care about accessibility? + %a{href: '#speaker15', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/pawel_janiak.png"}/ + Pawel Janiak + %span Should we care about accessibility? %li - %time TBA - %p - %strong Break + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Break %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/alyson_la.jpg"}/ - Alyson La - %span How I got started in Ruby & Rails after a RailsBridge Workshop + %a{href: '#speaker12', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/alyson_la.jpg"}/ + Alyson La + %span How I got started in Ruby & Rails after a RailsBridge Workshop %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/mandla_magagula.jpg"}/ - Mandla Magagula - %span Fixing the future of programming + %a{href: '#speaker6', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/mandla_magagula.jpg"}/ + Mandla Magagula + %span Fixing the future of programming %li - %time TBA - %p.speaker - %img{:src => "../images/speakers/2015/marc_heiligers.jpg"}/ - Marc Heiligers - %span Sweet Ruby + %a{href: '#speaker7', class: 'fancybox'} + %time TBA + %p.speaker + %img{:src => "../images/speakers/2015/marc_heiligers.jpg"}/ + Marc Heiligers + %span Sweet Ruby %li - %time TBA - %p - %strong Closing + %a{href: 'javascript:void(0);'} + %time TBA + %p + %strong Closing / %section#schedule / .wrapper diff --git a/src/stylesheets/partials/_content.sass b/src/stylesheets/partials/_content.sass index 8d20371..8f380bb 100755 --- a/src/stylesheets/partials/_content.sass +++ b/src/stylesheets/partials/_content.sass @@ -144,29 +144,33 @@ margin-bottom: 30px li border-top: 1px solid rgba(255, 255, 255, 0.08) - display: table - padding: 10px - width: 100% - > * - display: table-cell - time - color: $one - width: 50px - p - padding: 0 0 0 10px - span - display: block - font-weight: normal - font-style: italic - &.speaker - font-weight: bold - + padding: 0px a - font-weight: normal - margin-left: 3px - text-align: right - &:hover, &:focus - background: rgba(0, 0, 0, 0.03) + padding: 10px + display: table + width: 100% + text-decoration: none + color: $light + > * + display: table-cell + time + color: $one + width: 50px + p + padding: 0 0 0 10px + span + display: block + font-weight: normal + font-style: italic + &.speaker + font-weight: bold + + a + font-weight: normal + margin-left: 3px + text-align: right + &:hover, &:focus + background: rgba(0, 0, 0, 0.03) img float: left margin-right: 10px From e17d8ba8548455f886a5a23df23a3d8bbf0bbdba Mon Sep 17 00:00:00 2001 From: Adriaan Cronje Date: Tue, 3 Feb 2015 10:34:25 +0200 Subject: [PATCH 2/2] Times to schedule --- site/index.html | 112 ++++++++++++++++++------------ src/partials/_schedule.haml | 133 ++++++++++++++++++++---------------- 2 files changed, 142 insertions(+), 103 deletions(-) diff --git a/site/index.html b/site/index.html index ec11e59..42ddbd3 100755 --- a/site/index.html +++ b/site/index.html @@ -787,7 +787,7 @@

@@ -933,9 +941,17 @@

Friday, 6 February 2015

    +
  • + + +

    + Welcome +

    +     +
  • - +

    Charles Nutter @@ -945,7 +961,7 @@

  • - +

    Garren Smith @@ -953,17 +969,9 @@

    • -
  • - - -

    - Break -

    -     -
  • - +

    Simon Stewart @@ -971,9 +979,17 @@

    • +
  • + + +

    + Break +

    +     +
  • - +

    Chris Stefano @@ -983,33 +999,41 @@

  • - +

    Lightning talks

    • +
  • + + +

    + + Lydia Abel + Rebranding the 3R’s: reading, reasoning and robotics +

    +     +
  • - +

    - Lunch + Robotics demo

  • - - -

    - - Lydia Abel - Rebranding the 3R’s: reading, reasoning and robotics + + +

    + Lunch

  • - +

    Simon van Dyk @@ -1019,7 +1043,7 @@

  • - +

    Pawel Janiak @@ -1029,7 +1053,7 @@

  • - +

    Break

    @@ -1037,7 +1061,7 @@

  • - +

    Alyson La @@ -1047,7 +1071,7 @@

  • - +

    Mandla Magagula @@ -1057,7 +1081,7 @@

  • - +

    Marc Heiligers @@ -1067,9 +1091,9 @@

  • - +

    - Closing + Closing and Dinner

    • diff --git a/src/partials/_schedule.haml b/src/partials/_schedule.haml index 0fa7f2e..2591f27 100644 --- a/src/partials/_schedule.haml +++ b/src/partials/_schedule.haml @@ -10,199 +10,214 @@ %ul %li %a{href: 'javascript:void(0);'} - %time TBA + %time 9:30 %p %strong Welcome %li %a{href: '#speaker11', class: 'fancybox'} - %time TBA + %time 9:40 %p.speaker - %img{:src => "../images/speakers/2015/aaron.jpg"}/ + %img{:src => "../images/speakers/2015/aaron.jpg"} Aaron Patterson %span The Joy of Programming %li %a{href: '#speaker5', class: 'fancybox'} - %time TBA + %time 10:30 %p.speaker - %img{:src => "../images/speakers/2015/kenneth_kalmer.jpg"}/ + %img{:src => "../images/speakers/2015/kenneth_kalmer.jpg"} Kenneth Kalmer %span Shattered dreams & broken promises %li %a{href: 'javascript:void(0);'} - %time TBA + %time 11:00 %p %strong Break %li %a{href: '#speaker4', class: 'fancybox'} - %time TBA + %time 11:30 %p.speaker - %img{:src => "../images/speakers/2015/jackline_mutua.jpg"}/ + %img{:src => "../images/speakers/2015/jackline_mutua.jpg"} Jackline Mutua %span Yet Another Technical Intimidation Talk %li %a{href: '#speaker1', class: 'fancybox'} - %time TBA + %time 12:00 %p.speaker - %img{:src => "../images/speakers/2015/brendon_mclean.jpg"}/ + %img{:src => "../images/speakers/2015/brendon_mclean.jpg"} Brendon McLean %span Extending Ruby by harnessing other languages %li %a{href: 'javascript:void(0);'} - %time TBA + %time 12:30 %p %strong Lightning talks %li %a{href: 'javascript:void(0);'} - %time TBA + %time 13:00 %p %strong Lunch %li %a{href: '#speaker9', class: 'fancybox'} - %time TBA + %time 14:00 %p.speaker - %img{:src => "../images/speakers/2015/loren_segal.jpg"}/ + %img{:src => "../images/speakers/2015/loren_segal.jpg"} Loren Segal %span How not to rewrite your library: tips on stable APIs %li %a{href: '#speaker17', class: 'fancybox'} - %time TBA + %time 14:30 %p.speaker - %img{:src => "../images/speakers/2015/che_nxusani.jpg"}/ + %img{:src => "../images/speakers/2015/che_nxusani.jpg"} Ché Nxusani %span I drank the Single Page App kool-aid %li %a{href: '#speaker16', class: 'fancybox'} - %time TBA + %time 15:00 %p.speaker - %img{:src => "../images/speakers/2015/theo_bohnen.jpg"}/ + %img{:src => "../images/speakers/2015/theo_bohnen.jpg"} Theo Bohnen %span Why I'm a polyglot and why you should care! %li %a{href: '#speaker13', class: 'fancybox'} - %time TBA + %time 15:30 %p %strong Break %li %a{href: '#speaker13', class: 'fancybox'} - %time TBA + %time 16:00 %p.speaker - %img{:src => "../images/speakers/2015/grant_speelman.jpg"}/ + %img{:src => "../images/speakers/2015/grant_speelman.jpg"} Grant Speelman %span The not so very Short Migration to Rails 3.0 %li %a{href: '#speaker20', class: 'fancybox'} - %time TBA + %time 16:30 %p.speaker - %img{:src => "../images/speakers/2015/raymond_t_hightower.png"}/ + %img{:src => "../images/speakers/2015/raymond_t_hightower.png"} Ray Hightower %span Citizen Science With OpenROV %li %a{href: '#speaker19', class: 'fancybox'} - %time TBA + %time 17:00 %p.speaker - %img{:src => "../images/speakers/2015/steven_mcd.png"}/ + %img{:src => "../images/speakers/2015/steven_mcd.png"} Steven McDonald %span Mentoring and being mentored - tips and tricks + %li + %a{href: 'javascript:void(0);'} + %time 17:30 + %p + %strong Closing and Drinks .half %h2 Day Two %span Friday, 6 February 2015 %ul + %li + %a{href: 'javascript:void(0);'} + %time 9:00 + %p + %strong Welcome %li %a{href: '#speaker10', class: 'fancybox'} - %time TBA + %time 9:10 %p.speaker - %img{:src => "../images/speakers/2015/charles_nutter.jpg"}/ + %img{:src => "../images/speakers/2015/charles_nutter.jpg"} Charles Nutter %span Over 9000: JRuby in 2015 %li %a{href: '#speaker3', class: 'fancybox'} - %time TBA + %time 10:00 %p.speaker - %img{:src => "../images/speakers/2015/garren_smith.jpg"}/ + %img{:src => "../images/speakers/2015/garren_smith.jpg"} Garren Smith %span Introducing Couchdb 2.0 - %li - %a{href: 'javascript:void(0);'} - %time TBA - %p - %strong Break %li %a{href: '#speaker8', class: 'fancybox'} - %time TBA + %time 10:30 %p.speaker - %img{:src => "../images/speakers/2015/simon_stewart.jpg"}/ + %img{:src => "../images/speakers/2015/simon_stewart.jpg"} Simon Stewart %span How to be an effective Freelancer by not learning from corporates + %li + %a{href: 'javascript:void(0);'} + %time 11:00 + %p + %strong Break %li %a{href: '#speaker2', class: 'fancybox'} - %time TBA + %time 11:30 %p.speaker - %img{:src => "../images/speakers/2015/chris_stefano.jpg"}/ + %img{:src => "../images/speakers/2015/chris_stefano.jpg"} Chris Stefano %span Riveting Rails %li %a{href: 'javascript:void(0);'} - %time TBA + %time 12:00 %p %strong Lightning talks - %li - %a{href: 'javascript:void(0);'} - %time TBA - %p - %strong Lunch %li %a{href: '#speaker18', class: 'fancybox'} - %time TBA + %time 12:30 %p.speaker - %img{:src => "../images/speakers/2015/lydia_abel.jpg"}/ + %img{:src => "../images/speakers/2015/lydia_abel.jpg"} Lydia Abel %span Rebranding the 3R’s: reading, reasoning and robotics + %li + %a{href: 'javascript:void(0);'} + %time 13:00 + %p + %strong Robotics demo + %li + %a{href: 'javascript:void(0);'} + %time 13:30 + %p + %strong Lunch %li %a{href: '#speaker14', class: 'fancybox'} - %time TBA + %time 14:30 %p.speaker - %img{:src => "../images/speakers/2015/simon_van_dyk.png"}/ + %img{:src => "../images/speakers/2015/simon_van_dyk.png"} Simon van Dyk %span Diagnosing cancer with Machine Learning %li %a{href: '#speaker15', class: 'fancybox'} - %time TBA + %time 15:00 %p.speaker - %img{:src => "../images/speakers/2015/pawel_janiak.png"}/ + %img{:src => "../images/speakers/2015/pawel_janiak.png"} Pawel Janiak %span Should we care about accessibility? %li %a{href: 'javascript:void(0);'} - %time TBA + %time 15:30 %p %strong Break %li %a{href: '#speaker12', class: 'fancybox'} - %time TBA + %time 16:00 %p.speaker - %img{:src => "../images/speakers/2015/alyson_la.jpg"}/ + %img{:src => "../images/speakers/2015/alyson_la.jpg"} Alyson La %span How I got started in Ruby & Rails after a RailsBridge Workshop %li %a{href: '#speaker6', class: 'fancybox'} - %time TBA + %time 16:30 %p.speaker - %img{:src => "../images/speakers/2015/mandla_magagula.jpg"}/ + %img{:src => "../images/speakers/2015/mandla_magagula.jpg"} Mandla Magagula %span Fixing the future of programming %li %a{href: '#speaker7', class: 'fancybox'} - %time TBA + %time 17:00 %p.speaker - %img{:src => "../images/speakers/2015/marc_heiligers.jpg"}/ + %img{:src => "../images/speakers/2015/marc_heiligers.jpg"} Marc Heiligers %span Sweet Ruby %li %a{href: 'javascript:void(0);'} - %time TBA + %time 17:30 %p - %strong Closing + %strong Closing and Dinner / %section#schedule / .wrapper