Merge remote-tracking branch 'origin/master' into UXUI-209

holidayextras · Jun 4, 2015 · 8874f44 · 8874f44
2 parents 2d92d92 + 621ece6
commit 8874f44
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/docs/index.html b/docs/index.html
@@ -61,6 +61,7 @@
   </head>
   <body>
     <div id="application"></div>
+    <a href="https://github.com/holidayextras/ui-toolkit"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://camo.githubusercontent.com/38ef81f8aca64bb9a64448d0d70f1308ef5341ab/68747470733a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f6461726b626c75655f3132313632312e706e67" alt="Fork me on GitHub" data-canonical-src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png"></a>
     <script src="vendor/codemirror/codemirror.js"></script>
     <script src="vendor/codemirror/javascript.js"></script>
     <script src="vendor/JSXTransformer.js"></script>

diff --git a/docs/scripts/build.sh b/docs/scripts/build.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
+ulimit -n 9999
 echo "Building docs"
 browserify -t [ reactify --extension '.jsx' ] ./client.js -o ./assets/bundle.js
diff --git a/grunt/shell.js b/grunt/shell.js
@@ -3,12 +3,12 @@ module.exports = {
     command: "./node_modules/.bin/browserify -g [ ./node_modules/reactify --extension '.jsx' ] ./index.js --standalone ui-toolkit > ./dist/ui-toolkit.standalone.js"
   },
   docsBuild: {
-    command: 'cd docs; npm run build; cd -',
+    command: 'cd docs; npm run build && cd -'
   },
   docsStart: {
-    command: 'cd docs; npm start; cd -',
+    command: 'cd docs; npm run start && cd -'
   },
   docsView: {
-    command: 'open http://localhost:4000',
+    command: 'open http://localhost:4000'
   }
 };
diff --git a/grunt/watch.js b/grunt/watch.js
@@ -1,11 +1,11 @@
 module.exports = {
-	docs: {
-		files: ['docs/**/*.jsx', 'docs/**/*.js', 'src/**/*.js*'],
-		tasks: ['docs-build'],
-		options: {
-			livereload: true
-		}
-	},
+  docs: {
+    files: ['docs/src/**/*.js*', 'src/**/*.js*'],
+    tasks: ['docs-build'],
+    options: {
+      livereload: true
+    }
+  },
   less: {
     files: ['src/less/**/*.less'],
     tasks: ['less', 'copy:css'],