Merge branch 'master' of https://github.com/react-bootstrap/react-bootstrap

Conflicts:
	src/NavItem.jsx

Author: smbecker

Gruntfile.js

@@ -5,6 +5,12 @@ module.exports = function (grunt) {
 
     amdwrap: {
       src: {
+        expand: true,
+        cwd: 'src/',
+        src: ['**/*.js'],
+        dest: 'amd/'
+      },
+      transpiled: {
         expand: true,
         cwd: 'transpiled/',
         src: ['**/*.js'],
@@ -31,6 +37,12 @@ module.exports = function (grunt) {
             src: ['**/*.js'],
             dest: 'cjs/'
           },
+          {
+            expand: true,
+            cwd: 'src/',
+            src: ['**/*.js'],
+            dest: 'cjs/'
+          },
           {
             src: ['**/*'],
             dest: 'cjs/',
@@ -47,12 +59,15 @@ module.exports = function (grunt) {
     },
 
     react: {
+      options: {
+        harmony: true
+      },
       src: {
         files: [
           {
             expand: true,
             cwd: 'src',
-            src: ['**/*.*'],
+            src: ['**/*.jsx'],
             dest: 'transpiled',
             ext: '.js'
           }
@@ -63,7 +78,7 @@ module.exports = function (grunt) {
           {
             expand: true,
             cwd: 'test',
-            src: ['**/*.*'],
+            src: ['**/*.jsx'],
             dest: 'test-built',
             ext: '.js'
           }

docs/assets/style.css

@@ -22,6 +22,10 @@ body {
   color: #fafafa;
 }
 
+.bs-docs-nav .navbar-collapse {
+  overflow: hidden;
+}
+
 @media (min-width: 768px) {
 
   .bs-docs-nav .navbar-nav>li>a {

docs/client.js

@@ -6,4 +6,4 @@ var Root = require('./src/Root');
 // For React devtools
 window.React = React;
 
-React.renderComponent(Root(window.INITIAL_PROPS), document);
+React.render(React.createFactory(Root)(window.INITIAL_PROPS), document);

docs/examples/AlertAutoDismissable.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 var AlertAutoDismissable = React.createClass({
   getInitialState: function() {
     return {
@@ -31,4 +29,4 @@ var AlertAutoDismissable = React.createClass({
   }
 });
 
-React.renderComponent(<AlertAutoDismissable />, mountNode);
+React.render(<AlertAutoDismissable />, mountNode);

docs/examples/AlertBasic.js

@@ -1,9 +1,7 @@
-/** @jsx React.DOM */
-
 var alertInstance = (
     <Alert bsStyle="warning">
       <strong>Holy guacamole!</strong> Best check yo self, you're not looking too good.
     </Alert>
   );
 
-React.renderComponent(alertInstance, mountNode);
+React.render(alertInstance, mountNode);

docs/examples/AlertDismissable.js

@@ -1,5 +1,3 @@
-/** @jsx React.DOM */
-
 var AlertDismissable = React.createClass({
   getInitialState: function() {
     return {
@@ -35,4 +33,4 @@ var AlertDismissable = React.createClass({
   }
 });
 
-React.renderComponent(<AlertDismissable />, mountNode);
+React.render(<AlertDismissable />, mountNode);

docs/examples/Badge.js

@@ -1,7 +1,5 @@
-/** @jsx React.DOM */
-
 var badgeInstance = (
   <p>Badges <Badge>42</Badge></p>
 );
 
-React.renderComponent(badgeInstance, mountNode);
+React.render(badgeInstance, mountNode);

docs/examples/ButtonActive.js

@@ -1,10 +1,8 @@
-/** @jsx React.DOM */
-
 var buttonsInstance = (
     <ButtonToolbar>
       <Button bsStyle="primary" bsSize="large" active>Primary button</Button>
       <Button bsSize="large" active>Button</Button>
     </ButtonToolbar>
   );
 
-React.renderComponent(buttonsInstance, mountNode);
+React.render(buttonsInstance, mountNode);

docs/examples/ButtonBlock.js

@@ -1,4 +1,3 @@
-/** @jsx React.DOM */
 var wellStyles = {maxWidth: 400, margin: '0 auto 10px'};
 
 var buttonsInstance = (
@@ -8,4 +7,4 @@ var buttonsInstance = (
     </div>
   );
 
-React.renderComponent(buttonsInstance, mountNode);
+React.render(buttonsInstance, mountNode);

docs/examples/ButtonDisabled.js

@@ -1,10 +1,8 @@
-/** @jsx React.DOM */
-
 var buttonsInstance = (
     <ButtonToolbar>
       <Button bsStyle="primary" bsSize="large" disabled>Primary button</Button>
       <Button bsSize="large" disabled>Button</Button>
     </ButtonToolbar>
   );
 
-React.renderComponent(buttonsInstance, mountNode);
+React.render(buttonsInstance, mountNode);