From 842ac6b09e0a33f7d7fdc0e634d8ea53bd7ed656 Mon Sep 17 00:00:00 2001 From: Eric Bidelman Date: Sat, 21 Apr 2012 18:02:00 -0700 Subject: Adding local favicon. config cleanup --- images/chrome-logo-tiny.png | Bin 0 -> 4125 bytes js/slides.js | 13 +------------ slide_config.json | 14 ++++++-------- template.html | 1 + 4 files changed, 8 insertions(+), 20 deletions(-) create mode 100644 images/chrome-logo-tiny.png diff --git a/images/chrome-logo-tiny.png b/images/chrome-logo-tiny.png new file mode 100644 index 0000000..6dcf46e Binary files /dev/null and b/images/chrome-logo-tiny.png 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) { } /* Left/Right tap areas. Default to including. */ - if (!!!('enableSideAreas' in settings) || settings.enableSideAreas) { + if (!!!('enableSlideAreas' in settings) || settings.enableSlideAreas) { var el = document.createElement('div'); el.classList.add('slide-area'); el.id = 'prev-slide-area'; @@ -668,16 +668,6 @@ SlideDeck.prototype.loadTheme_ = function(theme) { } document.querySelector('head').appendChild(style); } - // TODO(ericbidelman): Removed this. - // var viewportMeta = document.createElement('meta'); - // viewportMeta.name = 'viewport'; - // viewportMeta.content = 'width=1100,height=750'; - // document.querySelector('head').appendChild(viewportMeta); - - var appleMeta = document.createElement('meta'); - appleMeta.name = 'apple-mobile-web-app-capable'; - appleMeta.content = 'yes'; - document.querySelector('head').appendChild(appleMeta); }; /** @@ -686,7 +676,6 @@ SlideDeck.prototype.loadTheme_ = function(theme) { SlideDeck.prototype.loadAnalytics_ = function() { var _gaq = window['_gaq'] || []; _gaq.push(['_setAccount', this.config_.settings.analytics]); - //_gaq.push(['_setDomainName', '.bleedinghtml5.appspot.com']); _gaq.push(['_trackPageview']); (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 = { settings: { title: 'Title Goes Here
Up To Two Lines', subtitle: 'Subtitle Goes Here', - //theme: ['mytheme'], - //hashtag: '#html5', //TODO - useBuilds: true, // Default: true + useBuilds: true, // Default: true. False will turn off slide animation builds. usePrettify: true, // Default: true - enableSideAreas: true, // Default: true - enableTouch: true, // Default: true if device supports touch. - analytics: 'UA-XXXXXXXX-1', + enableSlideAreas: true, // Default: true. False turns off the click areas on either slide of the slides. + enableTouch: true, // Default: true. If touch support should enabled. Note: the device must support touch. + //analytics: 'UA-XXXXXXXX-1', favIcon: 'http://bleedinghtml5.appspot.com/images/chrome-logo-tiny2.png', - onLoad: null, // TODO. function to call onload fonts: [ 'Open Sans:regular,semibold,italic,italicsemibold', 'Inconsolata' - ] + ], + //theme: ['mytheme'], // Add your own custom themes or styles in /theme/css. Leave off the .css extension. }, // 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 + -- cgit v1.2.3