diff options
-rw-r--r-- | images/chrome-logo-tiny.png | bin | 0 -> 4125 bytes | |||
-rw-r--r-- | js/slides.js | 13 | ||||
-rw-r--r-- | slide_config.json | 14 | ||||
-rw-r--r-- | template.html | 1 |
4 files changed, 8 insertions, 20 deletions
diff --git a/images/chrome-logo-tiny.png b/images/chrome-logo-tiny.png new file mode 100644 index 0000000..6dcf46e --- /dev/null +++ b/images/chrome-logo-tiny.png | |||
Binary files differ | |||
diff --git a/js/slides.js b/js/slides.js index 3251982..9ad0290 100644 --- a/js/slides.js +++ b/js/slides.js | |||
@@ -296,7 +296,7 @@ SlideDeck.prototype.loadConfig_ = function(config) { | |||
296 | } | 296 | } |
297 | 297 | ||
298 | /* Left/Right tap areas. Default to including. */ | 298 | /* Left/Right tap areas. Default to including. */ |
299 | if (!!!('enableSideAreas' in settings) || settings.enableSideAreas) { | 299 | if (!!!('enableSlideAreas' in settings) || settings.enableSlideAreas) { |
300 | var el = document.createElement('div'); | 300 | var el = document.createElement('div'); |
301 | el.classList.add('slide-area'); | 301 | el.classList.add('slide-area'); |
302 | el.id = 'prev-slide-area'; | 302 | el.id = 'prev-slide-area'; |
@@ -668,16 +668,6 @@ SlideDeck.prototype.loadTheme_ = function(theme) { | |||
668 | } | 668 | } |
669 | document.querySelector('head').appendChild(style); | 669 | document.querySelector('head').appendChild(style); |
670 | } | 670 | } |
671 | // TODO(ericbidelman): Removed this. | ||
672 | // var viewportMeta = document.createElement('meta'); | ||
673 | // viewportMeta.name = 'viewport'; | ||
674 | // viewportMeta.content = 'width=1100,height=750'; | ||
675 | // document.querySelector('head').appendChild(viewportMeta); | ||
676 | |||
677 | var appleMeta = document.createElement('meta'); | ||
678 | appleMeta.name = 'apple-mobile-web-app-capable'; | ||
679 | appleMeta.content = 'yes'; | ||
680 | document.querySelector('head').appendChild(appleMeta); | ||
681 | }; | 671 | }; |
682 | 672 | ||
683 | /** | 673 | /** |
@@ -686,7 +676,6 @@ SlideDeck.prototype.loadTheme_ = function(theme) { | |||
686 | SlideDeck.prototype.loadAnalytics_ = function() { | 676 | SlideDeck.prototype.loadAnalytics_ = function() { |
687 | var _gaq = window['_gaq'] || []; | 677 | var _gaq = window['_gaq'] || []; |
688 | _gaq.push(['_setAccount', this.config_.settings.analytics]); | 678 | _gaq.push(['_setAccount', this.config_.settings.analytics]); |
689 | //_gaq.push(['_setDomainName', '.bleedinghtml5.appspot.com']); | ||
690 | _gaq.push(['_trackPageview']); | 679 | _gaq.push(['_trackPageview']); |
691 | 680 | ||
692 | (function() { | 681 | (function() { |
diff --git a/slide_config.json b/slide_config.json index 9a4a4e3..8706255 100644 --- a/slide_config.json +++ b/slide_config.json | |||
@@ -3,19 +3,17 @@ var SLIDE_CONFIG = { | |||
3 | settings: { | 3 | settings: { |
4 | title: 'Title Goes Here<br>Up To Two Lines', | 4 | title: 'Title Goes Here<br>Up To Two Lines', |
5 | subtitle: 'Subtitle Goes Here', | 5 | subtitle: 'Subtitle Goes Here', |
6 | //theme: ['mytheme'], | 6 | useBuilds: true, // Default: true. False will turn off slide animation builds. |
7 | //hashtag: '#html5', //TODO | ||
8 | useBuilds: true, // Default: true | ||
9 | usePrettify: true, // Default: true | 7 | usePrettify: true, // Default: true |
10 | enableSideAreas: true, // Default: true | 8 | enableSlideAreas: true, // Default: true. False turns off the click areas on either slide of the slides. |
11 | enableTouch: true, // Default: true if device supports touch. | 9 | enableTouch: true, // Default: true. If touch support should enabled. Note: the device must support touch. |
12 | analytics: 'UA-XXXXXXXX-1', | 10 | //analytics: 'UA-XXXXXXXX-1', |
13 | favIcon: 'http://bleedinghtml5.appspot.com/images/chrome-logo-tiny2.png', | 11 | favIcon: 'http://bleedinghtml5.appspot.com/images/chrome-logo-tiny2.png', |
14 | onLoad: null, // TODO. function to call onload | ||
15 | fonts: [ | 12 | fonts: [ |
16 | 'Open Sans:regular,semibold,italic,italicsemibold', | 13 | 'Open Sans:regular,semibold,italic,italicsemibold', |
17 | 'Inconsolata' | 14 | 'Inconsolata' |
18 | ] | 15 | ], |
16 | //theme: ['mytheme'], // Add your own custom themes or styles in /theme/css. Leave off the .css extension. | ||
19 | }, | 17 | }, |
20 | 18 | ||
21 | // Author information | 19 | // Author information |
diff --git a/template.html b/template.html index de1692b..3b81007 100644 --- a/template.html +++ b/template.html | |||
@@ -16,6 +16,7 @@ URL: https://code.google.com/p/io-2012-slides | |||
16 | <!--<meta name="viewport" content="width=device-width, initial-scale=1.0">--> | 16 | <!--<meta name="viewport" content="width=device-width, initial-scale=1.0">--> |
17 | <!--This one seems to work all the time, but really small on ipad--> | 17 | <!--This one seems to work all the time, but really small on ipad--> |
18 | <!--<meta name="viewport" content="initial-scale=0.4">--> | 18 | <!--<meta name="viewport" content="initial-scale=0.4">--> |
19 | <meta name="apple-mobile-web-app-capable" content="yes"> | ||
19 | <link rel="stylesheet" media="all" href="theme/css/default.css"> | 20 | <link rel="stylesheet" media="all" href="theme/css/default.css"> |
20 | <link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="theme/css/phone.css"> | 21 | <link rel="stylesheet" media="only screen and (max-device-width: 480px)" href="theme/css/phone.css"> |
21 | <base target="_blank"> <!-- This amazingness opens all links in a new tab. --> | 22 | <base target="_blank"> <!-- This amazingness opens all links in a new tab. --> |