Merge branch 'master' into revert681

config.json

@@ -175,8 +175,8 @@
     // - copy website/static >> build/website/static
     // - run usemin on all html in build/website
     // - sync build/website with bucket
-    "deploy": {
-        "stg": {"bucket": "timeline.knilab.com"},
-        "prd": {"bucket": "timeline.knightlab.com"}
+     "deploy": {
+        "stg": {"bucket": "timeline.knilab.com", "usemin_context": {"cdn": "dev"}},
+        "prd": {"bucket": "timeline.knightlab.com", "usemin_context": {"cdn": "latest"}}
     }
 }

website/templates/_demo.html

@@ -14,7 +14,7 @@
    font:  'NewsCycle-Merriweather',
   };
 </script>
-<!-- build:js http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js -->
+<!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
 <script type="application/javascript">
     var embed_path = "/build/"
 </script>

website/templates/base.html

@@ -144,7 +144,7 @@
     <script type="text/javascript">
         var generator_embed_path = "http://cdn.knightlab.com/libs/timeline/latest/embed/index.html";
     </script>
-    <!-- build:js http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed-generator.js -->
+    <!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed-generator.js -->
     <script type="text/javascript">
         var generator_embed_path = "/source/embed/index.html";
     </script>

website/templates/examples/houston/index.html

@@ -41,7 +41,7 @@
        font:	'Bevan-PotanoSans'
       }
     </script>
-    <!-- build:js http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js -->
+    <!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
     <script type="application/javascript">
         var embed_path = "/build/"
     </script>

website/templates/examples/republican/index.html

@@ -41,7 +41,7 @@
        font:	'PT'
       }
     </script>
-    <!-- build:js http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js -->
+    <!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
     <script type="application/javascript">
         var embed_path = "/build/"
     </script>

website/templates/examples/shit-people-say/index.html

@@ -41,7 +41,7 @@
        font:	'Pacifico-Arimo'
       }
     </script>
-    <!-- build:js http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js -->
+    <!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
     <script type="application/javascript">
         var embed_path = "/build/"
     </script>

website/templates/examples/user-interface/index.html

@@ -41,7 +41,7 @@
        font:	'SansitaOne-Kameron'
       }
     </script>
-    <!-- build:js http://cdn.knightlab.com/libs/timeline/latest/js/storyjs-embed.js -->
+    <!-- build:js http://cdn.knightlab.com/libs/timeline/%(cdn)s/js/storyjs-embed.js -->
     <script type="application/javascript">
         var embed_path = "/build/"
     </script>