Revert "Merge branch 'pr/1138'"

This reverts commit c898a78, reversing changes made to 480cf29.
tastejs · Feb 9, 2015 · 1e2fcbf · 1e2fcbf
1 parent bfbefb1
commit 1e2fcbf
Show file tree

Hide file tree

Showing 177 changed files with 60,494 additions and 72,769 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,14 @@
 # run on your project. The secure: variable must be generated by running `travis encrypt`
 # on a github oauth key that you can generate using curl.
 
-sudo: false
-language: node_js
+language:
+    node_js
+sudo:
+    false
 node_js:
-    - '0.12'
+    - 0.10
 notifications:
-    irc: 'irc.freenode.org#tastejs'
+    irc: "irc.freenode.org#tastejs"
 branches:
     only:
         - master
@@ -24,7 +26,7 @@ env:
         # travis encrypt GH_OAUTH_TOKEN=XXXXXXXXXXXXXXX
         #
         # User specific env variables
-        - secure: 'fHgfjMpYuliwMr2QLnjYZExIViNrxprf9dhXRBLZ6P9Hz7P6m1BMYrI/xEG8X+fFbCi0+n3AXh8SEMHi9ou/Pty/cx12z4w/z3B2BHMxh4XBwpZHs+AB4IXkLiwwWoP4QFy4vTipgYnMDMq9CRhlRbhZEpenQBmaTEc472By1uM='
+        - secure: "fHgfjMpYuliwMr2QLnjYZExIViNrxprf9dhXRBLZ6P9Hz7P6m1BMYrI/xEG8X+fFbCi0+n3AXh8SEMHi9ou/Pty/cx12z4w/z3B2BHMxh4XBwpZHs+AB4IXkLiwwWoP4QFy4vTipgYnMDMq9CRhlRbhZEpenQBmaTEc472By1uM="
         - GH_OWNER: tastejs
         - GH_PROJECT_NAME: todomvc
 
@@ -43,8 +45,8 @@ after_success:
     - cp -R ../dist/* .
     - cp ../dist/.* .
     - git add -f .
-    - git config user.email 'travis@rdrei.net'
-    - git config user.name 'TasteBot'
-    - git commit -am 'update the build files for gh-pages [ci skip]'
+    - git config user.email "travis@rdrei.net"
+    - git config user.name "TasteBot"
+    - git commit -am "update the build files for gh-pages [ci skip]"
     # Any command that using GH_OAUTH_TOKEN must pipe the output to /dev/null to not expose your oauth token
     - git push https://${GH_OAUTH_TOKEN}@github.com/${GH_OWNER}/${GH_PROJECT_NAME} HEAD:gh-pages > /dev/null 2>&1
diff --git a/examples/ampersand/.gitignore b/examples/ampersand/.gitignore
diff --git a/examples/ampersand/index.html b/examples/ampersand/index.html
@@ -3,8 +3,7 @@
     <head>
         <meta charset="utf-8">
         <title>Ampersand.js • TodoMVC</title>
-        <link rel="stylesheet" href="node_modules/todomvc-common/base.css">
-        <link rel="stylesheet" href="node_modules/todomvc-app-css/index.css">
+        <link rel="stylesheet" href="todomvc-common/base.css">
     </head>
     <body>
         <section id="todoapp">
@@ -38,7 +37,7 @@ <h1>todos</h1>
             <p>Written by <a href="https://twitter.com/henrikjoreteg">Henrik Joreteg</a>, <a href="https://twitter.com/lukekarrys">Luke Karrys</a>, and <a href="https://twitter.com/philip_roberts">Philip Roberts</a></p>
             <p>Part of <a href="http://todomvc.com">TodoMVC</a></p>
         </footer>
-        <script src="node_modules/todomvc-common/base.js"></script>
+        <script src="todomvc-common/base.js"></script>
         <script src="todomvc.bundle.js"></script>
     </body>
 </html>