CopdePaLOUsa 2015 IoT/Android Wear Talk

wesreisz · Apr 26, 2015 · 2b26ee1 · 2b26ee1
1 parent 36eab29
commit 2b26ee1
Show file tree

Hide file tree

Showing 23 changed files with 386 additions and 122 deletions.
diff --git a/presentation/app.yaml b/presentation/app.yaml
@@ -1,5 +1,5 @@
 application: android-wear-whos-next
-version: 2
+version: 3
 runtime: python27
 api_version: 1
 threadsafe: yes

diff --git a/presentation/images/50BillionThings.png b/presentation/images/50BillionThings.png
diff --git a/presentation/images/KeystoneButWaitTheresMore.jpg b/presentation/images/KeystoneButWaitTheresMore.jpg
diff --git a/presentation/images/android-wear-watchfaces.png b/presentation/images/android-wear-watchfaces.png
diff --git a/presentation/images/apps_people_actions_250x250-4-1.gif b/presentation/images/apps_people_actions_250x250-4-1.gif
diff --git a/presentation/images/arrow-sml.png b/presentation/images/arrow-sml.png
diff --git a/presentation/images/arrow.png b/presentation/images/arrow.png
diff --git a/presentation/images/circled.png b/presentation/images/circled.png
diff --git a/presentation/images/cpl-15-sml.png b/presentation/images/cpl-15-sml.png
diff --git a/presentation/images/greenbean-8.png b/presentation/images/greenbean-8.png
diff --git a/presentation/images/iot_bigdata.png b/presentation/images/iot_bigdata.png
diff --git a/presentation/images/jawbone.png b/presentation/images/jawbone.png
diff --git a/presentation/images/notification.png b/presentation/images/notification.png
diff --git a/presentation/images/notificationExtended.png b/presentation/images/notificationExtended.png
diff --git a/presentation/images/pdc-sml.png b/presentation/images/pdc-sml.png
diff --git a/presentation/images/quick2_emoji_reply_blog-1.gif b/presentation/images/quick2_emoji_reply_blog-1.gif
diff --git a/presentation/images/skybell.png b/presentation/images/skybell.png
diff --git a/presentation/images/wakeup.jpg b/presentation/images/wakeup.jpg
diff --git a/presentation/images/wet-cat-freaking-out.jpg b/presentation/images/wet-cat-freaking-out.jpg
diff --git a/presentation/images/wristgesture_500.gif b/presentation/images/wristgesture_500.gif
diff --git a/presentation/slide_config.js b/presentation/slide_config.js
@@ -2,13 +2,13 @@ var SLIDE_CONFIG = {
   // Slide settings
   settings: {
     title: 'Android Wear: Who\'s Next',           
-    subtitle: 'Kick\'n it with Android Wear <br />http://android-wear-whos-next.appspot.com',
+    subtitle: 'http://android-wear-whos-next.appspot.com',
     useBuilds: true, // Default: true. False will turn off slide animation builds.
     usePrettify: true, // Default: true
     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', // TODO: Using this breaks GA for some reason (probably requirejs). Update your tracking code in template.html instead.
-    favIcon: 'images/pdc-sml.png',
+    favIcon: 'images/favIcon.png',
     fonts: [
       'Open Sans:regular,semibold,italic,italicsemibold',
       'Inconsolata'

diff --git a/presentation/template.html b/presentation/template.html
diff --git a/presentation/theme/css/default.css b/presentation/theme/css/default.css
@@ -945,20 +945,22 @@ aside.gdbar {
     -ms-border-radius: 0 10px 10px 0;
     -o-border-radius: 0 10px 10px 0;
     border-radius: 0 10px 10px 0;
-    background: -webkit-gradient(linear, 0% 50%, 100% 50%, color-stop(0%, #e6e6e6), color-stop(100%, #e6e6e6)) no-repeat;
-    background: -webkit-linear-gradient(left, #e6e6e6,#e6e6e6) no-repeat;
-    background: -moz-linear-gradient(left, #e6e6e6,#e6e6e6) no-repeat;
-    background: -o-linear-gradient(left, #e6e6e6,#e6e6e6) no-repeat;
-    background: linear-gradient(left, #e6e6e6,#e6e6e6) no-repeat;
+    background: -webkit-gradient(linear, 0% 50%, 100% 50%, color-stop(0%, #333333), color-stop(100%, #333333)) no-repeat;
+    background: -webkit-linear-gradient(left, #333333,#333333) no-repeat;
+    background: -moz-linear-gradient(left, #333333,#333333) no-repeat;
+    background: -o-linear-gradient(left, #333333,#333333) no-repeat;
+    background: linear-gradient(left, #333333,#333333) no-repeat;
     -webkit-background-size: 0% 100%;
     -moz-background-size: 0% 100%;
     -o-background-size: 0% 100%;
     background-size: 0% 100%;
+    /*
     -webkit-transition: all 0.5s ease-out;
     -webkit-transition-delay: 0.5s;
     -moz-transition: all 0.5s ease-out 0.5s;
     -o-transition: all 0.5s ease-out 0.5s;
     transition: all 0.5s ease-out 0.5s;
+    */
 }
 aside.gdbar.right {
     right: 0;
@@ -986,7 +988,7 @@ aside.gdbar.bottom {
 aside.gdbar img {
     position: absolute;
     right: 0;
-    margin: 10px 30px 10px 10px;
+    margin: 15px 10px 15px 10px;
 }
 .title-slide hgroup { bottom: 100px }
 .title-slide hgroup h1 {
@@ -1109,6 +1111,56 @@ aside.gdbar img {
 	left:450px;
 }
 
+#li-image18{
+    position: absolute; 
+    bottom:50px; 
+    right:130px; 
+    -ms-transform:rotate(15deg);
+    -webkit-transform:rotate(15deg);
+}
+
+/*story*/
+#li-image-story1{
+    position: absolute; 
+    top:100px; 
+    left:10px;
+}
+#li-image-story2{
+    position: absolute; 
+    top:150px; 
+    left:250px;
+}
+#li-image-story3{
+    position: absolute; 
+    top:100px; 
+    left:400px;
+}
+#li-image-story4{
+    position: absolute; 
+    top:150px; 
+    left:650px;
+}
+#li-image-story5{
+    position: absolute; 
+    top:80px; 
+    left:820px;
+}
+#li-image-story6{
+    position: absolute; 
+    top:350px; 
+    left:30px;
+}
+
+#sales-wear{
+    position: absolute; 
+    width: 550px;
+    top:40px; 
+    left:450px;
+}
+.box{
+    border: 1px solid black;
+    padding: 20px;
+}
 
 
 /* load order for wear stack*/
@@ -1165,6 +1217,36 @@ aside.gdbar img {
 	top:180px; 
 	right:50px;
 }
+#bigdata-worth{
+    position: absolute; 
+    top:400px; 
+    left: 100px;
+    width: 300px;
+    color: red;
+    text-align: center;
+}
+#highlight-section{
+    position: absolute; 
+    top:210px; 
+    left:-370px;
+}
+#highlight-code1{
+    position: absolute; 
+    top:00px; 
+    left:100px;
+    transform:rotate(110deg);
+    -ms-transform:rotate(110deg);
+    -webkit-transform:rotate(110deg)
+}
+#highlight-code2{
+    position: absolute; 
+    top:200px; 
+    left:100px;
+    transform:rotate(110deg);
+    -ms-transform:rotate(110deg);
+    -webkit-transform:rotate(110deg)
+}
+
 @media print { 
     slides slide {
         display: block !important;