diff options
-rw-r--r-- | images/barchart.png | bin | 0 -> 35110 bytes | |||
-rw-r--r-- | images/chart.png | bin | 0 -> 160060 bytes | |||
-rw-r--r-- | images/io2012_logo.png | bin | 0 -> 18834 bytes | |||
-rw-r--r-- | js/slides.js | 4 | ||||
-rw-r--r-- | template.html | 20 | ||||
-rw-r--r-- | theme/css/default.css | 249 | ||||
-rw-r--r-- | theme/sass/default.scss | 25 |
7 files changed, 175 insertions, 123 deletions
diff --git a/images/barchart.png b/images/barchart.png new file mode 100644 index 0000000..5349b86 --- /dev/null +++ b/images/barchart.png | |||
Binary files differ | |||
diff --git a/images/chart.png b/images/chart.png new file mode 100644 index 0000000..faef742 --- /dev/null +++ b/images/chart.png | |||
Binary files differ | |||
diff --git a/images/io2012_logo.png b/images/io2012_logo.png new file mode 100644 index 0000000..e92436d --- /dev/null +++ b/images/io2012_logo.png | |||
Binary files differ | |||
diff --git a/js/slides.js b/js/slides.js index e397d96..1a6bb57 100644 --- a/js/slides.js +++ b/js/slides.js | |||
@@ -176,11 +176,11 @@ SlideDeck.prototype.loadConfig_ = function() { | |||
176 | 176 | ||
177 | if (settings.title) { | 177 | if (settings.title) { |
178 | document.title = settings.title + ' - Google IO 2012'; | 178 | document.title = settings.title + ' - Google IO 2012'; |
179 | document.querySelector('[data-config-title]').textContent = settings.title; | 179 | document.querySelector('[data-config-title]').innerHTML = settings.title; |
180 | } | 180 | } |
181 | 181 | ||
182 | if (settings.subtitle) { | 182 | if (settings.subtitle) { |
183 | document.querySelector('[data-config-subtitle]').textContent = settings.subtitle; | 183 | document.querySelector('[data-config-subtitle]').innerHTML = settings.subtitle; |
184 | } | 184 | } |
185 | 185 | ||
186 | if (this.config_.presenters) { | 186 | if (this.config_.presenters) { |
diff --git a/template.html b/template.html index b0e2dc6..ee762d9 100644 --- a/template.html +++ b/template.html | |||
@@ -160,6 +160,24 @@ function helloWorld(world) { | |||
160 | </article> | 160 | </article> |
161 | </slide> | 161 | </slide> |
162 | 162 | ||
163 | <slide> | ||
164 | <hgroup> | ||
165 | <h2>Slide with Image</h2> | ||
166 | </hgroup> | ||
167 | <article> | ||
168 | <img src="images/chart.png" alt="Description" title="Description"> | ||
169 | </article> | ||
170 | </slide> | ||
171 | |||
172 | <slide> | ||
173 | <hgroup> | ||
174 | <h2>Slide with Image (centered horz/vert)</h2> | ||
175 | </hgroup> | ||
176 | <article class="flexbox vcenter" style="height: 80%;"> | ||
177 | <img src="images/barchart.png" alt="Description" title="Description"> | ||
178 | </article> | ||
179 | </slide> | ||
180 | |||
163 | <slide class="segue dark nobackground"> | 181 | <slide class="segue dark nobackground"> |
164 | <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside> | 182 | <aside class="gdbar"><img src="images/google_developers_icon_128.png"></aside> |
165 | <hgroup class="auto-fadein"> | 183 | <hgroup class="auto-fadein"> |
@@ -206,7 +224,7 @@ function helloWorld(world) { | |||
206 | var slideConfig = { | 224 | var slideConfig = { |
207 | // Slide settings | 225 | // Slide settings |
208 | settings: { | 226 | settings: { |
209 | title: 'Title Goes Here', | 227 | title: 'Title Goes Here<br>Up To Two Lines', |
210 | subtitle: 'Subtitle Goes Here', | 228 | subtitle: 'Subtitle Goes Here', |
211 | theme: 'default', | 229 | theme: 'default', |
212 | hashtag: '#html5', //TODO | 230 | hashtag: '#html5', //TODO |
diff --git a/theme/css/default.css b/theme/css/default.css index 39b7f53..0c9a7d3 100644 --- a/theme/css/default.css +++ b/theme/css/default.css | |||
@@ -223,7 +223,7 @@ body { | |||
223 | background-attachment: fixed; | 223 | background-attachment: fixed; |
224 | } | 224 | } |
225 | 225 | ||
226 | /* line 51, ../sass/default.scss */ | 226 | /* line 50, ../sass/default.scss */ |
227 | slides > slide { | 227 | slides > slide { |
228 | width: 900px; | 228 | width: 900px; |
229 | height: 700px; | 229 | height: 700px; |
@@ -248,13 +248,13 @@ slides > slide { | |||
248 | transition: all 0.3s ease-out; | 248 | transition: all 0.3s ease-out; |
249 | } | 249 | } |
250 | 250 | ||
251 | /* line 67, ../sass/default.scss */ | 251 | /* line 66, ../sass/default.scss */ |
252 | slides.layout-widescreen > slide { | 252 | slides.layout-widescreen > slide { |
253 | margin-left: -550px; | 253 | margin-left: -550px; |
254 | width: 1100px; | 254 | width: 1100px; |
255 | } | 255 | } |
256 | 256 | ||
257 | /* line 72, ../sass/default.scss */ | 257 | /* line 71, ../sass/default.scss */ |
258 | slides.layout-faux-widescreen > slide { | 258 | slides.layout-faux-widescreen > slide { |
259 | margin-left: -550px; | 259 | margin-left: -550px; |
260 | width: 1100px; | 260 | width: 1100px; |
@@ -273,10 +273,10 @@ slides.nobackground slide:not(.fill)::before { | |||
273 | color: inherit !important; | 273 | color: inherit !important; |
274 | } | 274 | } |
275 | */ | 275 | */ |
276 | /* line 98, ../sass/default.scss */ | 276 | /* line 97, ../sass/default.scss */ |
277 | slides > slide:not(.fill):not(.nobackground):before { | 277 | slides > slide:not(.fill):not(.nobackground):before { |
278 | font-size: 12pt; | 278 | font-size: 12pt; |
279 | content: "#io2012 @yourtwitter"; | 279 | content: "#io2012"; |
280 | position: absolute; | 280 | position: absolute; |
281 | bottom: 20px; | 281 | bottom: 20px; |
282 | left: 60px; | 282 | left: 60px; |
@@ -289,7 +289,7 @@ slides > slide:not(.fill):not(.nobackground):before { | |||
289 | height: 30px; | 289 | height: 30px; |
290 | line-height: 1.9; | 290 | line-height: 1.9; |
291 | } | 291 | } |
292 | /* line 110, ../sass/default.scss */ | 292 | /* line 109, ../sass/default.scss */ |
293 | slides > slide:not(.fill):not(.nobackground):after { | 293 | slides > slide:not(.fill):not(.nobackground):after { |
294 | font-size: 12pt; | 294 | font-size: 12pt; |
295 | content: attr(data-slide-num) "/" attr(data-total-slides); | 295 | content: attr(data-slide-num) "/" attr(data-total-slides); |
@@ -299,12 +299,27 @@ slides > slide:not(.fill):not(.nobackground):after { | |||
299 | line-height: 1.9; | 299 | line-height: 1.9; |
300 | } | 300 | } |
301 | 301 | ||
302 | /* line 120, ../sass/default.scss */ | ||
303 | slides > slide.title-slide:after { | ||
304 | content: ''; | ||
305 | background: url(../../images/io2012_logo.png) no-repeat 100% 50%; | ||
306 | -moz-background-size: contain; | ||
307 | -webkit-background-size: contain; | ||
308 | -o-background-size: contain; | ||
309 | background-size: contain; | ||
310 | position: absolute; | ||
311 | bottom: 40px; | ||
312 | right: 40px; | ||
313 | width: 100%; | ||
314 | height: 60px; | ||
315 | } | ||
316 | |||
302 | /*slides.layout-widescreen > slide:not(.nobackground), | 317 | /*slides.layout-widescreen > slide:not(.nobackground), |
303 | slides.layout-faux-widescreen > slide:not(.nobackground) { | 318 | slides.layout-faux-widescreen > slide:not(.nobackground) { |
304 | background-position-x: 0, 840px; | 319 | background-position-x: 0, 840px; |
305 | }*/ | 320 | }*/ |
306 | /* Slides */ | 321 | /* Slides */ |
307 | /* line 127, ../sass/default.scss */ | 322 | /* line 139, ../sass/default.scss */ |
308 | slides > slide { | 323 | slides > slide { |
309 | display: none; | 324 | display: none; |
310 | font-family: 'Open Sans', Arial, sans-serif; | 325 | font-family: 'Open Sans', Arial, sans-serif; |
@@ -316,7 +331,7 @@ slides > slide { | |||
316 | background: -ms-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); | 331 | background: -ms-linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); |
317 | background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); | 332 | background: linear-gradient(#ffffff, #ffffff 85%, #e6e6e6); |
318 | } | 333 | } |
319 | /* line 138, ../sass/default.scss */ | 334 | /* line 150, ../sass/default.scss */ |
320 | slides > slide.far-past { | 335 | slides > slide.far-past { |
321 | display: block; | 336 | display: block; |
322 | -moz-transform: translate(-2040px); | 337 | -moz-transform: translate(-2040px); |
@@ -330,7 +345,7 @@ slides > slide.far-past { | |||
330 | -ms-transform: translate3d(-2040px, 0, 0); | 345 | -ms-transform: translate3d(-2040px, 0, 0); |
331 | transform: translate3d(-2040px, 0, 0); | 346 | transform: translate3d(-2040px, 0, 0); |
332 | } | 347 | } |
333 | /* line 144, ../sass/default.scss */ | 348 | /* line 156, ../sass/default.scss */ |
334 | slides > slide.past { | 349 | slides > slide.past { |
335 | display: block; | 350 | display: block; |
336 | -moz-transform: translate(-1020px) rotateY(30deg) rotateX(45deg); | 351 | -moz-transform: translate(-1020px) rotateY(30deg) rotateX(45deg); |
@@ -344,7 +359,7 @@ slides > slide.past { | |||
344 | -ms-transform: translate3d(-1020px, 0, 0) rotateY(30deg) rotateX(45deg); | 359 | -ms-transform: translate3d(-1020px, 0, 0) rotateY(30deg) rotateX(45deg); |
345 | transform: translate3d(-1020px, 0, 0) rotateY(30deg) rotateX(45deg); | 360 | transform: translate3d(-1020px, 0, 0) rotateY(30deg) rotateX(45deg); |
346 | } | 361 | } |
347 | /* line 150, ../sass/default.scss */ | 362 | /* line 162, ../sass/default.scss */ |
348 | slides > slide.current { | 363 | slides > slide.current { |
349 | display: block; | 364 | display: block; |
350 | -moz-transform: translate(0); | 365 | -moz-transform: translate(0); |
@@ -358,15 +373,18 @@ slides > slide.current { | |||
358 | -ms-transform: translate3d(0, 0, 0); | 373 | -ms-transform: translate3d(0, 0, 0); |
359 | transform: translate3d(0, 0, 0); | 374 | transform: translate3d(0, 0, 0); |
360 | } | 375 | } |
361 | /* line 155, ../sass/default.scss */ | 376 | /* line 167, ../sass/default.scss */ |
362 | slides > slide.current .auto-fadein { | 377 | slides > slide.current .auto-fadein { |
363 | opacity: 1; | 378 | opacity: 1; |
364 | } | 379 | } |
365 | /* line 159, ../sass/default.scss */ | 380 | /* line 171, ../sass/default.scss */ |
366 | slides > slide.current .gdbar { | 381 | slides > slide.current .gdbar { |
382 | -moz-background-size: 100% 100%; | ||
383 | -webkit-background-size: 100% 100%; | ||
384 | -o-background-size: 100% 100%; | ||
367 | background-size: 100% 100%; | 385 | background-size: 100% 100%; |
368 | } | 386 | } |
369 | /* line 164, ../sass/default.scss */ | 387 | /* line 176, ../sass/default.scss */ |
370 | slides > slide.next { | 388 | slides > slide.next { |
371 | display: block; | 389 | display: block; |
372 | -moz-transform: translate(1020px) rotateY(-30deg) rotateX(45deg); | 390 | -moz-transform: translate(1020px) rotateY(-30deg) rotateX(45deg); |
@@ -380,7 +398,7 @@ slides > slide.next { | |||
380 | -ms-transform: translate3d(1020px, 0, 0) rotateY(-30deg) rotateX(45deg); | 398 | -ms-transform: translate3d(1020px, 0, 0) rotateY(-30deg) rotateX(45deg); |
381 | transform: translate3d(1020px, 0, 0) rotateY(-30deg) rotateX(45deg); | 399 | transform: translate3d(1020px, 0, 0) rotateY(-30deg) rotateX(45deg); |
382 | } | 400 | } |
383 | /* line 170, ../sass/default.scss */ | 401 | /* line 182, ../sass/default.scss */ |
384 | slides > slide.far-next { | 402 | slides > slide.far-next { |
385 | display: block; | 403 | display: block; |
386 | -moz-transform: translate(2040px); | 404 | -moz-transform: translate(2040px); |
@@ -394,20 +412,20 @@ slides > slide.far-next { | |||
394 | -ms-transform: translate3d(2040px, 0, 0); | 412 | -ms-transform: |