0.4.2

fixes ReactTextComponent rootID unescapedness
Tweak verbiage about required polyfills
2013-12-17 22:00:17 -08:00 · 2013-12-17 18:29:50 -08:00 · 2013-10-08 16:33:35 -07:00 · 2013-10-08 11:11:23 -07:00 · 2013-10-03 15:19:56 -07:00 · 2013-10-03 15:19:56 -07:00
682 changed files with 13967 additions and 41353 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -2,16 +2,11 @@
 root = true

 [*]
-charset = utf-8
-end_of_line = lf
-indent_size = 2
 indent_style = space
-max_line_length = 80
+indent_size = 2
+end_of_line = lf
+charset = utf-8
 trim_trailing_whitespace = true

 [*.md]
-max_line_length = 0
 trim_trailing_whitespace = false
-
-[COMMIT_EDITMSG]
-max_line_length = 0
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-* text=auto
--- a/.gitignore
+++ b/.gitignore
@@ -12,9 +12,14 @@ build/
 docs/code
 docs/_site
 docs/.sass-cache
-docs/js/*
+docs/css/react.css
+docs/js/.module-cache
+docs/js/JSXTransformer.js
+docs/js/react.min.js
+docs/js/docs.js
+docs/js/jsx-compiler.js
+docs/js/live_editor.js
+docs/js/examples
 docs/downloads
 examples/shared/*.js
-test/the-files-to-test.generated.js
-*.log*
-chrome-user-data
+
--- a/.jshintrc
+++ b/.jshintrc
@@ -13,7 +13,6 @@
  "noempty": true,
  "nonstandard": true,
  "onecase": true,
-  "sub": true,
  "regexdash": true,
  "trailing": true,
  "undef": true,
--- a/.mailmap
+++ b/.mailmap
@@ -1,62 +0,0 @@
-Ben Newman <bn@cs.stanford.edu> <benjamn@fb.com>
-Bill Fisher <fisherwebdev@gmail.com>
-Cheng Lou <chenglou92@gmail.com> <chenglou@fb.com>
-Christoph Pojer <christoph.pojer@gmail.com>
-Christoph Pojer <christoph.pojer@gmail.com> <cpojer@fb.com>
-Connor McSheffrey <c@conr.me> <connor.mcsheffrey@gmail.com>
-Dan Schafer <dschafer@fb.com>
-Daniel Gasienica <daniel@gasienica.ch> <daniel@fiftythree.com>
-Daniel Gasienica <daniel@gasienica.ch> <dgasienica@zynga.com>
-Daniel Lo Nigro <daniel@dan.cx> <danlo@fb.com>
-Evan Coonrod <evan@paloalto.com>
-Fabio M. Costa <fabiomcosta@gmail.com> <fabs@fb.com>
-Felix Kling <felix.kling@gmx.net> <fkling@fb.com>
-François-Xavier Bois <fxbois@gmail.com>
-Geert Pasteels <geert.pasteels@gmail.com>
-George A Sisco III <george.sisco@gmail.com>
-Harry Hull <harry.hull1@gmail.com>
-Hendrik Swanepoel <hendrik.swanepoel@gmail.com>
-Ingvar Stepanyan <me@rreverser.com> <rreverser@ubuntu.rreverser.a4.internal.cloudapp.net>
-Irae Carvalho <irae@irae.pro.br>
-Jaime Mingo <j.mingov@3boll.com>
-James Brantly <james@jbrantly.com>
-Jan Kassens <jan@kassens.net> <jkassens@fb.com>
-Jason Bonta <jbonta@gmail.com> <jasonbonta@fb.com>
-Jason Trill <jason@jasontrill.com>
-Jeff Morrison <jeff@anafx.com> <Jeff@anafx.com>
-Jeff Morrison <jeff@anafx.com> <jeffmo@fb.com>
-Jeffrey Lin <lin.jeffrey@gmail.com> <jeffreylin@fb.com>
-Jonathan Hsu <jhiswin@gmail.com>
-Jordan Walke <jordojw@gmail.com>
-Jordan Walke <jordojw@gmail.com> <jordanjcw@fb.com>
-Josh Duck <josh@fb.com> <github@joshduck.com>
-Jun Wu <quark@lihdd.net>
-Keito Uchiyama <projects@keito.me> <keito@fb.com>
-Kunal Mehta <k.mehta@berkeley.edu> <kunalm@fb.com>
-Laurence Rowe <l@lrowe.co.uk> <laurence@lrowe.co.uk>
-Martin Andert <mandert@gmail.com>
-Mathieu M-Gosselin <mathieumg@gmail.com> <mathieumg@atx33.com>
-Michal Srb <xixixao@seznam.cz> xixixao <xixixao@seznam.cz>
-Nick Gavalas <njg57@cornell.edu>
-Nick Thompson <ncthom91@gmail.com> <nickt@instagram.com>
-Paul O’Shannessy <paul@oshannessy.com> <poshannessy@fb.com>
-Paul Shen <paul@mnml0.com> <paulshen@fb.com>
-Pete Hunt <floydophone@gmail.com>
-Pete Hunt <floydophone@gmail.com> <pete.hunt@fb.com>
-Pete Hunt <floydophone@gmail.com> <pete@instagram.com>
-Pete Hunt <floydophone@gmail.com> <phunt@instagram.com>
-Petri Lievonen <plievone@cc.hut.fi>
-Petri Lievonen <plievone@cc.hut.fi> <petri.lievonen@tkk.fi>
-Pieter Vanderwerff <me@pieter.io> <pieter@heyday.co.nz>
-Ray <ray@tomo.im>
-Richard Feldman <richard.t.feldman@gmail.com> <richard@noredink.com>
-Richard Livesey <Livesey7@hotmail.co.uk>
-Sander Spies <sandermail@gmail.com>
-Sebastian Markbåge <sebastian@calyptus.eu> <sema@fb.com>
-Stoyan Stefanov <ssttoo@ymail.com>
-Thomas Aylott <oblivious@subtlegradient.com> <aylott@fb.com>
-Timothy Yung <yungsters@gmail.com> <yungsters@fb.com>
-Vjeux <vjeuxx@gmail.com>
-Vjeux <vjeuxx@gmail.com> <vjeux@fb.com>
-Volkan Unsal <spocksplanet@gmail.com>
-Zach Bruggeman <mail@bruggie.com> <zbruggeman@me.com>
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,59 +2,13 @@
 language: node_js
 node_js:
 - '0.10'
-cache:
-  directories:
-  - node_modules
-script:
- |
-    grunt $TEST_TYPE
 after_script:
- |
-    if [ "$TEST_TYPE" = test ] && [ "$SERVER" ]; then
-      grunt build
-      curl \
-        -F "react=@build/react.js" \
-        -F "react.min=@build/react.min.js" \
-        -F "transformer=@build/JSXTransformer.js" \
-        -F "react-with-addons=@build/react-with-addons.js" \
-        -F "react-with-addons.min=@build/react-with-addons.min.js" \
-        -F "npm-react=@build/react.tgz" \
-        -F "npm-react-tools=@build/react-tools.tgz" \
-        -F "commit=$TRAVIS_COMMIT" \
-        -F "date=`git log --format='%ct' -1`" \
-        -F "pull_request=$TRAVIS_PULL_REQUEST" \
-        -F "token=$SECRET_TOKEN" \
-        -F "branch=$TRAVIS_BRANCH" \
-        $SERVER
-    fi
+- curl -F "react=@build/react.js" -F "react.min=@build/react.min.js" -F "transformer=@build/JSXTransformer.js"
+  -F "commit=$TRAVIS_COMMIT" -F "date=`git log --format='%ct' -1`" -F "pull_request=$TRAVIS_PULL_REQUEST"
+  -F "token=$SECRET_TOKEN" -F "branch=$TRAVIS_BRANCH" $SERVER
 env:
-  matrix:
-  - TEST_TYPE=test
-  - TEST_TYPE=lint
-  - TEST_TYPE=test:webdriver:saucelabs:modern
  global:
  # SERVER
  - secure: qPvsJ46XzGrdIuPA70b55xQNGF8jcK7N1LN5CCQYYocXLa+fBrl+fTE77QvehOPhqwJXcj6kOxI+sY0KrVwV7gmq2XY2HZGWUSCxTN0SZlNIzqPA80Y7G/yOjA4PUt8LKgP+8tptyhTAY56qf+hgW8BoLiKOdztYF2p+3zXOLuA=
  # SECRET_TOKEN
  - secure: dkpPW+VnoqC/okhRdV90m36NcyBFhcwEKL3bNFExAwi0dXnFao8RoFlvnwiPlA23h2faROkMIetXlti6Aju08BgUFV+f9aL6vLyU7gUent4Nd3413zf2fwDtXIWIETg6uLnOpSykGKgCAT/hY3Q2oPLqOoY0OxfgnbqwxkxljrE=
-matrix:
-  fast_finish: true
-  allow_failures:
-    - env: TEST_TYPE=lint
-    - env: TEST_TYPE=test:coverage
-    - env: TEST_TYPE=perf:full
-    - env: TEST_TYPE=test:webdriver:saucelabs:modern
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie11
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie10
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie9
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=ie8
-    - env: TEST_TYPE=test:webdriver:saucelabs:ios
-    - env: TEST_TYPE=test:webdriver:saucelabs BROWSER_NAME=safari
-notifications:
-  irc:
-    use_notice: true
-    skip_join: true
-    on_success: change
-    on_failure: change
-    channels:
-    - chat.freenode.net#reactjs
--- a/178
+++ b/178
@@ -1,178 +0,0 @@
-Adam Krebs <amk528@cs.nyu.edu>
-Adam Solove <asolove@gmail.com>
-Alan deLevie <adelevie@gmail.com>
-Alex Zelenskiy <azelenskiy@fb.com>
-Alexander Solovyov <alexander@solovyov.net>
-Andreas Svensson <andreas@syranide.com>
-Andrew Davey <andrew@equin.co.uk>
-Andrew Zich <azich@fb.com>
-Andrey Popp <8mayday@gmail.com>
-Anthony van der Hoorn <anthony.vanderhoorn@gmail.com>
-Ayman Osman <aymano.osman@gmail.com>
-Ben Alpert <spicyjalapeno@gmail.com>
-Ben Newman <bn@cs.stanford.edu>
-Ben Ripkens <bripkens.dev@gmail.com>
-Bill Fisher <fisherwebdev@gmail.com>
-Bob Eagan <bob@synapsestudios.com>
-Bojan Mihelac <bmihelac@mihelac.org>
-Brandon Bloom <brandon@brandonbloom.name>
-Brian Cooke <bri@bricooke.com>
-Brian Kim <briankimpossible@gmail.com>
-Brian Reavis <brian@thirdroute.com>
-Brian Rue <brian@rollbar.com>
-Cam Spiers <camspiers@gmail.com>
-Cassus Adam Banko <banko.adam@gmail.com>
-Cat Chen <catchen@fb.com>
-Cheng Lou <chenglou92@gmail.com>
-Christian Roman <chroman16@gmail.com>
-Christoph Pojer <christoph.pojer@gmail.com>
-Christopher Monsanto <chris@monsan.to>
-Clay Allsopp <clay.allsopp@gmail.com>
-Connor McSheffrey <c@conr.me>
-Dan Schafer <dschafer@fb.com>
-Daniel Gasienica <daniel@gasienica.ch>
-Daniel Lo Nigro <daniel@dan.cx>
-Daniel Miladinov <dmiladinov@wingspan.com>
-Daniel Schonfeld <daniel@schonfeld.org>
-Danny Ben-David <dannybd@fb.com>
-Daryl Lau <daryl@weak.io>
-David Hellsing <david@aino.se>
-David Hu <davidhu91@gmail.com>
-Devon Blandin <dblandin@gmail.com>
-Dmitry Mazuro <dmitry.mazuro@icloud.com>
-Dustin Getz <dgetz@wingspan.com>
-Enguerran <engcolson@gmail.com>
-Eric Clemmons <eric@smarterspam.com>
-Eric Florenzano <floguy@gmail.com>
-Eric Schoffstall <contra@wearefractal.com>
-Evan Coonrod <evan@paloalto.com>
-Fabio M. Costa <fabiomcosta@gmail.com>
-Felipe Oliveira Carvalho <felipekde@gmail.com>
-Felix Kling <felix.kling@gmx.net>
-Fernando Correia <fernando@servicero.com>
-François-Xavier Bois <fxbois@gmail.com>
-Fred Zhao <fredz@fb.com>
-G Scott Olson <gscottolson@gmail.com>
-Geert Pasteels <geert.pasteels@gmail.com>
-Geert-Jan Brits <gbrits@gmail.com>
-George A Sisco III <george.sisco@gmail.com>
-Gilbert <gilbertbgarza@gmail.com>
-Greg Hurrell <glh@fb.com>
-Greg Roodt <groodt@gmail.com>
-Guangqiang Dong <gqdong@fb.com>
-Guido Bouman <m@guido.vc>
-Harry Hull <harry.hull1@gmail.com>
-Harshad Sabne <harshadsabne@users.noreply.github.com>
-Hendrik Swanepoel <hendrik.swanepoel@gmail.com>
-Hugo Jobling <me@thisishugo.com>
-Ian Obermiller <iano@fb.com>
-Ingvar Stepanyan <me@rreverser.com>
-Irae Carvalho <irae@irae.pro.br>
-Isaac Salier-Hellendag <isaac@fb.com>
-Ivan Kozik <ivan@ludios.org>
-Jaime Mingo <j.mingov@3boll.com>
-Jakub Malinowski <jakubmal@gmail.com>
-James Brantly <james@jbrantly.com>
-James Ide <ide@fb.com>
-Jamie Wong <jamie.lf.wong@gmail.com>
-Jamison Dance <jergason@gmail.com>
-Jan Kassens <jan@kassens.net>
-Jared Forsyth <jared@jaredforsyth.com>
-Jason Bonta <jbonta@gmail.com>
-Jason Trill <jason@jasontrill.com>
-Jean Lauliac <lauliacj@gmail.com>
-Jeff Barczewski <jeff.barczewski@gmail.com>
-Jeff Carpenter <gcarpenterv@gmail.com>
-Jeff Morrison <jeff@anafx.com>
-Jeff Welch <whatthejeff@gmail.com>
-Jeffrey Lin <lin.jeffrey@gmail.com>
-Jignesh Kakadiya <jigneshhk1992@gmail.com>
-Jing Chen <jingc@fb.com>
-Johannes Baiter <johannes.baiter@gmail.com>
-John Watson <jwatson@fb.com>
-Jon Beebe <jon.beebe@daveramsey.com>
-Jonas Enlund <jonas.enlund@gmail.com>
-Jonas Gebhardt <jonas@instagram.com>
-Jonathan Hsu <jhiswin@gmail.com>
-Jordan Walke <jordojw@gmail.com>
-Josh Bassett <josh.bassett@gmail.com>
-Josh Duck <josh@fb.com>
-Josh Yudaken <yud@instagram.com>
-Joshua Ma <me@joshma.com>
-Julen Ruiz Aizpuru <julenx@gmail.com>
-Jun Wu <quark@lihdd.net>
-Juraj Dudak <jdudak@fb.com>
-Justin Jaffray <justinjaffray@khanacademy.org>
-Karl Mikkelsen <karl@kingkarl.com>
-Keito Uchiyama <projects@keito.me>
-Kit Randel <kit@nocturne.net.nz>
-Kunal Mehta <k.mehta@berkeley.edu>
-Kyle Mathews <mathews.kyle@gmail.com>
-Laurence Rowe <l@lrowe.co.uk>
-Levi McCallum <levi@levimccallum.com>
-Lily <qvang.j@gmail.com>
-Logan Allen <loganfynne@gmail.com>
-Luigy Leon <luichi.19@gmail.com>
-Marcin Kwiatkowski <marcin.kwiatkowski@hotmail.com>
-Marcin Szczepanski <marcins@gmail.com>
-Mariano Desanze <protronm@gmail.com>
-Mark Richardson <echo@fb.com>
-Marshall Roch <mroch@fb.com>
-Martin Andert <mandert@gmail.com>
-Martin Konicek <mkonicek@fb.com>
-Mathieu M-Gosselin <mathieumg@gmail.com>
-Matt Harrison <mt.harrison86@gmail.com>
-Matthew Dapena-Tretter <m@tthewwithanm.com>
-Matti Nelimarkka <matti.nelimarkka@hiit.fi>
-Michal Srb <xixixao@seznam.cz>
-Mouad Debbar <mdebbar@fb.com>
-Nadeesha Cabral <nadeesha.cabral@gmail.com>
-Nate Hunzaker <nate.hunzaker@gmail.com>
-Nicholas Bergson-Shilcock <me@nicholasbs.net>
-Nick Gavalas <njg57@cornell.edu>
-Nick Thompson <ncthom91@gmail.com>
-Niklas Boström <nbostrom@gmail.com>
-Owen Coutts <owenc@fb.com>
-Pascal Hartig <passy@twitter.com>
-Paul O’Shannessy <paul@oshannessy.com>
-Paul Seiffert <paul.seiffert@gmail.com>
-Paul Shen <paul@mnml0.com>
-Pete Hunt <floydophone@gmail.com>
-Peter Cottle <pcottle@fb.com>
-Petri Lievonen <plievone@cc.hut.fi>
-Pieter Vanderwerff <me@pieter.io>
-Rajiv Tirumalareddy <rajivtreddy@gmail.com>
-Randall Randall <randall@randallsquared.com>
-Ray <ray@tomo.im>
-Richard D. Worth <rdworth@gmail.com>
-Richard Feldman <richard.t.feldman@gmail.com>
-Richard Livesey <Livesey7@hotmail.co.uk>
-Ryan Seddon <seddon.ryan@gmail.com>
-Sahat Yalkabov <sakhat@gmail.com>
-Sander Spies <sandermail@gmail.com>
-Sean Kinsey <oyvind@fb.com>
-Sebastian Markbåge <sebastian@calyptus.eu>
-Shaun Trennery <shaun.trennery@gmail.com>
-Simon Højberg <r.hackr@gmail.com>
-Stefan Dombrowski <sdo451@gmail.com>
-Stephen Murphy <smurphy3@apple.com>
-Stoyan Stefanov <ssttoo@ymail.com>
-Sundeep Malladi <sundeep.malladi@gmail.com>
-Sven Helmberger <fforw@gmx.de>
-Thomas Aylott <oblivious@subtlegradient.com>
-Thomas Boyt <thomas.boyt@venmo.com>
-Thomas Shaddox <thomas@heyzap.com>
-Thomas Shafer <thomasjshafer@gmail.com>
-Timothy Yung <yungsters@gmail.com>
-Tom Haggie <thaggie@gmail.com>
-Tom Occhino <tomocchino@gmail.com>
-Ville Immonen <ville.immonen@iki.fi>
-Vjeux <vjeuxx@gmail.com>
-Volkan Unsal <spocksplanet@gmail.com>
-Wayne Larsen <wayne@larsen.st>
-Wincent Colaiuta <win@wincent.com>
-Yuriy Dybskiy <yuriy@dybskiy.com>
-Yuval Dekel <thedekel@fb.com>
-Zach Bruggeman <mail@bruggie.com>
-davidxi <davidgraycn@gmail.com>
-imagentleman <imagentlemail@gmail.com>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,262 +1,3 @@
-## 0.11.1 (July 24, 2014)
-
-### React Core
-
-#### Bug Fixes
-* `setState` can be called inside `componentWillMount` in non-DOM environments
-* `SyntheticMouseEvent.getEventModifierState` correctly renamed to `getModifierState`
-* `getModifierState` correctly returns a `boolean`
-* `getModifierState` is now correctly case sensitive
-* Empty Text node used in IE8 `innerHTML` workaround is now removed, fixing rerendering in certain cases
-
-### JSX
-* Fix duplicate variable declaration in JSXTransformer (caused issues in some browsers)
-
-
-## 0.11.0 (July 17, 2014)
-
-### React Core
-
-#### Breaking Changes
-* `getDefaultProps()` is now called once per class and shared across all instances
-* `MyComponent()` now returns a descriptor, not an instance
-* `React.isValidComponent` and `React.PropTypes.component` validate *descriptors*, not component instances
-* Custom `propType` validators should return an `Error` instead of logging directly
-
-#### New Features
-* Rendering to `null`
-* Keyboard events include normalized `e.key` and `e.getModifierState()` properties
-* New normalized `onBeforeInput` event
-* `React.Children.count` has been added as a helper for counting the number of children
-
-#### Bug Fixes
-
-* Re-renders are batched in more cases
-* Events: `e.view` properly normalized
-* Added Support for more HTML attributes (`coords`, `crossOrigin`, `download`, `hrefLang`, `mediaGroup`, `muted`, `scrolling`, `shape`, `srcSet`, `start`, `useMap`)
-* Improved SVG support
-  * Changing `className` on a mounted SVG component now works correctly
-  * Added support for elements `mask` and `tspan`
-  * Added support for attributes `dx`, `dy`, `fillOpacity`, `fontFamily`, `fontSize`, `markerEnd`, `markerMid`, `markerStart`, `opacity`, `patternContentUnits`, `patternUnits`, `preserveAspectRatio`, `strokeDasharray`, `strokeOpacity`
-* CSS property names with vendor prefixes (`Webkit`, `ms`, `Moz`, `O`) are now handled properly
-* Duplicate keys no longer cause a hard error; now a warning is logged (and only one of the children with the same key is shown)
-* `img` event listeners are now unbound properly, preventing the error "Two valid but unequal nodes with the same `data-reactid`"
-* Added explicit warning when missing polyfills
-
-### React With Addons
-* PureRenderMixin: a mixin which helps optimize "pure" components
-* Perf: a new set of tools to help with performance analysis
-* Update: New `$apply` command to transform values
-* TransitionGroup bug fixes with null elements, Android
-
-### React NPM Module
-* Now includes the pre-built packages under `dist/`.
-* `envify` is properly listed as a dependency instead of a peer dependency
-
-### JSX
-* Added support for namespaces, eg `<Components.Checkbox />`
-* JSXTransformer
-  * Enable the same `harmony` features available in the command line with `<script type="text/jsx;harmony=true">`
-  * Scripts are downloaded in parallel for more speed. They are still executed in order (as you would expect with normal script tags)
-  * Fixed a bug preventing sourcemaps from working in Firefox
-
-### React Tools Module
-* Improved readme with usage and API information
-* Improved ES6 transforms available with `--harmony` option
-* Added `--source-map-inline` option to the `jsx` executable
-* New `transformWithDetails` API which gives access to the raw sourcemap data
-
-
-## 0.10.0 (March 21, 2014)
-
-### React Core
-
-#### New Features
-* Added warnings to help migrate towards descriptors
-* Made it possible to server render without React-related markup (`data-reactid`, `data-react-checksum`). This DOM will not be mountable by React. [Read the docs for `React.renderComponentToStaticMarkup`](http://facebook.github.io/react/docs/top-level-api.html#react.rendercomponenttostaticmarkup)
-* Added support for more attributes:
-  * `srcSet` for `<img>` to specify images at different pixel ratios
-  * `textAnchor` for SVG
-
-#### Bug Fixes
-* Ensure all void elements don’t insert a closing tag into the markup.
-* Ensure `className={false}` behaves consistently
-* Ensure `this.refs` is defined, even if no refs are specified.
-
-### Addons
-
-* `update` function to deal with immutable data. [Read the docs](http://facebook.github.io/react/docs/update.html)
-
-### react-tools
-* Added an option argument to `transform` function. The only option supported is `harmony`, which behaves the same as `jsx --harmony` on the command line. This uses the ES6 transforms from [jstransform](https://github.com/facebook/jstransform).
-
-
-## 0.9.0 (February 20, 2014)
-
-### React Core
-
-#### Breaking Changes
-
- The lifecycle methods `componentDidMount` and `componentDidUpdate` no longer receive the root node as a parameter; use `this.getDOMNode()` instead
- Whenever a prop is equal to `undefined`, the default value returned by `getDefaultProps` will now be used instead
- `React.unmountAndReleaseReactRootNode` was previously deprecated and has now been removed
- `React.renderComponentToString` is now synchronous and returns the generated HTML string
- Full-page rendering (that is, rendering the `<html>` tag using React) is now supported only when starting with server-rendered markup
- On mouse wheel events, `deltaY` is no longer negated
- When prop types validation fails, a warning is logged instead of an error thrown (with the production build of React, type checks are now skipped for performance)
- On `input`, `select`, and `textarea` elements, `.getValue()` is no longer supported; use `.getDOMNode().value` instead
- `this.context` on components is now reserved for internal use by React
-
-#### New Features
-
- React now never rethrows errors, so stack traces are more accurate and Chrome's purple break-on-error stop sign now works properly
- Added support for SVG tags `defs`, `linearGradient`, `polygon`, `radialGradient`, `stop`
- Added support for more attributes:
-  - `crossOrigin` for CORS requests
-  - `download` and `hrefLang` for `<a>` tags
-  - `mediaGroup` and `muted` for `<audio>` and `<video>` tags
-  - `noValidate` and `formNoValidate` for forms
-  - `property` for Open Graph `<meta>` tags
-  - `sandbox`, `seamless`, and `srcDoc` for `<iframe>` tags
-  - `scope` for screen readers
-  - `span` for `<colgroup>` tags
- Added support for defining `propTypes` in mixins
- Added `any`, `arrayOf`, `component`, `oneOfType`, `renderable`, `shape` to `React.PropTypes`
- Added support for `statics` on component spec for static component methods
- On all events, `.currentTarget` is now properly set
- On keyboard events, `.key` is now polyfilled in all browsers for special (non-printable) keys
- On clipboard events, `.clipboardData` is now polyfilled in IE
- On drag events, `.dragTransfer` is now present
- Added support for `onMouseOver` and `onMouseOut` in addition to the existing `onMouseEnter` and `onMouseLeave` events
- Added support for `onLoad` and `onError` on `<img>` elements
- Added support for `onReset` on `<form>` elements
- The `autoFocus` attribute is now polyfilled consistently on `input`, `select`, and `textarea`
-
-#### Bug Fixes
-
- React no longer adds an `__owner__` property to each component's `props` object; passed-in props are now never mutated
- When nesting top-level components (e.g., calling `React.renderComponent` within `componentDidMount`), events now properly bubble to the parent component
- Fixed a case where nesting top-level components would throw an error when updating
- Passing an invalid or misspelled propTypes type now throws an error
- On mouse enter/leave events, `.target`, `.relatedTarget`, and `.type` are now set properly
- On composition events, `.data` is now properly normalized in IE9 and IE10
- CSS property values no longer have `px` appended for the unitless properties `columnCount`, `flex`, `flexGrow`, `flexShrink`, `lineClamp`, `order`, `widows`
- Fixed a memory leak when unmounting children with a `componentWillUnmount` handler
- Fixed a memory leak when `renderComponentToString` would store event handlers
- Fixed an error that could be thrown when removing form elements during a click handler
- Boolean attributes such as `disabled` are rendered without a value (previously `disabled="true"`, now simply `disabled`)
- `key` values containing `.` are now supported
- Shortened `data-reactid` values for performance
- Components now always remount when the `key` property changes
- Event handlers are attached to `document` only when necessary, improving performance in some cases
- Events no longer use `.returnValue` in modern browsers, eliminating a warning in Chrome
- `scrollLeft` and `scrollTop` are no longer accessed on document.body, eliminating a warning in Chrome
- General performance fixes, memory optimizations, improvements to warnings and error messages
-
-### React with Addons
-
- `React.addons.TestUtils` was added to help write unit tests
- `React.addons.TransitionGroup` was renamed to `React.addons.CSSTransitionGroup`
- `React.addons.TransitionGroup` was added as a more general animation wrapper
- `React.addons.cloneWithProps` was added for cloning components and modifying their props
- Bug fix for adding back nodes during an exit transition for CSSTransitionGroup
- Bug fix for changing `transitionLeave` in CSSTransitionGroup
- Performance optimizations for CSSTransitionGroup
- On checkbox `<input>` elements, `checkedLink` is now supported for two-way binding
-
-### JSX Compiler and react-tools Package
-
- Whitespace normalization has changed; now space between two tags on the same line will be preserved, while newlines between two tags will be removed
- The `react-tools` npm package no longer includes the React core libraries; use the `react` package instead.
- `displayName` is now added in more cases, improving error messages and names in the React Dev Tools
- Fixed an issue where an invalid token error was thrown after a JSX closing tag
- `JSXTransformer` now uses source maps automatically in modern browsers
- `JSXTransformer` error messages now include the filename and problematic line contents when a file fails to parse
-
-## 0.8.0 (December 19, 2013)
-
-### React
-
-* Added support for more attributes:
-  * `rows` & `cols` for `<textarea>`
-  * `defer` & `async` for `<script>`
-  * `loop` for `<audio>` & `<video>`
-  * `autoCorrect` for form fields (a non-standard attribute only supported by mobile WebKit)
-* Improved error messages
-* Fixed Selection events in IE11
-* Added `onContextMenu` events
-
-### React with Addons
-
-* Fixed bugs with TransitionGroup when children were undefined
-* Added support for `onTransition`
-
-### react-tools
-
-* Upgraded `jstransform` and `esprima-fb`
-
-### JSXTransformer
-
-* Added support for use in IE8
-* Upgraded browserify, which reduced file size by ~65KB (16KB gzipped)
-
-
-## 0.5.2, 0.4.2 (December 18, 2013)
-
-### React
-
-* Fixed a potential XSS vulnerability when using user content as a `key`: [CVE-2013-7035](https://groups.google.com/forum/#!topic/reactjs/OIqxlB2aGfU)
-
-
-## 0.5.1 (October 29, 2013)
-
-### React
-
-* Fixed bug with `<input type="range">` and selection events.
-* Fixed bug with selection and focus.
-* Made it possible to unmount components from the document root.
-* Fixed bug for `disabled` attribute handling on non-`<input>` elements.
-
-### React with Addons
-
-* Fixed bug with transition and animation event detection.
-
-
-## 0.5.0 (October 16, 2013)
-
-### React
-
-* Memory usage improvements - reduced allocations in core which will help with GC pauses
-* Performance improvements - in addition to speeding things up, we made some tweaks to stay out of slow path code in V8 and Nitro.
-* Standardized prop -> DOM attribute process. This previously resulting in additional type checking and overhead as well as confusing cases for users. Now we will always convert your value to a string before inserting it into the DOM.
-* Support for Selection events.
-* Support for [Composition events](https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent).
-* Support for additional DOM properties (`charSet`, `content`, `form`, `httpEquiv`, `rowSpan`, `autoCapitalize`).
-* Support for additional SVG properties (`rx`, `ry`).
-* Support for using `getInitialState` and `getDefaultProps` in mixins.
-* Support mounting into iframes.
-* Bug fixes for controlled form components.
-* Bug fixes for SVG element creation.
-* Added `React.version`.
-* Added `React.isValidClass` - Used to determine if a value is a valid component constructor.
-* Removed `React.autoBind` - This was deprecated in v0.4 and now properly removed.
-* Renamed  `React.unmountAndReleaseReactRootNode` to `React.unmountComponentAtNode`.
-* Began laying down work for refined performance analysis.
-* Better support for server-side rendering - [react-page](https://github.com/facebook/react-page) has helped improve the stability for server-side rendering.
-* Made it possible to use React in environments enforcing a strict [Content Security Policy](https://developer.mozilla.org/en-US/docs/Security/CSP/Introducing_Content_Security_Policy). This also makes it possible to use React to build Chrome extensions.
-
-### React with Addons (New!)
-
-* Introduced a separate build with several "addons" which we think can help improve the React experience. We plan to deprecate this in the long-term, instead shipping each as standalone pieces. [Read more in the docs](http://facebook.github.io/react/docs/addons.html).
-
-### JSX
-
-* No longer transform `class` to `className` as part of the transform! This is a breaking change - if you were using `class`, you *must* change this to `className` or your components will be visually broken.
-* Added warnings to the in-browser transformer to make it clear it is not intended for production use.
-* Improved compatibility for Windows
-* Improved support for maintaining line numbers when transforming.
-
-
 ## 0.4.1 (July 26, 2013)

 ### React
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -27,7 +27,7 @@ The core team will be monitoring for pull requests. When we get one, we'll run s

 In order to accept your pull request, we need you to submit a CLA. You only need to do this once, so if you've done this for another Facebook open source project, you're good to go. If you are submitting a pull request for the first time, just let us know that you have completed the CLA and we can cross-check with your GitHub username.

-Complete your CLA here: <https://code.facebook.com/cla>
+Complete your CLA here: <https://developers.facebook.com/opensource/cla>

 ## Bugs

@@ -57,7 +57,6 @@ Facebook has a [bounty program](https://www.facebook.com/whitehat/) for the safe
 * `"use strict";`
 * 80 character line length
 * "Attractive"
-* Do not use the optional parameters of `setTimeout` and `setInterval`

 ## License

--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -3,226 +3,76 @@
 var exec = require('child_process').exec;
 var jsxTask = require('./grunt/tasks/jsx');
 var browserifyTask = require('./grunt/tasks/browserify');
+var wrapupTask = require('./grunt/tasks/wrapup');
 var populistTask = require('./grunt/tasks/populist');
-var webdriverPhantomJSTask = require('./grunt/tasks/webdriver-phantomjs');
-var webdriverJasmineTasks = require('./grunt/tasks/webdriver-jasmine');
-var sauceTunnelTask = require('./grunt/tasks/sauce-tunnel');
+var phantomTask = require('./grunt/tasks/phantom');
 var npmTask = require('./grunt/tasks/npm');
 var releaseTasks = require('./grunt/tasks/release');
-var npmReactTasks = require('./grunt/tasks/npm-react');
-var npmReactToolsTasks = require('./grunt/tasks/npm-react-tools');
-var versionCheckTask = require('./grunt/tasks/version-check');

 module.exports = function(grunt) {

  grunt.initConfig({
    pkg: grunt.file.readJSON('package.json'),
    copy: require('./grunt/config/copy'),
-    jsx: require('./grunt/config/jsx'),
+    jsx: require('./grunt/config/jsx/jsx'),
    browserify: require('./grunt/config/browserify'),
-    populist: require('./grunt/config/populist')(grunt),
-    connect: require('./grunt/config/server')(grunt),
-    "webdriver-jasmine": require('./grunt/config/webdriver-jasmine'),
-    "webdriver-perf": require('./grunt/config/webdriver-perf'),
+    wrapup: require('./grunt/config/wrapup'),
+    populist: require('./grunt/config/populist'),
+    phantom: require('./grunt/config/phantom'),
    npm: require('./grunt/config/npm'),
-    clean: ['./build', './*.gem', './docs/_site', './examples/shared/*.js', '.module-cache'],
+    clean: ['./build', './*.gem', './docs/_site', './examples/shared/*.js'],
    jshint: require('./grunt/config/jshint'),
    compare_size: require('./grunt/config/compare_size')
  });

  grunt.config.set('compress', require('./grunt/config/compress'));

-  Object.keys(grunt.file.readJSON('package.json').devDependencies)
-    .filter(function(npmTaskName) { return npmTaskName.indexOf('grunt-') === 0; })
-    .filter(function(npmTaskName) { return npmTaskName != 'grunt-cli'; })
-    .forEach(function(npmTaskName) { grunt.loadNpmTasks(npmTaskName); });
+  grunt.loadNpmTasks('grunt-contrib-jshint');
+  grunt.loadNpmTasks('grunt-contrib-copy');
+  grunt.loadNpmTasks('grunt-contrib-clean');
+  grunt.loadNpmTasks('grunt-compare-size');
+  grunt.loadNpmTasks('grunt-contrib-compress');

  // Alias 'jshint' to 'lint' to better match the workflow we know
  grunt.registerTask('lint', ['jshint']);

-  grunt.registerTask('download-previous-version', require('./grunt/tasks/download-previous-version.js'));
-
-  grunt.registerTask('delete-build-modules', function() {
-    if (grunt.file.exists('build/modules')) {
-      grunt.file.delete('build/modules');
-    }
-  });
-
-  // Register jsx:normal and :release tasks.
+  // Register jsx:debug and :release tasks.
  grunt.registerMultiTask('jsx', jsxTask);

  // Our own browserify-based tasks to build a single JS file build
  grunt.registerMultiTask('browserify', browserifyTask);

+  // Similar to Browserify, use WrapUp to generate single JS file that
+  // defines global variables instead of using require.
+  grunt.registerMultiTask('wrapup', wrapupTask);
+
  grunt.registerMultiTask('populist', populistTask);

-  grunt.registerTask('sauce-tunnel', sauceTunnelTask);
-
-  grunt.registerMultiTask('webdriver-jasmine', webdriverJasmineTasks);
-
-  grunt.registerMultiTask('webdriver-perf', require('./grunt/tasks/webdriver-perf'));
+  grunt.registerMultiTask('phantom', phantomTask);

  grunt.registerMultiTask('npm', npmTask);

-  grunt.registerTask('npm-react:release', npmReactTasks.buildRelease);
-  grunt.registerTask('npm-react:pack', npmReactTasks.packRelease);
-  grunt.registerTask('npm-react-tools:release', npmReactToolsTasks.buildRelease);
-  grunt.registerTask('npm-react-tools:pack', npmReactToolsTasks.packRelease);
-
-  grunt.registerTask('version-check', versionCheckTask);
-
-  grunt.registerTask('build:basic', ['jsx:normal', 'version-check', 'browserify:basic']);
-  grunt.registerTask('build:addons', ['jsx:normal', 'browserify:addons']);
-  grunt.registerTask('build:transformer', ['jsx:normal', 'browserify:transformer']);
-  grunt.registerTask('build:min', ['jsx:normal', 'version-check', 'browserify:min']);
-  grunt.registerTask('build:addons-min', ['jsx:normal', 'browserify:addonsMin']);
-  grunt.registerTask('build:withCodeCoverageLogging', [
-    'jsx:normal',
-    'version-check',
-    'browserify:withCodeCoverageLogging'
-  ]);
-  grunt.registerTask('build:perf', [
-    'jsx:normal',
-    'version-check',
-    'browserify:transformer',
-    'browserify:basic',
-    'browserify:min',
-    'download-previous-version'
-  ]);
+  grunt.registerTask('build:basic', ['jsx:debug', 'browserify:basic']);
+  grunt.registerTask('build:transformer', ['jsx:debug', 'browserify:transformer']);
+  grunt.registerTask('build:min', ['jsx:release', 'browserify:min']);
  grunt.registerTask('build:test', [
-    'delete-build-modules',
+    'jsx:jasmine',
    'jsx:test',
-    'version-check',
+    'populist:jasmine',
    'populist:test'
  ]);
-  grunt.registerTask('build:npm-react', ['version-check', 'jsx:normal', 'npm-react:release']);

-  grunt.registerTask('webdriver-phantomjs', webdriverPhantomJSTask);
-
-  grunt.registerTask('coverage:parse', require('./grunt/tasks/coverage-parse'));
-
-  grunt.registerTask('test:webdriver:phantomjs', [
-    'connect',
-    'webdriver-phantomjs',
-    'webdriver-jasmine:local'
-  ]);
-
-  grunt.registerTask('perf:webdriver:phantomjs', [
-    'connect',
-    'webdriver-phantomjs',
-    'webdriver-perf:local'
-  ]);
-
-  grunt.registerTask('test:full', [
-    'build:test',
-    'build:basic',
-
-    'connect',
-    'webdriver-phantomjs',
-    'webdriver-jasmine:local',
-
-    'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_android',
-    'webdriver-jasmine:saucelabs_firefox',
-    'webdriver-jasmine:saucelabs_chrome'
-  ]);
-
-  grunt.registerTask('perf:full', [
-    'build:perf',
-
-    'connect',
-    'webdriver-phantomjs',
-    'webdriver-perf:local',
-
-    'sauce-tunnel',
-    'webdriver-perf:saucelabs_firefox',
-    'webdriver-perf:saucelabs_chrome',
-    'webdriver-perf:saucelabs_ie11',
-    'webdriver-perf:saucelabs_ie8',
-  ]);
-
-  grunt.registerTask('test:webdriver:saucelabs', [
-    'build:test',
-    'build:basic',
-
-    'connect',
-    'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_' + (process.env.BROWSER_NAME || 'ie8')
-  ]);
-
-  grunt.registerTask('test:webdriver:saucelabs:modern', [
-    'build:test',
-    'build:basic',
-
-    'connect',
-    'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_android',
-    'webdriver-jasmine:saucelabs_firefox',
-    'webdriver-jasmine:saucelabs_chrome',
-    'webdriver-jasmine:saucelabs_ie11'
-  ]);
-
-  grunt.registerTask('test:webdriver:saucelabs:ie', [
-    'build:test',
-    'build:basic',
-
-    'connect',
-    'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_ie8',
-    'webdriver-jasmine:saucelabs_ie9',
-    'webdriver-jasmine:saucelabs_ie10',
-    'webdriver-jasmine:saucelabs_ie11'
-  ]);
-
-  grunt.registerTask('test:webdriver:saucelabs:ios', [
-    'build:test',
-    'build:basic',
-
-    'connect',
-    'sauce-tunnel',
-    'webdriver-jasmine:saucelabs_ios6_1',
-    'webdriver-jasmine:saucelabs_ios5_1',
-    'webdriver-jasmine:saucelabs_ios4'
-  ]);
-
-  grunt.registerTask('test:coverage', [
-    'build:test',
-    'build:withCodeCoverageLogging',
-    'test:webdriver:phantomjs',
-    'coverage:parse'
-  ]);
-  grunt.registerTask('fasttest', function() {
-    if (grunt.option('debug')) {
-      grunt.task.run('build:test', 'connect:server:keepalive');
-    } else {
-      grunt.task.run('build:test', 'test:webdriver:phantomjs');
-    }
-  });
-  grunt.registerTask('test', function() {
-    if (grunt.option('debug')) {
-      grunt.task.run('build:test', 'build:basic', 'connect:server:keepalive');
-    } else {
-      grunt.task.run('build:test', 'build:basic', 'test:webdriver:phantomjs');
-    }
-  });
-  grunt.registerTask('perf', ['build:perf', 'perf:webdriver:phantomjs']);
+  grunt.registerTask('test', ['build:test', 'phantom:run']);
  grunt.registerTask('npm:test', ['build', 'npm:pack']);

  // Optimized build task that does all of our builds. The subtasks will be run
-  // in order so we can take advantage of that and only run jsx:normal once.
+  // in order so we can take advantage of that and only run jsx:debug once.
  grunt.registerTask('build', [
-    'delete-build-modules',
-    'jsx:normal',
-    'version-check',
+    'jsx:debug',
    'browserify:basic',
    'browserify:transformer',
-    'browserify:addons',
+    'jsx:release',
    'browserify:min',
-    'browserify:addonsMin',
-    'npm-react:release',
-    'npm-react:pack',
-    'npm-react-tools:release',
-    'npm-react-tools:pack',
    'copy:react_docs',
    'compare_size'
  ]);
--- a/README.md
+++ b/README.md
@@ -1,22 +1,22 @@
-# [React](http://facebook.github.io/react) [![Build Status](https://travis-ci.org/facebook/react.svg?branch=master)](https://travis-ci.org/facebook/react)
+# [React](http://facebook.github.io/react) [![Build Status](https://travis-ci.org/facebook/react.png?branch=master)](https://travis-ci.org/facebook/react)

 React is a JavaScript library for building user interfaces.

-* **Just the UI:** Lots of people use React as the V in MVC. Since React makes no assumptions about the rest of your technology stack, it's easy to try it out on a small feature in an existing project.
-* **Virtual DOM:** React uses a *virtual DOM* diff implementation for ultra-high performance. It can also render on the server using Node.js — no heavy browser DOM required.
-* **Data flow:** React implements one-way reactive data flow which reduces boilerplate and is easier to reason about than traditional data binding.
+* **Declarative:** React uses a declarative paradigm that makes it easier to reason about your application.
+* **Efficient:** React computes the minimal set of changes necessary to keep your DOM up-to-date.
+* **Flexible:** React works with the libraries and frameworks that you already know.

 [Learn how to use React in your own project.](http://facebook.github.io/react/docs/getting-started.html)

 ## Examples

-We have several examples [on the website](http://facebook.github.io/react/). Here is the first one to get you started:
+We have several examples [on the website](http://facebook.github.io/react). Here is the first one to get you started:

 ```js
 /** @jsx React.DOM */
 var HelloMessage = React.createClass({
  render: function() {
-    return <div>Hello {this.props.name}</div>;
+    return <div>{'Hello ' + this.props.name}</div>;
  }
 });

@@ -28,7 +28,7 @@ React.renderComponent(

 This example will render "Hello John" into a container on the page.

-You'll notice that we used an HTML-like syntax; [we call it JSX](http://facebook.github.io/react/docs/jsx-in-depth.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. A simple transform is included with React that allows converting JSX into native JavaScript for browsers to digest.
+You'll notice that we used an XML-like syntax; [we call it JSX](http://facebook.github.io/react/docs/syntax.html). JSX is not required to use React, but it makes code more readable, and writing it feels like writing HTML. A simple transform is included with React that allows converting JSX into native JavaScript for browsers to digest.

 ## Installation

@@ -36,12 +36,12 @@ The fastest way to get started is to serve JavaScript from the CDN (also availab

 ```html
 <!-- The core React library -->
-<script src="http://fb.me/react-0.11.1.js"></script>
+<script src="http://fb.me/react-0.4.1.min.js"></script>
 <!-- In-browser JSX transformer, remove when pre-compiling JSX. -->
-<script src="http://fb.me/JSXTransformer-0.11.1.js"></script>
+<script src="http://fb.me/JSXTransformer-0.4.1.js"></script>
 ```

-We've also built a [starter kit](http://facebook.github.io/react/downloads/react-0.11.1.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.
+We've also built a [starter kit](http://facebook.github.io/react/downloads/react-0.4.1.zip) which might be useful if this is your first time using React. It includes a webpage with an example of using React with live code.

 If you'd like to use [bower](http://bower.io), it's as easy as:

@@ -51,7 +51,7 @@ bower install --save react

 ## Contribute

-The main purpose of this repository is to continue to evolve React core, making it faster and easier to use. If you're interested in helping with that, then keep reading. If you're not interested in helping right now that's ok too. :) Any feedback you have about using React would be greatly appreciated.
+The main purpose of this repository is to continue to evolve React core, making it faster and easier to use. If you're interested in helping with that, then keep reading. If you're not interested in helping right now that's ok too :) Any feedback you have about using React would be greatly appreciated.

 ### Building Your Copy of React

@@ -81,14 +81,12 @@ At this point, you should now have a `build/` directory populated with everythin
 We use grunt to automate many tasks. Run `grunt -h` to see a mostly complete listing. The important ones to know:

 ```sh
-# Build and run tests with PhantomJS
+# Create test build & run tests with PhantomJS
 grunt test
-# Build and run tests in your browser
-grunt test --debug
-# For speed, you can use fasttest and add --filter to only run one test
-grunt fasttest --filter=ReactIdentity
-# Lint the code with JSHint
+# Lint the core library code with JSHint
 grunt lint
+# Lint package code
+grunt lint:package
 # Wipe out build directory
 grunt clean
 ```
--- a/bin/jsx
+++ b/bin/jsx
@@ -1,28 +1,55 @@
 #!/usr/bin/env node
-// -*- mode: js -*-
 "use strict";

-var transform = require('../main').transform;
+var visitors = require('../vendor/fbtransform/visitors').transformVisitors;
+var transform = require('../vendor/fbtransform/lib/transform').transform;
+var propagate = require("../vendor/constants").propagate;
+
+require("commoner").resolve(function(id) {
+  var context = this;
+
+  // Note that the result of context.getProvidedP() is cached for the
+  // duration of the build, so it is both consistent and cheap to
+  // evaluate multiple times.
+  return context.getProvidedP().then(function(idToPath) {
+    // If a module declares its own identifier using @providesModule
+    // then that identifier will be a key in the idToPath object.
+    if (idToPath.hasOwnProperty(id)) {
+      return context.readFileP(idToPath[id]);
+    }
+
+    // Otherwise assume the identifier maps directly to a path in the
+    // filesystem.
+    return context.readModuleP(id);
+  });
+
+}).process(function(id, source) {
+  var context = this;
+  var constants = context.config.constants || {};

-require('commoner').version(
-  require('../package.json').version
-).resolve(function(id) {
-  return this.readModuleP(id);
-}).option(
-  '--harmony',
-  'Turns on JS transformations such as ES6 Classes etc.'
-).option(
-  '--strip-types',
-  'Strips out type annotations.'
-).option(
-  '--source-map-inline',
-  'Embed inline sourcemap in transformed source'
-).process(function(id, source) {
  // This is where JSX, ES6, etc. desugaring happens.
-  var options = {
-    harmony: this.options.harmony,
-    sourceMap: this.options.sourceMapInline,
-    stripTypes: this.options.stripTypes
-  };
-  return transform(source, options);
+  source = transform(visitors.react, source).code;
+
+  // Constant propagation means removing any obviously dead code after
+  // replacing constant expressions with literal (boolean) values.
+  source = propagate(constants, source);
+
+  if (context.config.mocking) {
+    // Make sure there is exactly one newline at the end of the module.
+    source = source.replace(/\s+$/m, "\n");
+
+    return context.getProvidedP().then(function(idToPath) {
+      if (id !== "mock-modules" &&
+          id !== "mocks" &&
+          id !== "test/all" &&
+          idToPath.hasOwnProperty("mock-modules")) {
+        return source + '\nrequire("mock-modules").register(' +
+          JSON.stringify(id) + ', module);\n';
+      }
+
+      return source;
+    });
+  }
+
+  return source;
 });
--- a/bin/jsx-internal
+++ b/bin/jsx-internal
@@ -1,58 +0,0 @@
-#!/usr/bin/env node
-// -*- mode: js -*-
-"use strict";
-
-var getAllVisitors = require('../vendor/fbtransform/visitors').getAllVisitors;
-var transform = require('jstransform').transform;
-var propagate = require("../vendor/constants").propagate;
-
-require("commoner").version(
-  require("../package.json").version
-).resolve(function(id) {
-  var context = this;
-
-  // Note that the result of context.getProvidedP() is cached for the
-  // duration of the build, so it is both consistent and cheap to
-  // evaluate multiple times.
-  return context.getProvidedP().then(function(idToPath) {
-    // If a module declares its own identifier using @providesModule
-    // then that identifier will be a key in the idToPath object.
-    if (idToPath.hasOwnProperty(id)) {
-      return context.readFileP(idToPath[id]);
-    }
-
-    // Otherwise assume the identifier maps directly to a path in the
-    // filesystem.
-    return context.readModuleP(id);
-  });
-
-}).process(function(id, source) {
-  var context = this;
-  var constants = context.config.constants || {};
-
-  // This is where JSX, ES6, etc. desugaring happens.
-  source = transform(getAllVisitors(), source).code;
-
-  // Constant propagation means removing any obviously dead code after
-  // replacing constant expressions with literal (boolean) values.
-  source = propagate(constants, source);
-
-  if (context.config.mocking) {
-    // Make sure there is exactly one newline at the end of the module.
-    source = source.replace(/\s+$/m, "\n");
-
-    return context.getProvidedP().then(function(idToPath) {
-      if (id !== "mock-modules" &&
-          id !== "mocks" &&
-          id !== "test/all" &&
-          idToPath.hasOwnProperty("mock-modules")) {
-        return source + '\nrequire("mock-modules").register(' +
-          JSON.stringify(id) + ', module);\n';
-      }
-
-      return source;
-    });
-  }
-
-  return source;
-});
--- a/docs/404.md
+++ b/docs/404.md
@@ -1,8 +0,0 @@
---
-layout: single
-title: Page Not Found
---
-
-We couldn't find what you were looking for.
-
-Please contact the owner of the site that linked you to the original URL and let them know their link is broken.
--- a/docs/Gemfile
+++ b/docs/Gemfile
@@ -3,17 +3,19 @@ source 'https://rubygems.org'
 gem 'rake'

 # jekyll, which builds it all
-# 2.0 includes sass processing
-gem 'jekyll', '~>2.0'
-
-# Auto redirect pages
-gem 'jekyll-redirect-from'
+gem 'jekyll', '~>1.0'

 # JSON
 gem 'json'

+# SASS for CSS
+gem 'sass'
+
 # For `rake watch`
 gem 'rb-fsevent'

+# Redcarpet for Markdown
+gem 'redcarpet'
+
 # For markdown header cleanup
-gem 'sanitize', '~>2.0'
+gem 'sanitize'
--- a/docs/Gemfile.lock
+++ b/docs/Gemfile.lock
@@ -1,82 +1,54 @@
 GEM
  remote: https://rubygems.org/
  specs:
-    blankslate (2.1.2.4)
-    celluloid (0.15.2)
-      timers (~> 1.1.0)
-    classifier (1.3.4)
+    classifier (1.3.3)
      fast-stemmer (>= 1.0.0)
-    coffee-script (2.3.0)
-      coffee-script-source
-      execjs
-    coffee-script-source (1.7.1)
    colorator (0.1)
-    execjs (2.2.1)
+    commander (4.1.3)
+      highline (~> 1.6.11)
+    directory_watcher (1.4.1)
    fast-stemmer (1.0.2)
-    ffi (1.9.3)
-    jekyll (2.2.0)
+    highline (1.6.19)
+    jekyll (1.0.2)
      classifier (~> 1.3)
      colorator (~> 0.1)
-      jekyll-coffeescript (~> 1.0)
-      jekyll-gist (~> 1.0)
-      jekyll-paginate (~> 1.0)
-      jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.0)
-      kramdown (~> 1.3)
-      liquid (~> 2.6.1)
-      mercenary (~> 0.3.3)
-      pygments.rb (~> 0.6.0)
-      redcarpet (~> 3.1)
-      safe_yaml (~> 1.0)
-      toml (~> 0.1.0)
-    jekyll-coffeescript (1.0.0)
-      coffee-script (~> 2.2)
-    jekyll-gist (1.1.0)
-    jekyll-paginate (1.0.0)
-    jekyll-redirect-from (0.5.0)
-      jekyll (~> 2.0)
-    jekyll-sass-converter (1.2.0)
-      sass (~> 3.2)
-    jekyll-watch (1.1.0)
-      listen (~> 2.7)
-    json (1.8.1)
-    kramdown (1.4.1)
-    liquid (2.6.1)
-    listen (2.7.9)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    mercenary (0.3.4)
-    mini_portile (0.6.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
-    posix-spawn (0.3.9)
-    pygments.rb (0.6.0)
+      commander (~> 4.1.3)
+      directory_watcher (~> 1.4.1)
+      kramdown (~> 1.0.2)
+      liquid (~> 2.3)
+      maruku (~> 0.5)
+      pygments.rb (~> 0.5.0)
+      safe_yaml (~> 0.7.0)
+    json (1.8.0)
+    kramdown (1.0.2)
+    liquid (2.5.0)
+    maruku (0.6.1)
+      syntax (>= 1.0.0)
+    mini_portile (0.5.1)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
+    posix-spawn (0.3.6)
+    pygments.rb (0.5.0)
      posix-spawn (~> 0.3.6)
      yajl-ruby (~> 1.1.0)
-    rake (10.3.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    redcarpet (3.1.2)
-    safe_yaml (1.0.3)
+    rake (10.0.4)
+    rb-fsevent (0.9.3)
+    redcarpet (2.2.2)
+    safe_yaml (0.7.1)
    sanitize (2.0.6)
      nokogiri (>= 1.4.4)
-    sass (3.3.14)
-    timers (1.1.0)
-    toml (0.1.1)
-      parslet (~> 1.5.0)
+    sass (3.2.9)
+    syntax (1.0.0)
    yajl-ruby (1.1.0)

 PLATFORMS
  ruby

 DEPENDENCIES
-  jekyll (~> 2.0)
-  jekyll-redirect-from
+  jekyll (~> 1.0)
  json
  rake
  rb-fsevent
-  sanitize (~> 2.0)
+  redcarpet
+  sanitize
+  sass
--- a/docs/README.md
+++ b/docs/README.md
@@ -21,7 +21,6 @@ Once you have RubyGems and installed Bundler (via `gem install bundler`), use it
 ```sh
 $ cd react/docs
 $ bundle install # Might need sudo.
-$ npm install # Might need sudo.
 ```

 ### Instructions
@@ -32,8 +31,8 @@ Use Jekyll to serve the website locally (by default, at `http://localhost:4000`)

 ```sh
 $ cd react/docs
-$ bundle exec rake
-$ bundle exec jekyll serve -w
+$ rake
+$ jekyll serve -w
 $ open http://localhost:4000/react/
 ```

@@ -43,9 +42,10 @@ If you want to modify the CSS or JS, use [Rake](http://rake.rubyforge.org/) to c

 ```sh
 $ cd react/docs
-$ bundle exec rake watch # Automatically compiles as needed.
-# bundle exec rake         Manually compile CSS and JS.
-# bundle exec rake js      Manually compile JS, only.
+$ rake watch # Automatically compiles as needed.
+# rake         Manually compile CSS and JS.
+# rake css     Manually compile CSS, only.
+# rake js      Manually compile JS, only.
 ```

 ## Afterthoughts
@@ -54,13 +54,7 @@ $ bundle exec rake watch # Automatically compiles as needed.

 The easiest way to do this is to have a separate clone of this repository, checked out to the `gh-pages` branch. We have a build step that expects this to be in a directory named `react-gh-pages` at the same depth as `react`. Then it's just a matter of running `grunt docs`, which will compile the site and copy it out to this repository. From there you can check it in.

-**Note:** This should only be done for new releases. You should create a tag corresponding to the release tag in the main repository.
-
-We also have a rake task that does the same thing (without creating commits). It expects the directory structure mentioned above.
-
-```sh
-$ bundle exec rake release
-```
+**Note:** This should only be done for new releases. You should create a tag corresponding to the relase tag in the main repository.

 ### Removing the Jekyll / Ruby Dependency

--- a/docs/Rakefile
+++ b/docs/Rakefile
@@ -2,13 +2,19 @@ require('rubygems')
 require('json')
 require('yaml')

+desc "generate css from sass"
+task :css do
+  system "sass --style=compressed _css/react.scss css/react.css"
+end
+
 desc "generate js from jsx"
 task :js do
  system "../bin/jsx _js js"
 end

-desc "watch js"
+desc "watch css & js"
 task :watch do
+  Process.spawn "sass --style=compressed --watch _css/react.scss:css/react.css"
  Process.spawn "../bin/jsx --watch _js js"
  Process.waitall
 end
@@ -23,19 +29,9 @@ task :update_version do
  end
 end

-desc "update acknowledgements list"
-task :update_acknowledgements do
-  authors = File.readlines('../AUTHORS').map {|author| author.gsub(/ <.*\n/,'')}
-  # split into cols here because nobody knows how to use liquid
-  # need to to_f because ruby will keep slice_size as int and round on its own
-  slice_size = (authors.size / 3.to_f).ceil
-  cols = authors.each_slice(slice_size).to_a
-  File.open('_data/acknowledgements.yml', 'w+') { |f| f.write(cols.to_yaml) }
-end
-
 desc "build into ../../react-gh-pages"
 task :release => [:update_version, :default] do
  system "jekyll build -d ../../react-gh-pages"
 end

-task :default => [:js]
+task :default => [:css, :js]
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,37 +1,69 @@
 ---
-name: React
-description: A JavaScript library for building user interfaces
+baseurl: /react
 url: http://facebook.github.io
-baseurl: "/react"
-permalink: "/blog/:year/:month/:day/:title.html"
-paginate_path: "/blog/page:num/"
-relative_permalinks: true
-paginate: 5
-timezone: America/Los_Angeles
-highlighter: pygments
-defaults:
- scope:
-    path: ''
-    type: post
-  values:
-    layout: post
- scope:
-    path: docs
-    type: page
-  values:
-    layout: docs
+permalink: /blog/:year/:month/:day/:title.html
 exclude:
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
-markdown: redcarpet
 redcarpet:
  extensions:
  - fenced_code_blocks
-sass:
-  style: :compressed
-  sass_dir: _css
-gems:
- jekyll-redirect-from
-react_version: 0.11.1
+pygments: true
+name: React
+markdown: redcarpet
+react_version: 0.4.2
+description: A JavaScript library for building user interfaces
+relative_permalinks: true
+paginate: 5
+paginate_path: /blog/page:num
+nav_docs_sections:
+- title: Quick Start
+  items:
+  - id: getting-started
+    title: Getting Started
+  - id: tutorial
+    title: Tutorial
+- title: Guides
+  items:
+  - id: why-react
+    title: Why React?
+  - id: displaying-data
+    title: Displaying Data
+    subitems:
+    - id: jsx-in-depth
+      title: JSX in Depth
+    - id: jsx-gotchas
+      title: JSX Gotchas
+  - id: interactivity-and-dynamic-uis
+    title: Interactivity and Dynamic UIs
+  - id: multiple-components
+    title: Multiple Components
+  - id: reusable-components
+    title: Reusable Components
+  - id: forms
+    title: Forms
+  - id: working-with-the-browser
+    title: Working With the Browser
+    subitems:
+    - id: more-about-refs
+      title: More About Refs
+  - id: tooling-integration
+    title: Tooling Integration
+  - id: examples
+    title: Examples
+- title: Reference
+  items:
+  - id: top-level-api
+    title: Top-Level API
+  - id: component-api
+    title: Component API
+  - id: component-specs
+    title: Component Specs and Lifecycle
+  - id: tags-and-attributes
+    title: Supported Tags and Attributes
+  - id: events
+    title: Event System
+  - id: dom-differences
+    title: DOM Differences
--- a/docs/_css/_typography.scss
+++ b/docs/_css/_typography.scss
@@ -6,6 +6,7 @@ $textColorLight: lighten($textColor, 20%);
 html {
  font-family: $helvetica;
  font-family: proxima-nova, $helvetica;
+  font-weight: 300;
  color: $textColor;
  line-height: 1.28;
 }
@@ -131,3 +132,5 @@ a {
 .center {
  text-align: center;
 }
+
+
--- a/docs/_css/bourbon/_bourbon-deprecated-upcoming.scss
+++ b/docs/_css/bourbon/_bourbon-deprecated-upcoming.scss
@@ -2,7 +2,12 @@
 // These mixins/functions are deprecated
 // They will be removed in the next MAJOR version release
 //************************************************************************//
-@mixin inline-block {
-  display: inline-block;
-  @warn "inline-block mixin is deprecated and will be removed in the next major version release";
+@mixin box-shadow ($shadows...) {
+  @include prefixer(box-shadow, $shadows, spec);
+  @warn "box-shadow is deprecated and will be removed in the next major version release";
+}
+
+@mixin background-size ($lengths...) {
+  @include prefixer(background-size, $lengths, spec);
+  @warn "background-size is deprecated and will be removed in the next major version release";
 }
--- a/docs/_css/bourbon/_bourbon.scss
+++ b/docs/_css/bourbon/_bourbon.scss
@@ -1,36 +1,22 @@
-// Settings
-@import "settings/prefixer";
-@import "settings/px-to-em";
-@import "settings/asset-pipeline";
-
 // Custom Helpers
-@import "helpers/convert-units";
+@import "helpers/deprecated-webkit-gradient";
@import "helpers/gradient-positions-parser";
-@import "helpers/is-num";
-@import "helpers/linear-angle-parser";
-@import "helpers/linear-gradient-parser";
@import "helpers/linear-positions-parser";
-@import "helpers/linear-side-corner-parser";
@import "helpers/radial-arg-parser";
@import "helpers/radial-positions-parser";
-@import "helpers/radial-gradient-parser";
@import "helpers/render-gradients";
@import "helpers/shape-size-stripper";
-@import "helpers/str-to-num";

 // Custom Functions
-@import "functions/assign";
-@import "functions/color-lightness";
+@import "functions/compact";
@import "functions/flex-grid";
-@import "functions/golden-ratio";
@import "functions/grid-width";
+@import "functions/linear-gradient";
@import "functions/modular-scale";
@import "functions/px-to-em";
-@import "functions/px-to-rem";
-@import "functions/strip-units";
+@import "functions/radial-gradient";
@import "functions/tint-shade";
@import "functions/transition-property-name";
-@import "functions/unpack";

 // CSS3 Mixins
@import "css3/animation";
@@ -41,15 +27,12 @@
@import "css3/border-image";
@import "css3/border-radius";
@import "css3/box-sizing";
-@import "css3/calc";
@import "css3/columns";
-@import "css3/filter";
@import "css3/flex-box";
@import "css3/font-face";
-@import "css3/font-feature-settings";
-@import "css3/hyphens";
@import "css3/hidpi-media-query";
@import "css3/image-rendering";
+@import "css3/inline-block";
@import "css3/keyframes";
@import "css3/linear-gradient";
@import "css3/perspective";
@@ -62,8 +45,6 @@
 // Addons & other mixins
@import "addons/button";
@import "addons/clearfix";
-@import "addons/directional-values";
-@import "addons/ellipsis";
@import "addons/font-family";
@import "addons/hide-text";
@import "addons/html5-input-types";
@@ -73,7 +54,6 @@
@import "addons/size";
@import "addons/timing-functions";
@import "addons/triangle";
-@import "addons/word-wrap";

 // Soon to be deprecated Mixins
@import "bourbon-deprecated-upcoming";
--- a/docs/_css/bourbon/addons/_button.scss
+++ b/docs/_css/bourbon/addons/_button.scss
@@ -1,51 +1,38 @@
-@mixin button ($style: simple, $base-color: #4294f0, $text-size: inherit, $padding: 7px 18px) {
+@mixin button ($style: simple, $base-color: #4294f0) {

-  @if type-of($style) == string and type-of($base-color) == color {
-    @include buttonstyle($style, $base-color, $text-size, $padding);
-  }
-
-  @if type-of($style) == string and type-of($base-color) == number {
-    $padding: $text-size;
-    $text-size: $base-color;
-    $base-color: #4294f0;
-
-    @if $padding == inherit {
-      $padding: 7px 18px;
-    }
-
-    @include buttonstyle($style, $base-color, $text-size, $padding);
-  }
-
-  @if type-of($style) == color and type-of($base-color) == color {
+  @if type-of($style) == color {
    $base-color: $style;
    $style: simple;
-    @include buttonstyle($style, $base-color, $text-size, $padding);
  }

-  @if type-of($style) == color and type-of($base-color) == number {
-    $padding: $text-size;
-    $text-size: $base-color;
-    $base-color: $style;
-    $style: simple;
-
-    @if $padding == inherit {
-      $padding: 7px 18px;
+  // Grayscale button
+  @if $base-color == grayscale($base-color) {
+    @if $style == simple {
+      @include simple($base-color, $grayscale: true);
    }

-    @include buttonstyle($style, $base-color, $text-size, $padding);
+    @else if $style == shiny {
+      @include shiny($base-color, $grayscale: true);
+    }
+
+    @else if $style == pill {
+      @include pill($base-color, $grayscale: true);
+    }
  }

-  @if type-of($style) == number {
-    $padding: $base-color;
-    $text-size: $style;
-    $base-color: #4294f0;
-    $style: simple;
-
-    @if $padding == #4294f0 {
-      $padding: 7px 18px;
+  // Colored button
+  @else {
+    @if $style == simple {
+      @include simple($base-color);
    }

-    @include buttonstyle($style, $base-color, $text-size, $padding);
+    @else if $style == shiny {
+      @include shiny($base-color);
+    }
+
+    @else if $style == pill {
+      @include pill($base-color);
+    }
  }

  &:disabled {
@@ -55,55 +42,16 @@
 }


-// Selector Style Button
-//************************************************************************//
-@mixin buttonstyle($type, $b-color, $t-size, $pad) {
-  // Grayscale button
-  @if $type == simple and $b-color == grayscale($b-color) {
-    @include simple($b-color, true, $t-size, $pad);
-  }
-
-  @if $type == shiny and $b-color == grayscale($b-color) {
-    @include shiny($b-color, true, $t-size, $pad);
-  }
-
-  @if $type == pill and $b-color == grayscale($b-color) {
-    @include pill($b-color, true, $t-size, $pad);
-  }
-
-  @if $type == flat and $b-color == grayscale($b-color) {
-    @include flat($b-color, true, $t-size, $pad);
-  }
-
-  // Colored button
-  @if $type == simple {
-    @include simple($b-color, false, $t-size, $pad);
-  }
-
-  @else if $type == shiny {
-    @include shiny($b-color, false, $t-size, $pad);
-  }
-
-  @else if $type == pill {
-    @include pill($b-color, false, $t-size, $pad);
-  }
-
-  @else if $type == flat {
-    @include flat($b-color, false, $t-size, $pad);
-  }
-}
-
-
 // Simple Button
 //************************************************************************//
-@mixin simple($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
+@mixin simple($base-color, $grayscale: false) {
  $color:         hsl(0, 0, 100%);
  $border:        adjust-color($base-color, $saturation:  9%,  $lightness: -14%);
  $inset-shadow:  adjust-color($base-color, $saturation: -8%,  $lightness:  15%);
  $stop-gradient: adjust-color($base-color, $saturation:  9%,  $lightness: -11%);
  $text-shadow:   adjust-color($base-color, $saturation:  15%, $lightness: -18%);

-  @if is-light($base-color) {
+  @if lightness($base-color) > 70% {
    $color:       hsl(0, 0, 20%);
    $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
  }
@@ -120,10 +68,10 @@
  box-shadow: inset 0 1px 0 0 $inset-shadow;
  color: $color;
  display: inline-block;
-  font-size: $textsize;
+  font-size: 11px;
  font-weight: bold;
  @include linear-gradient ($base-color, $stop-gradient);
-  padding: $padding;
+  padding: 7px 18px;
  text-decoration: none;
  text-shadow: 0 1px 0 $text-shadow;
  background-clip: padding-box;
@@ -144,8 +92,7 @@
    @include linear-gradient ($base-color-hover, $stop-gradient-hover);
  }

-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
+  &:active:not(:disabled) {
    $border-active:       adjust-color($base-color, $saturation: 9%, $lightness: -14%);
    $inset-shadow-active: adjust-color($base-color, $saturation: 7%, $lightness: -17%);

@@ -155,14 +102,14 @@
    }

    border: 1px solid $border-active;
-    box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active;
+    box-shadow: inset 0 0 8px 4px $inset-shadow-active, inset 0 0 8px 4px $inset-shadow-active, 0 1px 1px 0 #eee;
  }
 }


 // Shiny Button
 //************************************************************************//
-@mixin shiny($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
+@mixin shiny($base-color, $grayscale: false) {
  $color:         hsl(0, 0, 100%);
  $border:        adjust-color($base-color, $red: -117, $green: -111, $blue: -81);
  $border-bottom: adjust-color($base-color, $red: -126, $green: -127, $blue: -122);
@@ -172,7 +119,7 @@
  $text-shadow:   adjust-color($base-color, $red: -140, $green: -141, $blue: -114);
  $third-stop:    adjust-color($base-color, $red: -86,  $green: -75,  $blue: -48);

-  @if is-light($base-color) {
+  @if lightness($base-color) > 70% {
    $color:       hsl(0, 0, 20%);
    $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
  }
@@ -193,10 +140,10 @@
  box-shadow: inset 0 1px 0 0 $inset-shadow;
  color: $color;
  display: inline-block;
-  font-size: $textsize;
+  font-size: 14px;
  font-weight: bold;
  @include linear-gradient(top, $base-color 0%, $second-stop 50%, $third-stop 50%, $fourth-stop 100%);
-  padding: $padding;
+  padding: 8px 20px;
  text-align: center;
  text-decoration: none;
  text-shadow: 0 -1px 1px $text-shadow;
@@ -221,22 +168,21 @@
                                  $fourth-stop-hover 100%);
  }

-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
+  &:active:not(:disabled) {
    $inset-shadow-active: adjust-color($base-color, $red: -111, $green: -116, $blue: -122);

    @if $grayscale == true {
      $inset-shadow-active: grayscale($inset-shadow-active);
    }

-    box-shadow: inset 0 0 20px 0 $inset-shadow-active;
+    box-shadow: inset 0 0 20px 0 $inset-shadow-active, 0 1px 0 #fff;
  }
 }


 // Pill Button
 //************************************************************************//
-@mixin pill($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
+@mixin pill($base-color, $grayscale: false) {
  $color:         hsl(0, 0, 100%);
  $border-bottom: adjust-color($base-color, $hue:  8, $saturation: -11%, $lightness: -26%);
  $border-sides:  adjust-color($base-color, $hue:  4, $saturation: -21%, $lightness: -21%);
@@ -245,7 +191,7 @@
  $stop-gradient: adjust-color($base-color, $hue:  8, $saturation:  14%, $lightness: -10%);
  $text-shadow:   adjust-color($base-color, $hue:  5, $saturation: -19%, $lightness: -15%);

-  @if is-light($base-color) {
+  @if lightness($base-color) > 70% {
    $color:       hsl(0, 0, 20%);
    $text-shadow: adjust-color($base-color, $saturation: 10%, $lightness: 4%);
  }
@@ -262,14 +208,14 @@
  border: 1px solid $border-top;
  border-color: $border-top $border-sides $border-bottom;
  border-radius: 16px;
-  box-shadow: inset 0 1px 0 0 $inset-shadow;
+  box-shadow: inset 0 1px 0 0 $inset-shadow, 0 1px 2px 0 #b3b3b3;
  color: $color;
  display: inline-block;
-  font-size: $textsize;
+  font-size: 11px;
  font-weight: normal;
  line-height: 1;
  @include linear-gradient ($base-color, $stop-gradient);
-  padding: $padding;
+  padding: 5px 16px;
  text-align: center;
  text-decoration: none;
  text-shadow: 0 -1px 1px $text-shadow;
@@ -303,8 +249,7 @@
    background-clip: padding-box;
  }

-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
+  &:active:not(:disabled) {
    $active-color:         adjust-color($base-color, $hue: 4,  $saturation: -12%,  $lightness: -10%);
    $border-active:        adjust-color($base-color, $hue: 6,  $saturation: -2.5%, $lightness: -30%);
    $border-bottom-active: adjust-color($base-color, $hue: 11, $saturation:  6%,   $lightness: -31%);
@@ -322,53 +267,7 @@
    background: $active-color;
    border: 1px solid $border-active;
    border-bottom: 1px solid $border-bottom-active;
-    box-shadow: inset 0 0 6px 3px $inset-shadow-active;
+    box-shadow: inset 0 0 6px 3px $inset-shadow-active, 0 1px 0 0 #fff;
    text-shadow: 0 -1px 1px $text-shadow-active;
  }
 }
-
-
-
-// Flat Button
-//************************************************************************//
-@mixin flat($base-color, $grayscale: false, $textsize: inherit, $padding: 7px 18px) {
-  $color:         hsl(0, 0, 100%);
-
-  @if is-light($base-color) {
-    $color:       hsl(0, 0, 20%);
-  }
-
-  background-color: $base-color;
-  border-radius: 3px;
-  border: none;
-  color: $color;
-  display: inline-block;
-  font-size: inherit;
-  font-weight: bold;
-  padding: 7px 18px;
-  text-decoration: none;
-  background-clip: padding-box;
-
-  &:hover:not(:disabled){
-    $base-color-hover:    adjust-color($base-color, $saturation: 4%, $lightness: 5%);
-
-    @if $grayscale == true {
-      $base-color-hover: grayscale($base-color-hover);
-    }
-
-    background-color: $base-color-hover;
-    cursor: pointer;
-  }
-
-  &:active:not(:disabled),
-  &:focus:not(:disabled) {
-    $base-color-active: adjust-color($base-color, $saturation: -4%, $lightness: -5%);
-
-    @if $grayscale == true {
-      $base-color-active: grayscale($base-color-active);
-    }
-
-    background-color: $base-color-active;
-    cursor: pointer;
-  }
-}
--- a/docs/_css/bourbon/addons/_clearfix.scss
+++ b/docs/_css/bourbon/addons/_clearfix.scss
@@ -1,4 +1,4 @@
-// Modern micro clearfix provides an easy way to contain floats without adding additional markup.
+// Micro clearfix provides an easy way to contain floats without adding additional markup
 //
 // Example usage:
 //
@@ -12,12 +12,18 @@
 //    }

@mixin clearfix {
+  *zoom: 1;
+
+  &:before,
  &:after {
-    content:"";
-    display:table;
-    clear:both;
+    content: " ";
+    display: table;
+  }
+
+  &:after {
+    clear: both;
  }
 }

 // Acknowledgements
-// Beat *that* clearfix: [Thierry Koblentz](http://www.css-101.org/articles/clearfix/latest-new-clearfix-so-far.php)
+// Micro clearfix: [Nicolas Gallagher](http://nicolasgallagher.com/micro-clearfix-hack/)
--- a/docs/_css/bourbon/addons/_directional-values.scss
+++ b/docs/_css/bourbon/addons/_directional-values.scss
@@ -1,111 +0,0 @@
-// directional-property mixins are shorthands
-// for writing properties like the following
-//
-// @include margin(null 0 10px);
-// ------
-// margin-right: 0;
-// margin-bottom: 10px;
-// margin-left: 0;
-//
-// - or -
-//
-// @include border-style(dotted null);
-// ------
-// border-top-style: dotted;
-// border-bottom-style: dotted;
-//
-// ------
-//
-// Note: You can also use false instead of null
-
-@function collapse-directionals($vals) {
-  $output: null;
-
-  $A: nth( $vals, 1 );
-  $B: if( length($vals) < 2, $A, nth($vals, 2));
-  $C: if( length($vals) < 3, $A, nth($vals, 3));
-  $D: if( length($vals) < 2, $A, nth($vals, if( length($vals) < 4, 2, 4) ));
-
-  @if $A == 0 { $A: 0 }
-  @if $B == 0 { $B: 0 }
-  @if $C == 0 { $C: 0 }
-  @if $D == 0 { $D: 0 }
-
-  @if $A == $B and $A == $C and $A == $D { $output: $A          }
-  @else if $A == $C and $B == $D         { $output: $A $B       }
-  @else if $B == $D                      { $output: $A $B $C    }
-  @else                                  { $output: $A $B $C $D }
-
-  @return $output;
-}
-
-@function contains-falsy($list) {
-  @each $item in $list {
-    @if not $item {
-      @return true;
-    }
-  }
-
-  @return false;
-}
-
-@mixin directional-property($pre, $suf, $vals) {
-  // Property Names
-  $top:    $pre + "-top"    + if($suf, "-#{$suf}", "");
-  $bottom: $pre + "-bottom" + if($suf, "-#{$suf}", "");
-  $left:   $pre + "-left"   + if($suf, "-#{$suf}", "");
-  $right:  $pre + "-right"  + if($suf, "-#{$suf}", "");
-  $all:    $pre +             if($suf, "-#{$suf}", "");
-
-  $vals: collapse-directionals($vals);
-
-  @if contains-falsy($vals) {
-    @if nth($vals, 1) { #{$top}: nth($vals, 1); }
-
-    @if length($vals) == 1 {
-      @if nth($vals, 1) { #{$right}: nth($vals, 1); }
-    } @else {
-      @if nth($vals, 2) { #{$right}: nth($vals, 2); }
-    }
-
-    // prop: top/bottom right/left
-    @if length($vals) == 2 {
-      @if nth($vals, 1) { #{$bottom}: nth($vals, 1); }
-      @if nth($vals, 2) { #{$left}:   nth($vals, 2); }
-
-    // prop: top right/left bottom
-    } @else if length($vals) == 3 {
-      @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
-      @if nth($vals, 2) { #{$left}:   nth($vals, 2); }
-
-    // prop: top right bottom left
-    } @else if length($vals) == 4 {
-      @if nth($vals, 3) { #{$bottom}: nth($vals, 3); }
-      @if nth($vals, 4) { #{$left}:   nth($vals, 4); }
-    }
-
-  // prop: top/right/bottom/left
-  } @else {
-    #{$all}: $vals;
-  }
-}
-
-@mixin margin($vals...) {
-  @include directional-property(margin, false, $vals...);
-}
-
-@mixin padding($vals...) {
-  @include directional-property(padding, false, $vals...);
-}
-
-@mixin border-style($vals...) {
-  @include directional-property(border, style, $vals...);
-}
-
-@mixin border-color($vals...) {
-  @include directional-property(border, color, $vals...);
-}
-
-@mixin border-width($vals...) {
-  @include directional-property(border, width, $vals...);
-}
--- a/docs/_css/bourbon/addons/_ellipsis.scss
+++ b/docs/_css/bourbon/addons/_ellipsis.scss
@@ -1,7 +0,0 @@
-@mixin ellipsis($width: 100%) {
-  display: inline-block;
-  max-width: $width;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
--- a/docs/_css/bourbon/addons/_font-family.scss
+++ b/docs/_css/bourbon/addons/_font-family.scss
@@ -1,5 +1,5 @@
 $georgia: Georgia, Cambria, "Times New Roman", Times, serif;
-$helvetica: "Helvetica Neue", Helvetica, Roboto, Arial, sans-serif;
+$helvetica: "Helvetica Neue", Helvetica, Arial, sans-serif;
 $lucida-grande: "Lucida Grande", Tahoma, Verdana, Arial, sans-serif;
 $monospace: "Bitstream Vera Sans Mono", Consolas, Courier, monospace;
 $verdana: Verdana, Geneva, sans-serif;
--- a/docs/_css/bourbon/addons/_hide-text.scss
+++ b/docs/_css/bourbon/addons/_hide-text.scss
@@ -1,10 +1,5 @@
@mixin hide-text {
-  overflow: hidden;
-
-  &:before {
-    content: "";
-    display: block;
-    width: 0;
-    height: 100%;
-  }
+  color:            transparent;
+  font:             0/0 a;
+  text-shadow:      none;
 }
--- a/docs/_css/bourbon/addons/_html5-input-types.scss
+++ b/docs/_css/bourbon/addons/_html5-input-types.scss
@@ -20,19 +20,29 @@ $inputs-list: 'input[type="email"]',
              'input[type="time"]',
              'input[type="week"]';

-// Bare inputs
-//************************************************************************//
-$all-text-inputs: assign-inputs($inputs-list);
+$unquoted-inputs-list: ();
+@each $input-type in $inputs-list {
+  $unquoted-inputs-list: append($unquoted-inputs-list, unquote($input-type), comma);
+}
+
+$all-text-inputs: $unquoted-inputs-list;
+

 // Hover Pseudo-class
 //************************************************************************//
-$all-text-inputs-hover: assign-inputs($inputs-list, hover);
+$all-text-inputs-hover: ();
+@each $input-type in $unquoted-inputs-list {
+      $input-type-hover: $input-type + ":hover";
+      $all-text-inputs-hover: append($all-text-inputs-hover, $input-type-hover, comma);
+}

 // Focus Pseudo-class
 //************************************************************************//
-$all-text-inputs-focus: assign-inputs($inputs-list, focus);
-
-
+$all-text-inputs-focus: ();
+@each $input-type in $unquoted-inputs-list {
+      $input-type-focus: $input-type + ":focus";
+      $all-text-inputs-focus: append($all-text-inputs-focus, $input-type-focus, comma);
+}

 // You must use interpolation on the variable:
 // #{$all-text-inputs}
@@ -44,43 +54,3 @@ $all-text-inputs-focus: assign-inputs($inputs-list, focus);
 //   #{$all-text-inputs}, textarea {
 //     border: 1px solid red;
 //   }
-
-
-
-//************************************************************************//
-// Generate a variable ($all-button-inputs) with a list of all html5
-// input types that have a button-based input, excluding button.
-//************************************************************************//
-$inputs-button-list: 'input[type="button"]',
-                     'input[type="reset"]',
-                     'input[type="submit"]';
-
-// Bare inputs
-//************************************************************************//
-$all-button-inputs: assign-inputs($inputs-button-list);
-
-// Hover Pseudo-class
-//************************************************************************//
-$all-button-inputs-hover: assign-inputs($inputs-button-list, hover);
-
-// Focus Pseudo-class
-//************************************************************************//
-$all-button-inputs-focus: assign-inputs($inputs-button-list, focus);
-
-// Active Pseudo-class
-//************************************************************************//
-$all-button-inputs-active: assign-inputs($inputs-button-list, active);
-
-
-
-// You must use interpolation on the variable:
-// #{$all-button-inputs}
-// #{$all-button-inputs-hover}
-// #{$all-button-inputs-focus}
-// #{$all-button-inputs-active}
-
-// Example
-//************************************************************************//
-//   #{$all-button-inputs}, button {
-//     border: 1px solid red;
-//   }
--- a/docs/_css/bourbon/addons/_position.scss
+++ b/docs/_css/bourbon/addons/_position.scss
@@ -1,12 +1,10 @@
-@mixin position ($position: relative, $coordinates: null null null null) {
+@mixin position ($position: relative, $coordinates: 0 0 0 0) {

  @if type-of($position) == list {
    $coordinates: $position;
    $position: relative;
  }

-  $coordinates: unpack($coordinates);
-
  $top: nth($coordinates, 1);
  $right: nth($coordinates, 2);
  $bottom: nth($coordinates, 3);
@@ -14,19 +12,31 @@

  position: $position;

-  @if ($top and $top == auto) or (type-of($top) == number) {
+  @if $top == auto {
+    top: $top;
+  }
+  @else if not(unitless($top)) {
    top: $top;
  }

-  @if ($right and $right == auto) or (type-of($right) == number) {
+  @if $right == auto {
+    right: $right;
+  }
+  @else if not(unitless($right)) {
    right: $right;
  }

-  @if ($bottom and $bottom == auto) or (type-of($bottom) == number) {
+  @if $bottom == auto {
+    bottom: $bottom;
+  }
+  @else if not(unitless($bottom)) {
    bottom: $bottom;
  }

-  @if ($left and $left == auto) or (type-of($left) == number) {
+  @if $left == auto {
+    left: $left;
+  }
+  @else if not(unitless($left)) {
    left: $left;
  }
 }
--- a/docs/_css/bourbon/addons/_prefixer.scss
+++ b/docs/_css/bourbon/addons/_prefixer.scss
@@ -1,7 +1,11 @@
 //************************************************************************//
 // Example: @include prefixer(border-radius, $radii, webkit ms spec);
 //************************************************************************//
-// Variables located in /settings/_prefixer.scss
+$prefix-for-webkit:    true !default;
+$prefix-for-mozilla:   true !default;
+$prefix-for-microsoft: true !default;
+$prefix-for-opera:     true !default;
+$prefix-for-spec:      true !default; // required for keyframe mixin

@mixin prefixer ($property, $value, $prefixes) {
  @each $prefix in $prefixes {
@@ -37,9 +41,9 @@
 }

@mixin disable-prefix-for-all() {
-  $prefix-for-webkit:    false !global;
-  $prefix-for-mozilla:   false !global;
-  $prefix-for-microsoft: false !global;
-  $prefix-for-opera:     false !global;
-  $prefix-for-spec:      false !global;
+  $prefix-for-webkit:    false;
+  $prefix-for-mozilla:   false;
+  $prefix-for-microsoft: false;
+  $prefix-for-opera:     false;
+  $prefix-for-spec:      false;
 }
--- a/docs/_css/bourbon/addons/_retina-image.scss
+++ b/docs/_css/bourbon/addons/_retina-image.scss
@@ -1,27 +1,28 @@
-@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $retina-suffix: _2x, $asset-pipeline: $asset-pipeline) {
+@mixin retina-image($filename, $background-size, $extension: png, $retina-filename: null, $asset-pipeline: false) {
  @if $asset-pipeline {
-    background-image: image-url("#{$filename}.#{$extension}");
+    background-image: image_url($filename + "." + $extension);
  }
  @else {
-    background-image:       url("#{$filename}.#{$extension}");
+    background-image: url($filename + "." + $extension);
  }

  @include hidpi {
+
    @if $asset-pipeline {
      @if $retina-filename {
-        background-image: image-url("#{$retina-filename}.#{$extension}");
+        background-image: image_url($retina-filename + "." + $extension);
      }
      @else {
-        background-image: image-url("#{$filename}#{$retina-suffix}.#{$extension}");
+        background-image: image_url($filename + "@2x" + "." + $extension);
      }
    }

    @else {
      @if $retina-filename {
-        background-image: url("#{$retina-filename}.#{$extension}");
+        background-image: url($retina-filename + "." + $extension);
      }
      @else {
-        background-image: url("#{$filename}#{$retina-suffix}.#{$extension}");
+        background-image: url($filename + "@2x" + "." + $extension);
      }
    }

--- a/docs/_css/bourbon/addons/_size.scss
+++ b/docs/_css/bourbon/addons/_size.scss
@@ -1,16 +1,44 @@
@mixin size($size) {
-  $height: nth($size, 1);
-  $width: $height;
+  @if length($size) == 1 {
+    @if $size == auto {
+      width:  $size;
+      height: $size;
+    }

-  @if length($size) > 1 {
+    @else if unitless($size) {
+      width:  $size + px;
+      height: $size + px;
+    }
+
+    @else if not(unitless($size)) {
+      width:  $size;
+      height: $size;
+    }
+  }
+
+  // Width x Height
+  @if length($size) == 2 {
+    $width:  nth($size, 1);
    $height: nth($size, 2);
-  }

-  @if $height == auto or (type-of($height) == number and not unitless($height)) {
-    height: $height;
-  }
+    @if $width == auto {
+      width: $width;
+    }
+    @else if not(unitless($width)) {
+      width: $width;
+    }
+    @else if unitless($width) {
+      width: $width + px;
+    }

-  @if $width == auto or (type-of($width) == number and not unitless($width)) {
-    width: $width;
+    @if $height == auto {
+      height: $height;
+    }
+    @else if not(unitless($height)) {
+      height: $height;
+    }
+    @else if unitless($height) {
+      height: $height + px;
+    }
  }
 }
--- a/docs/_css/bourbon/addons/_timing-functions.scss
+++ b/docs/_css/bourbon/addons/_timing-functions.scss
@@ -1,5 +1,5 @@
 // CSS cubic-bezier timing functions. Timing functions courtesy of jquery.easie (github.com/jaukia/easie)
-// Timing functions are the same as demo'ed here: http://jqueryui.com/resources/demos/effect/easing.html
+// Timing functions are the same as demo'ed here: http://jqueryui.com/demos/effect/easing.html

 // EASE IN
 $ease-in-quad:      cubic-bezier(0.550,  0.085, 0.680, 0.530);
--- a/docs/_css/bourbon/addons/_triangle.scss
+++ b/docs/_css/bourbon/addons/_triangle.scss
@@ -2,82 +2,44 @@
  height: 0;
  width: 0;

-  $width: nth($size, 1);
-  $height: nth($size, length($size));
-
-  $foreground-color: nth($color, 1);
-  $background-color: if(length($color) == 2, nth($color, 2), transparent);
-
  @if ($direction == up) or ($direction == down) or ($direction == right) or ($direction == left) {
-
-    $width: $width / 2;
-    $height: if(length($size) > 1, $height, $height/2);
+    border-color: transparent;
+    border-style: solid;
+    border-width: $size / 2;

    @if $direction == up {
-      border-left: $width solid $background-color;
-      border-right: $width solid $background-color;
-      border-bottom: $height solid $foreground-color;
+      border-bottom-color: $color;

    } @else if $direction == right {
-      border-top: $width solid $background-color;
-      border-bottom: $width solid $background-color;
-      border-left: $height solid $foreground-color;
+      border-left-color:   $color;

    } @else if $direction == down {
-      border-left: $width solid $background-color;
-      border-right: $width solid $background-color;
-      border-top: $height solid $foreground-color;
+      border-top-color:    $color;

    } @else if $direction == left {
-      border-top: $width solid $background-color;
-      border-bottom: $width solid $background-color;
-      border-right: $height solid $foreground-color;
+      border-right-color:  $color;
    }
  }

  @else if ($direction == up-right) or ($direction == up-left) {
-    border-top: $height solid $foreground-color;
+    border-top: $size solid $color;

    @if $direction == up-right {
-      border-left:  $width solid $background-color;
+      border-left:  $size solid transparent;

    } @else if $direction == up-left {
-      border-right: $width solid $background-color;
+      border-right: $size solid transparent;
    }
  }

  @else if ($direction == down-right) or ($direction == down-left) {
-    border-bottom: $height solid $foreground-color;
+    border-bottom: $size solid $color;

    @if $direction == down-right {
-      border-left:  $width solid $background-color;
+      border-left:  $size solid transparent;

    } @else if $direction == down-left {
-      border-right: $width solid $background-color;
+      border-right: $size solid transparent;
    }
  }
-
-  @else if ($direction == inset-up) {
-    border-width: $height $width;
-    border-style: solid;
-    border-color: $background-color $background-color $foreground-color;
-  }
-
-  @else if ($direction == inset-down) {
-    border-width: $height $width;
-    border-style: solid;
-    border-color: $foreground-color $background-color $background-color;
-  }
-
-  @else if ($direction == inset-right) {
-    border-width: $width $height;
-    border-style: solid;
-    border-color: $background-color $background-color $background-color $foreground-color;
-  }
-
-  @else if ($direction == inset-left) {
-    border-width: $width $height;
-    border-style: solid;
-    border-color: $background-color $foreground-color $background-color $background-color;
-  }
 }
--- a/docs/_css/bourbon/addons/_word-wrap.scss
+++ b/docs/_css/bourbon/addons/_word-wrap.scss
@@ -1,8 +0,0 @@
-@mixin word-wrap($wrap: break-word) {
-  word-wrap: $wrap;
-
-  @if $wrap == break-word {
-    overflow-wrap: break-word;
-    word-break: break-all;
-  }
-}
--- a/docs/_css/bourbon/css3/_background-image.scss
+++ b/docs/_css/bourbon/css3/_background-image.scss
@@ -4,39 +4,45 @@
 //************************************************************************//

@mixin background-image($images...) {
-  $webkit-images: ();
-  $spec-images: ();
-
-  @each $image in $images {
-    $webkit-image: ();
-    $spec-image: ();
-
-    @if (type-of($image) == string) {
-      $url-str:       str-slice($image, 0, 3);
-      $gradient-type: str-slice($image, 0, 6);
-
-      @if $url-str == "url" {
-        $webkit-image: $image;
-          $spec-image: $image;
-      }
-
-      @else if $gradient-type == "linear" {
-        $gradients: _linear-gradient-parser($image);
-        $webkit-image:  map-get($gradients, webkit-image);
-        $spec-image:    map-get($gradients, spec-image);
-      }
-
-      @else if $gradient-type == "radial" {
-        $gradients: _radial-gradient-parser($image);
-        $webkit-image: map-get($gradients, webkit-image);
-        $spec-image:   map-get($gradients, spec-image);
-      }
-    }
-
-    $webkit-images: append($webkit-images, $webkit-image, comma);
-    $spec-images:   append($spec-images,   $spec-image,   comma);
-  }
-
-  background-image: $webkit-images;
-  background-image: $spec-images;
+  background-image: _add-prefix($images, webkit);
+  background-image: _add-prefix($images);
 }
+
+@function _add-prefix($images, $vendor: false) {
+  $images-prefixed: ();
+  $gradient-positions: false;
+  @for $i from 1 through length($images) {
+    $type: type-of(nth($images, $i)); // Get type of variable - List or String
+
+    // If variable is a list - Gradient
+    @if $type == list {
+      $gradient-type: nth(nth($images, $i), 1); // linear or radial
+      $gradient-pos: null;
+      $gradient-args: null;
+
+      @if ($gradient-type == linear) or ($gradient-type == radial) {
+        $gradient-pos:  nth(nth($images, $i), 2); // Get gradient position
+        $gradient-args: nth(nth($images, $i), 3); // Get actual gradient (red, blue)
+      }
+      @else {
+        $gradient-args: nth(nth($images, $i), 2); // Get actual gradient (red, blue)
+      }
+
+      $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);
+      $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
+      $images-prefixed: append($images-prefixed, $gradient, comma);
+    }
+    // If variable is a string - Image
+    @else if $type == string {
+      $images-prefixed: join($images-prefixed, nth($images, $i), comma);
+    }
+  }
+  @return $images-prefixed;
+}
+
+//Examples:
+  //@include background-image(linear-gradient(top, orange, red));
+  //@include background-image(radial-gradient(50% 50%, cover circle, orange, red));
+  //@include background-image(url("/images/a.png"), linear-gradient(orange, red));
+  //@include background-image(url("image.png"), linear-gradient(orange, red), url("image.png"));
+  //@include background-image(linear-gradient(hsla(0, 100%, 100%, 0.25) 0%, hsla(0, 100%, 100%, 0.08) 50%, transparent 50%), linear-gradient(orange, red));
--- a/docs/_css/bourbon/css3/_background.scss
+++ b/docs/_css/bourbon/css3/_background.scss
@@ -3,53 +3,101 @@
 // notation.
 //************************************************************************//

-@mixin background($backgrounds...) {
-  $webkit-backgrounds: ();
-  $spec-backgrounds: ();
+@mixin background(
+  $background-1       , $background-2: false,
+  $background-3: false, $background-4: false,
+  $background-5: false, $background-6: false,
+  $background-7: false, $background-8: false,
+  $background-9: false, $background-10: false,
+  $fallback: false
+) {
+  $backgrounds: compact($background-1, $background-2,
+                $background-3, $background-4,
+                $background-5, $background-6,
+                $background-7, $background-8,
+                $background-9, $background-10);

-  @each $background in $backgrounds {
-    $webkit-background: ();
-    $spec-background: ();
-    $background-type: type-of($background);
-
-    @if $background-type == string or list {
-      $background-str: if($background-type == list, nth($background, 1), $background);
-
-      $url-str:       str-slice($background-str, 0, 3);
-      $gradient-type: str-slice($background-str, 0, 6);
-
-      @if $url-str == "url" {
-        $webkit-background: $background;
-          $spec-background: $background;
-      }
-
-      @else if $gradient-type == "linear" {
-        $gradients: _linear-gradient-parser("#{$background}");
-        $webkit-background: map-get($gradients, webkit-image);
-        $spec-background:   map-get($gradients, spec-image);
-      }
-
-      @else if $gradient-type == "radial" {
-        $gradients: _radial-gradient-parser("#{$background}");
-        $webkit-background: map-get($gradients, webkit-image);
-        $spec-background:   map-get($gradients, spec-image);
-      }
-
-      @else {
-        $webkit-background: $background;
-          $spec-background: $background;
-      }
-    }
-
-    @else {
-      $webkit-background: $background;
-        $spec-background: $background;
-    }
-
-    $webkit-backgrounds: append($webkit-backgrounds, $webkit-background, comma);
-    $spec-backgrounds:   append($spec-backgrounds,   $spec-background,   comma);
+  $fallback-color: false;
+  @if (type-of($fallback) == color) or ($fallback == "transparent") {
+    $fallback-color: $fallback;
+  }
+  @else {
+    $fallback-color: _extract-background-color($backgrounds);
  }

-  background: $webkit-backgrounds;
-  background: $spec-backgrounds;
+  @if $fallback-color {
+    background-color: $fallback-color;
+  }
+  background: _background-add-prefix($backgrounds, webkit);
+  background: _background-add-prefix($backgrounds);
 }
+
+@function _extract-background-color($backgrounds) {
+  $final-bg-layer: nth($backgrounds, length($backgrounds));
+  @if type-of($final-bg-layer) == list {
+    @for $i from 1 through length($final-bg-layer) {
+      $value: nth($final-bg-layer, $i);
+      @if type-of($value) == color {
+        @return $value;
+      }
+    }
+  }
+  @return false;
+}
+
+@function _background-add-prefix($backgrounds, $vendor: false) {
+  $backgrounds-prefixed: ();
+
+  @for $i from 1 through length($backgrounds) {
+    $shorthand: nth($backgrounds, $i); // Get member for current index
+    $type: type-of($shorthand); // Get type of variable - List (gradient) or String (image)
+
+    // If shorthand is a list (gradient)
+    @if $type == list {
+      $first-member: nth($shorthand, 1); // Get first member of shorthand
+
+      // Linear Gradient
+      @if index(linear radial, nth($first-member, 1)) {
+        $gradient-type: nth($first-member, 1); // linear || radial
+        $gradient-args:      false;
+        $gradient-positions: false;
+        $shorthand-start:    false;
+        @if type-of($first-member) == list { // Linear gradient plus additional shorthand values - lg(red,orange)repeat,...
+          $gradient-positions: nth($first-member, 2);
+          $gradient-args:      nth($first-member, 3);
+          $shorthand-start: 2;
+        }
+        @else { // Linear gradient only - lg(red,orange),...
+          $gradient-positions: nth($shorthand, 2);
+          $gradient-args:      nth($shorthand, 3); // Get gradient (red, blue)
+        }
+
+        $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-positions);
+        $gradient: _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
+
+        // Append any additional shorthand args to gradient
+        @if $shorthand-start {
+          @for $j from $shorthand-start through length($shorthand) {
+            $gradient: join($gradient, nth($shorthand, $j), space);
+          }
+        }
+        $backgrounds-prefixed: append($backgrounds-prefixed, $gradient, comma);
+      }
+      // Image with additional properties
+      @else {
+        $backgrounds-prefixed: append($backgrounds-prefixed, $shorthand, comma);
+      }
+    }
+    // If shorthand is a simple string (color or image)
+    @else if $type == string {
+      $backgrounds-prefixed: join($backgrounds-prefixed, $shorthand, comma);
+    }
+  }
+  @return $backgrounds-prefixed;
+}
+
+//Examples:
+  //@include background(linear-gradient(top, orange, red));
+  //@include background(radial-gradient(circle at 40% 40%, orange, red));
+  //@include background(url("/images/a.png") no-repeat, linear-gradient(orange, red));
+  //@include background(url("image.png") center center, linear-gradient(orange, red), url("image.png"));
--- a/docs/_css/bourbon/css3/_border-image.scss
+++ b/docs/_css/bourbon/css3/_border-image.scss
@@ -1,53 +1,48 @@
-@mixin border-image($borders...) {
-  $webkit-borders: ();
-  $spec-borders: ();
+@mixin border-image($images) {
+  -webkit-border-image: _border-add-prefix($images, webkit);
+     -moz-border-image: _border-add-prefix($images, moz);
+       -o-border-image: _border-add-prefix($images, o);
+          border-image: _border-add-prefix($images);
+}

-  @each $border in $borders {
-    $webkit-border: ();
-    $spec-border: ();
-    $border-type: type-of($border);
+@function _border-add-prefix($images, $vendor: false) {
+  $border-image: null;
+  $images-type:  type-of(nth($images, 1));
+  $first-var:    nth(nth($images, 1), 1);          // Get type of Gradient (Linear || radial)

-    @if $border-type == string or list {
-      $border-str: if($border-type == list, nth($border, 1), $border);
-
-      $url-str:       str-slice($border-str, 0, 3);
-      $gradient-type: str-slice($border-str, 0, 6);
-
-      @if $url-str == "url" {
-        $webkit-border: $border;
-          $spec-border: $border;
-      }
-
-      @else if $gradient-type == "linear" {
-        $gradients: _linear-gradient-parser("#{$border}");
-        $webkit-border: map-get($gradients, webkit-image);
-        $spec-border:   map-get($gradients, spec-image);
-      }
-
-      @else if $gradient-type == "radial" {
-        $gradients: _radial-gradient-parser("#{$border}");
-        $webkit-border: map-get($gradients, webkit-image);
-        $spec-border:   map-get($gradients, spec-image);
-      }
-
-      @else {
-        $webkit-border: $border;
-          $spec-border: $border;
-      }
+  // If input is a gradient
+  @if $images-type == string {
+    @if ($first-var == "linear") or ($first-var == "radial") {
+      $gradient-type: nth($images, 1);           // Get type of gradient (linear || radial)
+      $gradient-pos:  nth($images, 2);           // Get gradient position
+      $gradient-args: nth($images, 3);           // Get actual gradient (red, blue)
+      $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);
+      $border-image:  _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
    }
-
+    // If input is a URL
    @else {
-      $webkit-border: $border;
-        $spec-border: $border;
+      $border-image: $images;
    }
-
-    $webkit-borders: append($webkit-borders, $webkit-border, comma);
-    $spec-borders:   append($spec-borders,   $spec-border,   comma);
  }
+  // If input is gradient or url + additional args
+  @else if $images-type == list {
+    $type: type-of(nth($images, 1));           // Get type of variable - List or String

-  -webkit-border-image: $webkit-borders;
-          border-image: $spec-borders;
-          border-style: solid;
+    // If variable is a list - Gradient
+    @if $type == list {
+      $gradient: nth($images, 1);
+      $gradient-type: nth($gradient, 1);           // Get type of gradient (linear || radial)
+      $gradient-pos:  nth($gradient, 2);           // Get gradient position
+      $gradient-args: nth($gradient, 3);           // Get actual gradient (red, blue)
+      $gradient-positions: _gradient-positions-parser($gradient-type, $gradient-pos);
+      $border-image:  _render-gradients($gradient-positions, $gradient-args, $gradient-type, $vendor);
+
+      @for $i from 2 through length($images) {
+        $border-image: append($border-image, nth($images, $i));
+      }
+    }
+  }
+  @return $border-image;
 }

 //Examples:
@@ -57,3 +52,4 @@
 // @include border-image(linear-gradient(45deg, orange, yellow) stretch);
 // @include border-image(linear-gradient(45deg, orange, yellow) 20 30 40 50 stretch round);
 // @include border-image(radial-gradient(top, cover, orange, yellow, orange));
+
--- a/docs/_css/bourbon/css3/_calc.scss
+++ b/docs/_css/bourbon/css3/_calc.scss
@@ -1,4 +0,0 @@
-@mixin calc($property, $value) {
-  #{$property}: -webkit-calc(#{$value});
-  #{$property}:         calc(#{$value});
-}
--- a/docs/_css/bourbon/css3/_columns.scss
+++ b/docs/_css/bourbon/css3/_columns.scss
@@ -15,7 +15,7 @@

@mixin column-fill($arg: auto) {
 // auto || length
-  @include prefixer(column-fill, $arg, webkit moz spec);
+  @include prefixer(columns-fill, $arg, webkit moz spec);
 }

@mixin column-rule($arg) {
--- a/docs/_css/bourbon/css3/_filter.scss
+++ b/docs/_css/bourbon/css3/_filter.scss
@@ -1,5 +0,0 @@
-@mixin filter($function: none) {
-  // <filter-function> [<filter-function]* | none
-  @include prefixer(filter, $function, webkit spec);
-}
-
--- a/docs/_css/bourbon/css3/_flex-box.scss
+++ b/docs/_css/bourbon/css3/_flex-box.scss
@@ -11,7 +11,6 @@
@mixin display-box {
  display: -webkit-box;
  display: -moz-box;
-  display: -ms-flexbox; // IE 10
  display: box;
 }

@@ -23,19 +22,16 @@
@mixin box-pack($pack: start) {
 // start|end|center|justify
  @include prefixer(box-pack, $pack, webkit moz spec);
-  -ms-flex-pack: $pack; // IE 10
 }

@mixin box-align($align: stretch) {
 // start|end|center|baseline|stretch
  @include prefixer(box-align, $align, webkit moz spec);
-  -ms-flex-align: $align; // IE 10
 }

@mixin box-direction($direction: normal) {
 // normal|reverse|inherit
  @include prefixer(box-direction, $direction, webkit moz spec);
-  -ms-flex-direction: $direction; // IE 10
 }

@mixin box-lines($lines: single) {
@@ -45,277 +41,12 @@

@mixin box-ordinal-group($int: 1) {
  @include prefixer(box-ordinal-group, $int, webkit moz spec);
-  -ms-flex-order: $int; // IE 10
 }

@mixin box-flex($value: 0.0) {
  @include prefixer(box-flex, $value, webkit moz spec);
-  -ms-flex: $value; // IE 10
 }

@mixin box-flex-group($int: 1) {
  @include prefixer(box-flex-group, $int, webkit moz spec);
 }
-
-// CSS3 Flexible Box Model and property defaults
-// Unified attributes for 2009, 2011, and 2012 flavours.
-
-// 2009 - display (box | inline-box)
-// 2011 - display (flexbox | inline-flexbox)
-// 2012 - display (flex | inline-flex)
-@mixin display($value) {
-//  flex | inline-flex
-    @if $value == "flex" {
-        // 2009
-        display: -webkit-box;
-        display: -moz-box;
-        display: box;
-
-        // 2012
-        display: -webkit-flex;
-        display: -moz-flex;
-        display: -ms-flexbox; // 2011 (IE 10)
-        display: flex;
-    }
-
-    @elseif $value == "inline-flex" {
-        display: -webkit-inline-box;
-        display: -moz-inline-box;
-        display: inline-box;
-
-        display: -webkit-inline-flex;
-        display: -moz-inline-flex;
-        display: -ms-inline-flexbox;
-        display: inline-flex;
-    }
-
-    @else {
-        display: $value;
-    }
-}
-
-// 2009 - box-flex (integer)
-// 2011 - flex (decimal | width decimal)
-// 2012 - flex (integer integer width)
-@mixin flex($value) {
-
-    // Grab flex-grow for older browsers.
-    $flex-grow: nth($value, 1);
-
-    // 2009
-    @include prefixer(box-flex, $flex-grow, webkit moz spec);
-
-    // 2011 (IE 10), 2012
-    @include prefixer(flex, $value, webkit moz ms spec);
-}
-
-// 2009 - box-orient ( horizontal | vertical | inline-axis | block-axis)
-//      - box-direction (normal | reverse)      
-// 2011 - flex-direction (row | row-reverse | column | column-reverse)
-// 2012 - flex-direction (row | row-reverse | column | column-reverse)
-@mixin flex-direction($value: row) {
-
-    // Alt values.
-    $value-2009: $value;
-    $value-2011: $value;
-    $direction: "normal";
-
-    @if $value == row {
-        $value-2009: horizontal;
-    }
-
-    @elseif $value == "row-reverse" {
-        $value-2009: horizontal;
-        $direction: reverse;
-    }
-
-    @elseif $value == column {
-        $value-2009: vertical;
-    }
-
-    @elseif $value == "column-reverse" {
-        $value-2009: vertical;
-        $direction: reverse;
-    }
-
-    // 2009
-    @include prefixer(box-orient, $value-2009, webkit moz spec);
-    @if $direction == "reverse" {
-        @include prefixer(box-direction, $direction, webkit moz spec);
-    }
-
-    // 2012
-    @include prefixer(flex-direction, $value, webkit moz spec);
-
-    // 2011 (IE 10)
-    -ms-flex-direction: $value;
-}
-
-// 2009 - box-lines (single | multiple)
-// 2011 - flex-wrap (nowrap | wrap | wrap-reverse)
-// 2012 - flex-wrap (nowrap | wrap | wrap-reverse)
-@mixin flex-wrap($value: nowrap) {
-
-    // Alt values.
-    $alt-value: $value;
-    @if $value == nowrap {
-        $alt-value: single;
-    }
-
-    @elseif $value == wrap {
-        $alt-value: multiple;
-    }
-
-    @elseif $value == "wrap-reverse" {
-        $alt-value: multiple;
-    }
-
-    @include prefixer(box-lines, $alt-value, webkit moz spec);
-    @include prefixer(flex-wrap, $value, webkit moz ms spec);
-}
-
-// 2009 - TODO: parse values into flex-direction/flex-wrap
-// 2011 - TODO: parse values into flex-direction/flex-wrap
-// 2012 - flex-flow (flex-direction || flex-wrap)
-@mixin flex-flow($value) {
-    @include prefixer(flex-flow, $value, webkit moz spec);
-}
-
-// 2009 - box-ordinal-group (integer)
-// 2011 - flex-order (integer)
-// 2012 - order (integer)
-@mixin order($int: 0) {
-    // 2009
-    @include prefixer(box-ordinal-group, $int, webkit moz spec);
-
-    // 2012
-    @include prefixer(order, $int, webkit moz spec);
-
-    // 2011 (IE 10)
-    -ms-flex-order: $int;
-}
-
-// 2012 - flex-grow (number)
-@mixin flex-grow($number: 0) {
-    @include prefixer(flex-grow, $number, webkit moz spec);
-    -ms-flex-positive: $number;
-}
-
-// 2012 - flex-shrink (number)
-@mixin flex-shrink($number: 1) {
-    @include prefixer(flex-shrink, $number, webkit moz spec);
-    -ms-flex-negative: $number;
-}
-
-// 2012 - flex-basis (number)
-@mixin flex-basis($width: auto) {
-    @include prefixer(flex-basis, $width, webkit moz spec);
-    -ms-flex-preferred-size: $width;
-}
-
-// 2009 - box-pack (start | end | center | justify)
-// 2011 - flex-pack (start | end | center | justify)
-// 2012 - justify-content (flex-start | flex-end | center | space-between | space-around)
-@mixin justify-content ($value: flex-start) {
-
-    // Alt values.
-    $alt-value: $value;
-    @if $value == "flex-start" {
-        $alt-value: start;
-    }
-
-    @elseif $value == "flex-end" {
-        $alt-value: end;
-    }
-
-    @elseif $value == "space-between" {
-        $alt-value: justify;
-    }
-
-    @elseif $value == "space-around" {
-        $alt-value: center;
-    }
-
-    // 2009
-    @include prefixer(box-pack, $alt-value, webkit moz spec);
-
-    // 2012
-    @include prefixer(justify-content, $value, webkit moz ms o spec);
-
-    // 2011 (IE 10)
-    -ms-flex-pack: $alt-value;
-}
-
-// 2009 - box-align (start | end | center | baseline | stretch)
-// 2011 - flex-align (start | end | center | baseline | stretch)
-// 2012 - align-items (flex-start | flex-end | center | baseline | stretch)
-@mixin align-items($value: stretch) {
-
-    $alt-value: $value;
-
-    @if $value == "flex-start" {
-        $alt-value: start;
-    }    
-
-    @elseif $value == "flex-end" {
-        $alt-value: end;
-    }
-
-    // 2009
-    @include prefixer(box-align, $alt-value, webkit moz spec);
-
-    // 2012
-    @include prefixer(align-items, $value, webkit moz ms o spec);
-    
-    // 2011 (IE 10)
-    -ms-flex-align: $alt-value;    
-}
-
-// 2011 - flex-item-align (auto | start | end | center | baseline | stretch)
-// 2012 - align-self (auto | flex-start | flex-end | center | baseline | stretch)
-@mixin align-self($value: auto) {
-
-    $value-2011: $value;
-    @if $value == "flex-start" {
-        $value-2011: start;
-    }    
-
-    @elseif $value == "flex-end" {
-        $value-2011: end;
-    }
-
-    // 2012
-    @include prefixer(align-self, $value, webkit moz spec);
-
-    // 2011 (IE 10)
-    -ms-flex-item-align: $value-2011;
-}
-
-// 2011 - flex-line-pack (start | end | center | justify | distribute | stretch)
-// 2012 - align-content (flex-start | flex-end | center | space-between | space-around | stretch)
-@mixin align-content($value: stretch) {
-
-    $value-2011: $value;
-    @if $value == "flex-start" {
-        $value-2011: start;
-    }    
-
-    @elseif $value == "flex-end" {
-        $value-2011: end;
-    }
-
-    @elseif $value == "space-between" {
-        $value-2011: justify;
-    }
-
-    @elseif $value == "space-around" {
-        $value-2011: distribute;
-    }
-
-    // 2012
-    @include prefixer(align-content, $value, webkit moz spec);
-
-    // 2011 (IE 10)
-    -ms-flex-line-pack: $value-2011;
-}
-
--- a/docs/_css/bourbon/css3/_font-face.scss
+++ b/docs/_css/bourbon/css3/_font-face.scss
@@ -1,6 +1,6 @@
 // Order of the includes matters, and it is: normal, bold, italic, bold+italic.

-@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: $asset-pipeline) {
+@mixin font-face($font-family, $file-path, $weight: normal, $style: normal, $asset-pipeline: false ) {
  @font-face {
    font-family: $font-family;
    font-weight: $weight;
--- a/docs/_css/bourbon/css3/_font-feature-settings.scss
+++ b/docs/_css/bourbon/css3/_font-feature-settings.scss
@@ -1,10 +0,0 @@
-// Font feature settings mixin and property default.
-// Examples: @include font-feature-settings("liga");
-//           @include font-feature-settings("lnum" false);
-//           @include font-feature-settings("pnum" 1, "kern" 0);
-//           @include font-feature-settings("ss01", "ss02");
-
-@mixin font-feature-settings($settings...) {
-  @if length($settings) == 0 { $settings: none; }
-  @include prefixer(font-feature-settings, $settings, webkit moz ms spec);
-}
--- a/docs/_css/bourbon/css3/_hyphens.scss
+++ b/docs/_css/bourbon/css3/_hyphens.scss
@@ -1,4 +0,0 @@
-@mixin hyphens($hyphenation: none) {
-// none | manual | auto
-  @include prefixer(hyphens, $hyphenation, webkit moz ms spec);
-}
--- a/docs/_css/bourbon/css3/_image-rendering.scss
+++ b/docs/_css/bourbon/css3/_image-rendering.scss
@@ -1,11 +1,10 @@
-@mixin image-rendering ($mode:auto) {
+@mixin image-rendering ($mode:optimizeQuality) {

-  @if ($mode == crisp-edges) {
-      -ms-interpolation-mode: nearest-neighbor; // IE8+
+  @if ($mode == optimize-contrast) {
      image-rendering: -moz-crisp-edges;
      image-rendering: -o-crisp-edges;
      image-rendering: -webkit-optimize-contrast;
-      image-rendering: crisp-edges;
+      image-rendering: optimize-contrast;
  }

  @else {
--- a/docs/_css/bourbon/css3/_inline-block.scss
+++ b/docs/_css/bourbon/css3/_inline-block.scss
@@ -0,0 +1,8 @@
+// Legacy support for inline-block in IE7 (maybe IE6)
+@mixin inline-block {
+  display: inline-block;
+  vertical-align: baseline;
+  zoom: 1;
+  *display: inline;
+  *vertical-align: auto;
+}
--- a/docs/_css/bourbon/css3/_keyframes.scss
+++ b/docs/_css/bourbon/css3/_keyframes.scss
@@ -8,28 +8,36 @@

  @if $original-prefix-for-webkit {
    @include disable-prefix-for-all();
-    $prefix-for-webkit: true !global;
+    $prefix-for-webkit: true;
    @-webkit-keyframes #{$name} {
      @content;
    }
  }
  @if $original-prefix-for-mozilla {
    @include disable-prefix-for-all();
-    $prefix-for-mozilla: true !global;
+    $prefix-for-mozilla: true;
    @-moz-keyframes #{$name} {
      @content;
    }
  }
-
-  $prefix-for-webkit:    $original-prefix-for-webkit    !global;
-  $prefix-for-mozilla:   $original-prefix-for-mozilla   !global;
-  $prefix-for-microsoft: $original-prefix-for-microsoft !global;
-  $prefix-for-opera:     $original-prefix-for-opera     !global;
-  $prefix-for-spec:      $original-prefix-for-spec      !global;
-
+  @if $original-prefix-for-opera {
+    @include disable-prefix-for-all();
+    $prefix-for-opera: true;
+    @-o-keyframes #{$name} {
+      @content;
+    }
+  }
  @if $original-prefix-for-spec {
+    @include disable-prefix-for-all();
+    $prefix-for-spec: true;
    @keyframes #{$name} {
      @content;
    }
  }
+
+  $prefix-for-webkit:    $original-prefix-for-webkit;
+  $prefix-for-mozilla:   $original-prefix-for-mozilla;
+  $prefix-for-microsoft: $original-prefix-for-microsoft;
+  $prefix-for-opera:     $original-prefix-for-opera;
+  $prefix-for-spec:      $original-prefix-for-spec;
 }
--- a/docs/_css/bourbon/css3/_linear-gradient.scss
+++ b/docs/_css/bourbon/css3/_linear-gradient.scss
@@ -1,9 +1,11 @@
-@mixin linear-gradient($pos, $G1, $G2: null,
-                       $G3: null, $G4: null,
-                       $G5: null, $G6: null,
-                       $G7: null, $G8: null,
-                       $G9: null, $G10: null,
-                       $fallback: null) {
+@mixin linear-gradient($pos, $G1, $G2: false,
+                       $G3: false, $G4: false,
+                       $G5: false, $G6: false,
+                       $G7: false, $G8: false,
+                       $G9: false, $G10: false,
+                       $deprecated-pos1: left top,
+                       $deprecated-pos2: left bottom,
+                       $fallback: false) {
  // Detect what type of value exists in $pos
  $pos-type: type-of(nth($pos, 1));
  $pos-spec: null;
@@ -22,7 +24,7 @@
    $pos-spec:   nth($positions, 2);
  }

-  $full: $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10;
+  $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);

  // Set $G1 as the default fallback color
  $fallback-color: nth($G1, 1);
@@ -33,6 +35,7 @@
  }

  background-color: $fallback-color;
+  background-image: _deprecated-webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $full); // Safari <= 5.0
  background-image: -webkit-linear-gradient($pos-degree $full); // Safari 5.1+, Chrome
  background-image: unquote("linear-gradient(#{$pos-spec}#{$full})");
 }
--- a/docs/_css/bourbon/css3/_placeholder.scss
+++ b/docs/_css/bourbon/css3/_placeholder.scss
@@ -1,8 +1,29 @@
+$placeholders: '-webkit-input-placeholder',
+               '-moz-placeholder',
+               '-ms-input-placeholder';
+
@mixin placeholder {
-  $placeholders: ":-webkit-input" ":-moz" "-moz" "-ms-input";
  @each $placeholder in $placeholders {
-    &:#{$placeholder}-placeholder {
-      @content;
+    @if $placeholder == "-webkit-input-placeholder" {
+      &::#{$placeholder} {
+        @content;
+      }
+    }
+    @else if $placeholder == "-moz-placeholder" {
+      // FF 18-
+      &:#{$placeholder} {
+        @content;
+      }
+
+      // FF 19+
+      &::#{$placeholder} {
+        @content;
+      }
+    }
+    @else {
+      &:#{$placeholder} {
+        @content;
+      }
    }
  }
 }
--- a/docs/_css/bourbon/css3/_radial-gradient.scss
+++ b/docs/_css/bourbon/css3/_radial-gradient.scss
@@ -1,12 +1,16 @@
 // Requires Sass 3.1+
@mixin radial-gradient($G1,        $G2,
-                       $G3: null, $G4: null,
-                       $G5: null, $G6: null,
-                       $G7: null, $G8: null,
-                       $G9: null, $G10: null,
+                       $G3: false, $G4: false,
+                       $G5: false, $G6: false,
+                       $G7: false, $G8: false,
+                       $G9: false, $G10: false,
                       $pos: null,
                       $shape-size: null,
-                       $fallback: null) {
+                       $deprecated-pos1: center center,
+                       $deprecated-pos2: center center,
+                       $deprecated-radius1: 0,
+                       $deprecated-radius2: 460,
+                       $fallback: false) {

  $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);
  $G1:  nth($data, 1);
@@ -14,7 +18,7 @@
  $pos: nth($data, 3);
  $shape-size: nth($data, 4);

-  $full: $G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10;
+  $full: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);

  // Strip deprecated cover/contain for spec
  $shape-size-spec: _shape-size-stripper($shape-size);
@@ -34,6 +38,7 @@
  $shape-size-spec: if(($shape-size-spec != ' ') and ($pos == null), '#{$shape-size-spec}, ', '#{$shape-size-spec} ');

  background-color:  $fallback-color;
+  background-image: _deprecated-webkit-gradient(radial, $deprecated-pos1, $deprecated-pos2, $full, $deprecated-radius1, $deprecated-radius2); // Safari <= 5.0 && IOS 4
  background-image: -webkit-radial-gradient(unquote(#{$pos}#{$shape-size}#{$full}));
  background-image: unquote("radial-gradient(#{$shape-size-spec}#{$pos-spec}#{$full})");
 }
--- a/docs/_css/bourbon/css3/_transition.scss
+++ b/docs/_css/bourbon/css3/_transition.scss
@@ -1,59 +1,16 @@
 // Shorthand mixin. Supports multiple parentheses-deliminated values for each variable.
-// Example: @include transition (all 2s ease-in-out);
-//          @include transition (opacity 1s ease-in 2s, width 2s ease-out);
-//          @include transition-property (transform, opacity);
+// Example: @include transition (all, 2.0s, ease-in-out);
+//          @include transition ((opacity, width), (1.0s, 2.0s), ease-in, (0, 2s));
+//          @include transition ($property:(opacity, width), $delay: (1.5s, 2.5s));

@mixin transition ($properties...) {
-  // Fix for vendor-prefix transform property
-  $needs-prefixes: false;
-  $webkit: ();
-  $moz: ();
-  $spec: ();
-
-  // Create lists for vendor-prefixed transform
-  @each $list in $properties {
-    @if nth($list, 1) == "transform" {
-      $needs-prefixes: true;
-      $list1: -webkit-transform;
-      $list2: -moz-transform;
-      $list3: ();
-
-      @each $var in $list {
-        $list3: join($list3, $var);
-
-        @if $var != "transform" {
-          $list1: join($list1, $var);
-          $list2: join($list2, $var);
-        }
-      }
-
-      $webkit: append($webkit, $list1);
-         $moz: append($moz,    $list2);
-        $spec: append($spec,   $list3);
-    }
-
-    // Create lists for non-prefixed transition properties
-    @else {
-      $webkit:  append($webkit, $list, comma);
-      $moz:     append($moz,    $list, comma);
-      $spec:    append($spec,   $list, comma);
-    }
+  @if length($properties) >= 1 {
+    @include prefixer(transition, $properties, webkit moz spec);
  }

-  @if $needs-prefixes {
-    -webkit-transition: $webkit;
-       -moz-transition: $moz;
-            transition: $spec;
-  }
  @else {
-    @if length($properties) >= 1 {
-      @include prefixer(transition, $properties, webkit moz spec);
-    }
-
-    @else {
-      $properties: all 0.15s ease-out 0s;
-      @include prefixer(transition, $properties, webkit moz spec);
-    }
+    $properties: all 0.15s ease-out 0;
+    @include prefixer(transition, $properties, webkit moz spec);
  }
 }

--- a/docs/_css/bourbon/functions/_assign.scss
+++ b/docs/_css/bourbon/functions/_assign.scss
@@ -1,11 +0,0 @@
-@function assign-inputs($inputs, $pseudo: null) {
-  $list : ();
-
-  @each $input in $inputs {
-    $input: unquote($input);
-    $input: if($pseudo, $input + ":" + $pseudo, $input);
-    $list: append($list, $input, comma);
-  }
-
-  @return $list;
-}
--- a/docs/_css/bourbon/functions/_color-lightness.scss
+++ b/docs/_css/bourbon/functions/_color-lightness.scss
@@ -1,13 +0,0 @@
-// Programatically determines whether a color is light or dark
-// Returns a boolean
-// More details here http://robots.thoughtbot.com/closer-look-color-lightness
-
-@function is-light($hex-color) {
-  $-local-red: red(rgba($hex-color, 1.0));
-  $-local-green: green(rgba($hex-color, 1.0));
-  $-local-blue: blue(rgba($hex-color, 1.0));
-
-  $-local-lightness: ($-local-red * 0.2126 + $-local-green * 0.7152 + $-local-blue * 0.0722) / 255;
-
-  @return $-local-lightness > .6;
-}
--- a/docs/_css/bourbon/functions/_compact.scss
+++ b/docs/_css/bourbon/functions/_compact.scss
@@ -0,0 +1,11 @@
+// Remove `false` values from a list
+
+@function compact($vars...) {
+  $list: ();
+  @each $var in $vars {
+    @if $var {
+      $list: append($list, $var, comma);
+    }
+  }
+  @return $list;
+}
--- a/docs/_css/bourbon/functions/_golden-ratio.scss
+++ b/docs/_css/bourbon/functions/_golden-ratio.scss
@@ -1,3 +0,0 @@
-@function golden-ratio($value, $increment) {
-  @return modular-scale($value, $increment, $golden)
-}
--- a/docs/_css/bourbon/functions/_linear-gradient.scss
+++ b/docs/_css/bourbon/functions/_linear-gradient.scss
@@ -0,0 +1,13 @@
+@function linear-gradient($pos, $gradients...) {
+  $type: linear;
+  $pos-type: type-of(nth($pos, 1));
+
+  // if $pos doesn't exist, fix $gradient
+  @if ($pos-type == color) or (nth($pos, 1) == "transparent")  {
+    $gradients: zip($pos $gradients);
+    $pos: false;
+  }
+
+  $type-gradient: $type, $pos, $gradients;
+  @return $type-gradient;
+}
--- a/docs/_css/bourbon/functions/_modular-scale.scss
+++ b/docs/_css/bourbon/functions/_modular-scale.scss
@@ -1,66 +1,40 @@
-// Scaling Variables
-$golden:           1.618;
-$minor-second:     1.067;
-$major-second:     1.125;
-$minor-third:      1.2;
-$major-third:      1.25;
-$perfect-fourth:   1.333;
-$augmented-fourth: 1.414;
-$perfect-fifth:    1.5;
-$minor-sixth:      1.6;
-$major-sixth:      1.667;
-$minor-seventh:    1.778;
-$major-seventh:    1.875;
-$octave:           2;
-$major-tenth:      2.5;
-$major-eleventh:   2.667;
-$major-twelfth:    3;
-$double-octave:    4;
-
@function modular-scale($value, $increment, $ratio) {
-  $v1: nth($value, 1);
-  $v2: nth($value, length($value));
-  $value: $v1;
-
-  // scale $v2 to just above $v1
-  @while $v2 > $v1 {
-    $v2: ($v2 / $ratio); // will be off-by-1
-  }
-  @while $v2 < $v1 {
-    $v2: ($v2 * $ratio); // will fix off-by-1
-  }
-
-  // check AFTER scaling $v2 to prevent double-counting corner-case
-  $double-stranded: $v2 > $v1;
-
  @if $increment > 0 {
    @for $i from 1 through $increment {
-      @if $double-stranded and ($v1 * $ratio) > $v2 {
-        $value: $v2;
-        $v2: ($v2 * $ratio);
-      } @else {
-        $v1: ($v1 * $ratio);
-        $value: $v1;
-      }
+      $value: ($value * $ratio);
    }
  }

  @if $increment < 0 {
-    // adjust $v2 to just below $v1
-    @if $double-stranded {
-      $v2: ($v2 / $ratio);
-    }
-
-    @for $i from $increment through -1 {
-      @if $double-stranded and ($v1 / $ratio) < $v2 {
-        $value: $v2;
-        $v2: ($v2 / $ratio);
-      } @else {
-        $v1: ($v1 / $ratio);
-        $value: $v1;
-      }
+    $increment: abs($increment);
+    @for $i from 1 through $increment {
+      $value: ($value / $ratio);
    }
  }

  @return $value;
 }
+
+//  div {
+//                     Increment Up GR with positive value
+//   font-size:        modular-scale(14px,   1, 1.618); // returns: 22.652px
+//
+//                     Increment Down GR with negative value
+//   font-size:        modular-scale(14px,  -1, 1.618); // returns: 8.653px
+//
+//                     Can be used with ceil(round up) or floor(round down)
+//   font-size: floor( modular-scale(14px, 1, 1.618) ); // returns: 22px
+//   font-size:  ceil( modular-scale(14px, 1, 1.618) ); // returns: 23px
+//  }
+//
+// modularscale.com
+
+@function golden-ratio($value, $increment) {
+  @return modular-scale($value, $increment, 1.618)
+}
+
+//  div {
+//    font-size: golden-ratio(14px, 1); // returns: 22.652px
+//  }
+//
+// goldenratiocalculator.com
--- a/docs/_css/bourbon/functions/_px-to-em.scss
+++ b/docs/_css/bourbon/functions/_px-to-em.scss
@@ -2,12 +2,7 @@
 // eg. for a relational value of 12px write em(12) when the parent is 16px
 // if the parent is another value say 24px write em(12, 24)

-@function em($pxval, $base: $em-base) {
-  @if not unitless($pxval) {
-      $pxval: strip-units($pxval);
-  }
-  @if not unitless($base) {
-      $base: strip-units($base);
-  }
+@function em($pxval, $base: 16) {
  @return ($pxval / $base) * 1em;
 }
+
--- a/docs/_css/bourbon/functions/_px-to-rem.scss
+++ b/docs/_css/bourbon/functions/_px-to-rem.scss
@@ -1,15 +0,0 @@
-// Convert pixels to rems
-// eg. for a relational value of 12px write rem(12)
-// Assumes $em-base is the font-size of <html>
-
-@function rem($pxval) {
-  @if not unitless($pxval) {
-      $pxval: strip-units($pxval);
-  }
-
-  $base: $em-base;
-  @if not unitless($base) {
-      $base: strip-units($base);
-  }
-  @return ($pxval / $base) * 1rem;
-}
--- a/docs/_css/bourbon/functions/_radial-gradient.scss
+++ b/docs/_css/bourbon/functions/_radial-gradient.scss
@@ -0,0 +1,23 @@
+// This function is required and used by the background-image mixin.
+@function radial-gradient($G1,        $G2,
+                       $G3: false, $G4: false,
+                       $G5: false, $G6: false,
+                       $G7: false, $G8: false,
+                       $G9: false, $G10: false,
+                       $pos: null,
+                       $shape-size: null) {
+
+  $data: _radial-arg-parser($G1, $G2, $pos, $shape-size);
+  $G1:  nth($data, 1);
+  $G2:  nth($data, 2);
+  $pos: nth($data, 3);
+  $shape-size: nth($data, 4);
+
+  $type: radial;
+  $gradient: compact($G1, $G2, $G3, $G4, $G5, $G6, $G7, $G8, $G9, $G10);
+
+  $type-gradient: $type, $shape-size $pos, $gradient;
+  @return $type-gradient;
+}
+
+
--- a/docs/_css/bourbon/functions/_strip-units.scss
+++ b/docs/_css/bourbon/functions/_strip-units.scss
@@ -1,5 +0,0 @@
-// Srtips the units from a value. e.g. 12px -> 12
-
-@function strip-units($val) {
-  @return ($val / ($val * 0 + 1));
-}
--- a/docs/_css/bourbon/functions/_unpack.scss
+++ b/docs/_css/bourbon/functions/_unpack.scss
@@ -1,17 +0,0 @@
-// Convert shorthand to the 4-value syntax
-
-@function unpack($shorthand) {
-  @if length($shorthand) == 1 {
-    @return nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1) nth($shorthand, 1);
-  }
-  @else if length($shorthand) == 2 {
-    @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 1) nth($shorthand, 2);
-  }
-  @else if length($shorthand) == 3 {
-    @return nth($shorthand, 1) nth($shorthand, 2) nth($shorthand, 3) nth($shorthand, 2);
-  }
-  @else {
-    @return $shorthand;
-  }
-}
-
--- a/docs/_css/bourbon/helpers/_convert-units.scss
+++ b/docs/_css/bourbon/helpers/_convert-units.scss
@@ -1,15 +0,0 @@
-//************************************************************************//
-// Helper function for str-to-num fn.
-// Source: http://sassmeister.com/gist/9647408
-//************************************************************************//
-@function _convert-units($number, $unit) {
-  $strings: 'px' 'cm' 'mm' '%' 'ch' 'pica' 'in' 'em' 'rem' 'pt' 'pc' 'ex' 'vw' 'vh' 'vmin' 'vmax', 'deg', 'rad', 'grad', 'turn';
-  $units:   1px  1cm  1mm  1%  1ch  1pica  1in  1em  1rem  1pt  1pc  1ex  1vw  1vh  1vmin  1vmax,  1deg,  1rad,  1grad, 1turn;
-  $index: index($strings, $unit);
-
-  @if not $index {
-    @warn "Unknown unit `#{$unit}`.";
-    @return false;
-  }
-  @return $number * nth($units, $index);
-}
--- a/docs/_css/bourbon/helpers/_deprecated-webkit-gradient.scss
+++ b/docs/_css/bourbon/helpers/_deprecated-webkit-gradient.scss
@@ -0,0 +1,39 @@
+// Render Deprecated Webkit Gradient - Linear || Radial
+//************************************************************************//
+@function _deprecated-webkit-gradient($type,
+                                     $deprecated-pos1, $deprecated-pos2,
+                                     $full,
+                                     $deprecated-radius1: false, $deprecated-radius2: false) {
+  $gradient-list: ();
+  $gradient: false;
+  $full-length: length($full);
+  $percentage: false;
+  $gradient-type: $type;
+
+  @for $i from 1 through $full-length {
+    $gradient: nth($full, $i);
+
+    @if length($gradient) == 2 {
+      $color-stop: color-stop(nth($gradient, 2), nth($gradient, 1));
+      $gradient-list: join($gradient-list, $color-stop, comma);
+    }
+    @else if $gradient != null {
+      @if $i == $full-length {
+        $percentage: 100%;
+      }
+      @else {
+        $percentage: ($i - 1) * (100 / ($full-length - 1)) + "%";
+      }
+      $color-stop: color-stop(unquote($percentage), $gradient);
+      $gradient-list: join($gradient-list, $color-stop, comma);
+    }
+  }
+
+  @if $type == radial {
+    $gradient: -webkit-gradient(radial, $deprecated-pos1, $deprecated-radius1, $deprecated-pos2, $deprecated-radius2, $gradient-list);
+  }
+  @else if $type == linear {
+    $gradient: -webkit-gradient(linear, $deprecated-pos1, $deprecated-pos2, $gradient-list);
+  }
+  @return $gradient;
+}
--- a/docs/_css/bourbon/helpers/_is-num.scss
+++ b/docs/_css/bourbon/helpers/_is-num.scss
@@ -1,8 +0,0 @@
-//************************************************************************//
-// Helper for linear-gradient-parser
-//************************************************************************//
-@function _is-num($char) {
-  $values: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9' 0 1 2 3 4 5 6 7 8 9;
-  $index: index($values, $char);
-  @return if($index, true, false);
-}
--- a/docs/_css/bourbon/helpers/_linear-angle-parser.scss
+++ b/docs/_css/bourbon/helpers/_linear-angle-parser.scss
@@ -1,25 +0,0 @@
-// Private function for linear-gradient-parser
-@function _linear-angle-parser($image, $first-val, $prefix, $suffix) {
-  $offset: null;
-  $unit-short:  str-slice($first-val, str-length($first-val) - 2, str-length($first-val));
-  $unit-long:   str-slice($first-val, str-length($first-val) - 3, str-length($first-val));
-
-  @if ($unit-long == "grad") or
-      ($unit-long == "turn") {
-    $offset: if($unit-long == "grad", -100grad * 3, -0.75turn);
-  }
-
-  @else if ($unit-short == "deg") or
-           ($unit-short == "rad") {
-    $offset: if($unit-short == "deg", -90 * 3, 1.6rad);
-  }
-
-  @if $offset {
-    $num: _str-to-num($first-val);
-
-    @return (
-      webkit-image: -webkit- + $prefix + ($offset - $num) + $suffix,
-      spec-image: $image
-    );
-  }
-}
--- a/docs/_css/bourbon/helpers/_linear-gradient-parser.scss
+++ b/docs/_css/bourbon/helpers/_linear-gradient-parser.scss
@@ -1,41 +0,0 @@
-@function _linear-gradient-parser($image) {
-  $image: unquote($image);
-  $gradients: ();
-  $start: str-index($image, "(");
-  $end: str-index($image, ",");
-  $first-val: str-slice($image, $start + 1, $end - 1);
-
-  $prefix: str-slice($image, 0, $start);
-  $suffix: str-slice($image, $end, str-length($image));
-
-  $has-multiple-vals: str-index($first-val, " ");
-  $has-single-position: unquote(_position-flipper($first-val) + "");
-  $has-angle: _is-num(str-slice($first-val, 0, 0));
-
-  @if $has-multiple-vals {
-    $gradients: _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals);
-  }
-
-  @else if $has-single-position != "" {
-    $pos: unquote($has-single-position + "");
-
-    $gradients: (
-      webkit-image: -webkit- + $image,
-      spec-image: $prefix + "to " + $pos + $suffix
-    );
-  }
-
-  @else if $has-angle {
-    // Rotate degree for webkit
-    $gradients: _linear-angle-parser($image, $first-val, $prefix, $suffix);
-  }
-
-  @else {
-    $gradients: (
-      webkit-image: -webkit- + $image,
-      spec-image: $image
-    );
-  }
-
-  @return $gradients;
-}
--- a/docs/_css/bourbon/helpers/_linear-side-corner-parser.scss
+++ b/docs/_css/bourbon/helpers/_linear-side-corner-parser.scss
@@ -1,31 +0,0 @@
-// Private function for linear-gradient-parser
-@function _linear-side-corner-parser($image, $first-val, $prefix, $suffix, $has-multiple-vals) {
-  $val-1: str-slice($first-val, 0, $has-multiple-vals - 1 );
-  $val-2: str-slice($first-val, $has-multiple-vals + 1, str-length($first-val));
-  $val-3: null;
-  $has-val-3: str-index($val-2, " ");
-
-  @if $has-val-3 {
-    $val-3: str-slice($val-2, $has-val-3 + 1, str-length($val-2));
-    $val-2: str-slice($val-2, 0, $has-val-3 - 1);
-  }
-
-  $pos: _position-flipper($val-1) _position-flipper($val-2) _position-flipper($val-3);
-  $pos: unquote($pos + "");
-
-  // Use old spec for webkit
-  @if $val-1 == "to" {
-    @return (
-      webkit-image: -webkit- + $prefix + $pos + $suffix,
-      spec-image: $image
-    );
-  }
-
-  // Bring the code up to spec
-  @else {
-    @return (
-      webkit-image: -webkit- + $image,
-      spec-image: $prefix + "to " + $pos + $suffix
-    );
-  }
-}
--- a/docs/_css/bourbon/helpers/_radial-arg-parser.scss
+++ b/docs/_css/bourbon/helpers/_radial-arg-parser.scss
@@ -22,7 +22,7 @@
          $pos: $pos nth($value, $i);
        }
      }
-      $G1: null;
+      $G1: false;
    }

    // If not spec calculate correct values
@@ -38,7 +38,7 @@
          $pos: $value;

          @if $pos == $G1 {
-            $G1: null;
+            $G1: false;
          }
        }

@@ -55,11 +55,11 @@
          $shape-size: $value;

          @if $value == $G1 {
-            $G1: null;
+            $G1: false;
          }

          @else if $value == $G2 {
-            $G2: null;
+            $G2: false;
          }
        }
      }
--- a/docs/_css/bourbon/helpers/_radial-gradient-parser.scss
+++ b/docs/_css/bourbon/helpers/_radial-gradient-parser.scss
@@ -1,50 +0,0 @@
-@function _radial-gradient-parser($image) {
-  $image: unquote($image);
-  $gradients: ();
-  $start: str-index($image, "(");
-  $end: str-index($image, ",");
-  $first-val: str-slice($image, $start + 1, $end - 1);
-
-  $prefix: str-slice($image, 0, $start);
-  $suffix: str-slice($image, $end, str-length($image));
-
-  $is-spec-syntax: str-index($first-val, "at");
-
-  @if $is-spec-syntax and $is-spec-syntax > 1 {
-    $keyword: str-slice($first-val, 1, $is-spec-syntax - 2);
-    $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));
-    $pos: append($pos, $keyword, comma);
-
-    $gradients: (
-      webkit-image: -webkit- + $prefix + $pos + $suffix,
-      spec-image: $image
-    )
-  }
-
-  @else if $is-spec-syntax == 1 {
-    $pos: str-slice($first-val, $is-spec-syntax + 3, str-length($first-val));
-
-    $gradients: (
-      webkit-image: -webkit- + $prefix + $pos + $suffix,
-      spec-image: $image
-    )
-  }
-
-  @else if str-index($image, "cover") or str-index($image, "contain") {
-    @warn "Radial-gradient needs to be updated to conform to latest spec.";
-
-    $gradients: (
-      webkit-image: null,
-      spec-image: $image
-    )
-  }
-
-  @else {
-    $gradients: (
-      webkit-image: -webkit- + $image,
-      spec-image: $image
-    )
-  }
-
-  @return $gradients;
-}
--- a/docs/_css/bourbon/helpers/_str-to-num.scss
+++ b/docs/_css/bourbon/helpers/_str-to-num.scss
@@ -1,50 +0,0 @@
-//************************************************************************//
-// Helper function for linear/radial-gradient-parsers.
-// Source: http://sassmeister.com/gist/9647408
-//************************************************************************//
-@function _str-to-num($string) {
-  // Matrices
-  $strings: '0' '1' '2' '3' '4' '5' '6' '7' '8' '9';
-  $numbers:  0   1   2   3   4   5   6   7   8   9;
-
-  // Result
-  $result: 0;
-  $divider: 0;
-  $minus: false;
-
-  // Looping through all characters
-  @for $i from 1 through str-length($string) {
-    $character: str-slice($string, $i, $i);
-    $index: index($strings, $character);
-
-    @if $character == '-' {
-      $minus: true;
-    }
-
-    @else if $character == '.' {
-      $divider: 1;
-    }
-
-    @else {
-      @if not $index {
-        $result: if($minus, $result * -1, $result);
-        @return _convert-units($result, str-slice($string, $i));
-      }
-
-      $number: nth($numbers, $index);
-
-      @if $divider == 0 {
-        $result: $result * 10;
-      }
-
-      @else {
-        // Move the decimal dot to the left
-        $divider: $divider * 10;
-        $number: $number / $divider;
-      }
-
-      $result: $result + $number;
-    }
-  }
-  @return if($minus, $result * -1, $result);
-}
--- a/docs/_css/bourbon/settings/_asset-pipeline.scss
+++ b/docs/_css/bourbon/settings/_asset-pipeline.scss
@@ -1 +0,0 @@
-$asset-pipeline: false !default;
--- a/docs/_css/bourbon/settings/_prefixer.scss
+++ b/docs/_css/bourbon/settings/_prefixer.scss
@@ -1,6 +0,0 @@
-// Variable settings for /addons/prefixer.scss
-$prefix-for-webkit:    true !default;
-$prefix-for-mozilla:   true !default;
-$prefix-for-microsoft: true !default;
-$prefix-for-opera:     true !default;
-$prefix-for-spec:      true !default; // required for keyframe mixin
--- a/docs/_css/bourbon/settings/_px-to-em.scss
+++ b/docs/_css/bourbon/settings/_px-to-em.scss
@@ -1 +0,0 @@
-$em-base: 16px !default;
--- a/docs/_css/react.scss
+++ b/docs/_css/react.scss
@@ -1,14 +1,12 @@
---
---
@import 'bourbon/bourbon';
@import '_variables';
@import '_typography';
@import '_solarized';

@mixin code-typography {
-  font-family: 'source-code-pro', Menlo, Consolas, 'Courier New', monospace;
-  font-size: 0.8em;
-  line-height: 1.5;
+  font-family: 'source-code-pro', Menlo, 'Courier New', Consolas, monospace;
+  font-size: 13px;
+  line-height: 20px;
 }

 $skinnyContentWidth: 650px;
@@ -17,7 +15,6 @@ $contentPadding: 20px;
 $columnWidth: 280px;
 $columnGutter: 40px;
 $twoColumnWidth: 2 * $columnWidth + $columnGutter;
-$navHeight: 50px;



@@ -45,7 +42,7 @@ html {


 .container {
-  padding-top: $navHeight;
+  padding-top: 50px;
  min-width: $contentWidth + (2 * $contentPadding);
 }

@@ -76,23 +73,6 @@ li {
  margin-left: 20px;
 }

-// Make header navigation linkable and on the screen. Used in documentation and
-// blog posts.
-h1, h2, h3, h4, h5, h6 {
-  .anchor {
-    margin-top: -$navHeight;
-    position: absolute;
-  }
-
-  &:hover .hash-link {
-    display: inline;
-  }
-}
-.hash-link {
-  color: $mediumTextColor;
-  display: none;
-}
-
 // Main Nav

 .nav-main {
@@ -101,7 +81,7 @@ h1, h2, h3, h4, h5, h6 {
  color: $lightTextColor;
  position: fixed;
  top: 0;
-  height: $navHeight;
+  height: 50px;
  box-shadow: 0 0 5px rgba(0, 0, 0, .5);
  width: 100%;
  z-index: 100;
@@ -123,9 +103,9 @@ h1, h2, h3, h4, h5, h6 {
      padding: 0 8px;
      text-transform: uppercase;
      letter-spacing: 1px;
-      line-height: $navHeight;
+      line-height: 50px;
      display: inline-block;
-      height: $navHeight;
+      height: 50px;
      color: $mediumTextColor;

      &:hover {
@@ -143,14 +123,12 @@ h1, h2, h3, h4, h5, h6 {
  .nav-home {
    color: #00d8ff;
    font-size: 24px;
-    line-height: $navHeight;
-    height: $navHeight;
-    display: inline-block;
+    line-height: 50px;
  }

  .nav-logo {
+    @include retina-image('../img/logo_small', 38px 38px);
    vertical-align: middle;
-    display: inline-block;
  }

  ul {
@@ -228,11 +206,10 @@ h1, h2, h3, h4, h5, h6 {
    margin: 0;
  }
  ul ul {
-    margin: 6px 0 0 20px;
+    margin-left: 20px;
  }
  li {
-    line-height: 16px;
-    margin: 0 0 6px;
+    margin: 0;
  }
  h3 {
    text-transform: uppercase;
@@ -295,7 +272,7 @@ h1, h2, h3, h4, h5, h6 {

 .marketing-col {
  float: left;
-  margin-left: 40px;
+  margin-right: 40px;
  width: $columnWidth;

  h3 {
@@ -309,8 +286,8 @@ h1, h2, h3, h4, h5, h6 {
  }
 }

-.marketing-col:first-child {
-  margin-left: 0;
+.marketing-col:last-child {
+  margin-right: 0;
 }

 #examples h3, .home-presentation h3 {
@@ -392,8 +369,6 @@ section.black content {
 */

 .blogContent {
-  @include clearfix;
-
  padding-top: 20px;

  blockquote {
@@ -416,7 +391,6 @@ section.black content {
    font-size: 24px;
  }

-
  // H2s form documentation topic dividers. Extra space helps.
  h2 {
    margin-top: 30px;
@@ -424,7 +398,7 @@ section.black content {

  padding-top: 20px;

-  // Make a notice box out of blockquotes in the documentation:
+  // Make a notice box out of blockquotes in the documetation:
  blockquote {
      padding: 15px 30px 15px 15px;
      margin: 20px 0;
@@ -433,7 +407,7 @@ section.black content {
    h4 {
      margin-top: 0;
    }
-    p {
+    p:last-child {
      margin-bottom: 0;
    }
    // Treat first child as the title - promote to H4.
@@ -459,29 +433,18 @@ section.black content {
  padding-top: 20px;
  width: 1220px;

-  label.compiler-option {
-    display: block;
-    margin-top: 5px;
-  }
-
  #jsxCompiler {
    margin-top: 20px;
  }

  .playgroundPreview {
-    padding: 0;
+    padding: 14px;
    width: 600px;

    pre {
      @include code-typography;
    }
  }
-
-  .playgroundError {
-    // The compiler view kills padding in order to render the CodeMirror code
-    // more nicely. For the error view, put a padding back
-    padding: 15px 20px;
-  }
 }

 /* Button */
@@ -570,26 +533,13 @@ figure {
  margin: 0 auto;
 }

-h1 {
-  // Contains .edit-page-link
-  @include clearfix;
-}
-
-.edit-page-link {
-  float: right;
-  font-size: 16px;
-  font-weight: normal;
-  line-height: 20px;
-  margin-top: 17px;
-}
-
 /* Blog */

 .post-list-item + .post-list-item {
  margin-top: 60px;
 }

-/* CodeMirror */
+/* Code Mirror */

 div.CodeMirror pre, div.CodeMirror-linenumber, code {
  @include code-typography;
@@ -603,11 +553,6 @@ div.CodeMirror-linenumber:after {
  border: none;
 }

-/* hide the cursor. Mostly used when code's in plain JS */
-.CodeMirror-readonly div.CodeMirror-cursor {
-  visibility: hidden;
-}
-
 small code,
 li code,
 p code {
@@ -624,28 +569,23 @@ p code {
  @include clearfix;
 }

-.playground-tab {
+.playground::before {
  border-bottom: none !important;
  border-radius: 3px 3px 0 0;
-  padding: 6px 8px;
+  padding: 3px 7px;
  font-size: 12px;
  font-weight: bold;
  color: #c2c0bc;
  background-color: #f1ede4;
-  display: inline-block;
-  cursor: pointer;
+  content: 'Live editor';
 }

+.playground::before,
 .playgroundCode,
-.playground-tab,
 .playgroundPreview {
  border: 1px solid rgba(16,16,16,0.1);
 }

-.playground-tab-active {
-  color: $darkestColor;
-}
-
 .playgroundCode {
  border-radius: 0 3px 3px 3px;
  float: left;
@@ -661,11 +601,6 @@ p code {
  width: $columnWidth;
 }

-.playgroundError {
-  color: darken($primary, 5%);
-  font-size: 15px;
-}
-
 .MarkdownEditor textarea {
  width: 100%;
  height: 100px
@@ -680,7 +615,7 @@ p code {
  padding-left: 9px;
 }

-/* CodeMirror doesn't support <jsx> syntax. Instead of highlighting it
+/* Codemirror doesn't support <jsx> syntax. Instead of highlighting it
   as error, just ignore it */
 .highlight .javascript .err {
  background-color: transparent;
@@ -706,12 +641,7 @@ p code {
 }

 .highlight pre code {
-  /* Respect line-height defined in <code> styles above */
-  display: block;
-
-  /* Cancel out styles for `li code` in case we have a <pre> within an <li>. */
-  background: none;
-  padding: 0;
+  font-size: inherit;
 }

 .highlight pre .lineno {
@@ -772,24 +702,3 @@ p code {
    float: right;
  }
 }
-
-// Twitter embeds. Need to !important because they inline margin on the iframe.
-div[data-twttr-id] iframe {
-  margin: 10px auto !important;
-}
-
-/* Acknowledgements */
-
-.three-column {
-  @include clearfix;
-}
-
-.three-column > ul {
-  float: left;
-  margin-left: 30px;
-  width: 190px;
-}
-
-.three-column > ul:first-child {
-  margin-left: 20px;
-}
--- a/docs/_data/acknowledgements.yml
+++ b/docs/_data/acknowledgements.yml
@@ -1,179 +0,0 @@
---
- - Adam Krebs
-  - Adam Solove
-  - Alan deLevie
-  - Alex Zelenskiy
-  - Alexander Solovyov
-  - Andreas Svensson
-  - Andrew Davey
-  - Andrew Zich
-  - Andrey Popp
-  - Anthony van der Hoorn
-  - Ayman Osman
-  - Ben Alpert
-  - Ben Newman
-  - Ben Ripkens
-  - Bill Fisher
-  - Bob Eagan
-  - Bojan Mihelac
-  - Brandon Bloom
-  - Brian Cooke
-  - Brian Kim
-  - Brian Reavis
-  - Brian Rue
-  - Cam Spiers
-  - Cassus Adam Banko
-  - Cat Chen
-  - Cheng Lou
-  - Christian Roman
-  - Christoph Pojer
-  - Christopher Monsanto
-  - Clay Allsopp
-  - Connor McSheffrey
-  - Dan Schafer
-  - Daniel Gasienica
-  - Daniel Lo Nigro
-  - Daniel Miladinov
-  - Daniel Schonfeld
-  - Danny Ben-David
-  - Daryl Lau
-  - David Hellsing
-  - David Hu
-  - Devon Blandin
-  - Dmitry Mazuro
-  - Dustin Getz
-  - Enguerran
-  - Eric Clemmons
-  - Eric Florenzano
-  - Eric Schoffstall
-  - Evan Coonrod
-  - Fabio M. Costa
-  - Felipe Oliveira Carvalho
-  - Felix Kling
-  - Fernando Correia
-  - François-Xavier Bois
-  - Fred Zhao
-  - G Scott Olson
-  - Geert Pasteels
-  - Geert-Jan Brits
-  - George A Sisco III
-  - Gilbert
-  - Greg Hurrell
- - Greg Roodt
-  - Guangqiang Dong
-  - Guido Bouman
-  - Harry Hull
-  - Harshad Sabne
-  - Hendrik Swanepoel
-  - Hugo Jobling
-  - Ian Obermiller
-  - Ingvar Stepanyan
-  - Irae Carvalho
-  - Isaac Salier-Hellendag
-  - Ivan Kozik
-  - Jaime Mingo
-  - Jakub Malinowski
-  - James Brantly
-  - James Ide
-  - Jamie Wong
-  - Jamison Dance
-  - Jan Kassens
-  - Jared Forsyth
-  - Jason Bonta
-  - Jason Trill
-  - Jean Lauliac
-  - Jeff Barczewski
-  - Jeff Carpenter
-  - Jeff Morrison
-  - Jeff Welch
-  - Jeffrey Lin
-  - Jignesh Kakadiya
-  - Jing Chen
-  - Johannes Baiter
-  - John Watson
-  - Jon Beebe
-  - Jonas Enlund
-  - Jonas Gebhardt
-  - Jonathan Hsu
-  - Jordan Walke
-  - Josh Bassett
-  - Josh Duck
-  - Josh Yudaken
-  - Joshua Ma
-  - Julen Ruiz Aizpuru
-  - Jun Wu
-  - Juraj Dudak
-  - Justin Jaffray
-  - Karl Mikkelsen
-  - Keito Uchiyama
-  - Kit Randel
-  - Kunal Mehta
-  - Kyle Mathews
-  - Laurence Rowe
-  - Levi McCallum
-  - Lily
-  - Logan Allen
-  - Luigy Leon
-  - Marcin Kwiatkowski
-  - Marcin Szczepanski
-  - Mariano Desanze
-  - Mark Richardson
-  - Marshall Roch
- - Martin Andert
-  - Martin Konicek
-  - Mathieu M-Gosselin
-  - Matt Harrison
-  - Matthew Dapena-Tretter
-  - Matti Nelimarkka
-  - Michal Srb
-  - Mouad Debbar
-  - Nadeesha Cabral
-  - Nate Hunzaker
-  - Nicholas Bergson-Shilcock
-  - Nick Gavalas
-  - Nick Thompson
-  - Niklas Boström
-  - Owen Coutts
-  - Pascal Hartig
-  - Paul O’Shannessy
-  - Paul Seiffert
-  - Paul Shen
-  - Pete Hunt
-  - Peter Cottle
-  - Petri Lievonen
-  - Pieter Vanderwerff
-  - Rajiv Tirumalareddy
-  - Randall Randall
-  - Ray
-  - Richard D. Worth
-  - Richard Feldman
-  - Richard Livesey
-  - Ryan Seddon
-  - Sahat Yalkabov
-  - Sander Spies
-  - Sean Kinsey
-  - Sebastian Markbåge
-  - Shaun Trennery
-  - Simon Højberg
-  - Stefan Dombrowski
-  - Stephen Murphy
-  - Stoyan Stefanov
-  - Sundeep Malladi
-  - Sven Helmberger
-  - Thomas Aylott
-  - Thomas Boyt
-  - Thomas Shaddox
-  - Thomas Shafer
-  - Timothy Yung
-  - Tom Haggie
-  - Tom Occhino
-  - Ville Immonen
-  - Vjeux
-  - Volkan Unsal
-  - Wayne Larsen
-  - Wincent Colaiuta
-  - Yuriy Dybskiy
-  - Yuval Dekel
-  - Zach Bruggeman
-  - davidxi
-  - imagentleman
--- a/docs/_data/nav_docs.yml
+++ b/docs/_data/nav_docs.yml
@@ -1,85 +0,0 @@
- title: Quick Start
-  items:
-  - id: getting-started
-    title: Getting Started
-  - id: tutorial
-    title: Tutorial
-  - id: thinking-in-react
-    title: Thinking in React
- title: Community Resources
-  items:
-  - id: videos
-    title: Videos
-  - id: complementary-tools
-    title: Complementary Tools
-  - id: examples
-    title: Examples
- title: Guides
-  items:
-  - id: why-react
-    title: Why React?
-  - id: displaying-data
-    title: Displaying Data
-    subitems:
-    - id: jsx-in-depth
-      title: JSX in Depth
-    - id: jsx-gotchas
-      title: JSX Gotchas
-  - id: interactivity-and-dynamic-uis
-    title: Interactivity and Dynamic UIs
-  - id: multiple-components
-    title: Multiple Components
-  - id: reusable-components
-    title: Reusable Components
-  - id: forms
-    title: Forms
-  - id: working-with-the-browser
-    title: Working With the Browser
-    subitems:
-    - id: more-about-refs
-      title: More About Refs
-  - id: tooling-integration
-    title: Tooling Integration
-  - id: addons
-    title: Add-Ons
-    subitems:
-    - id: animation
-      title: Animation
-    - id: two-way-binding-helpers
-      title: Two-Way Binding Helpers
-    - id: class-name-manipulation
-      title: Class Name Manipulation
-    - id: test-utils
-      title: Test Utilities
-    - id: clone-with-props
-      title: Cloning Components
-    - id: update
-      title: Immutability Helpers
-    - id: pure-render-mixin
-      title: PureRenderMixin
-    - id: perf
-      title: Performance Tools
- title: Reference
-  items:
-  - id: top-level-api
-    title: Top-Level API
-  - id: component-api
-    title: Component API
-  - id: component-specs
-    title: Component Specs and Lifecycle
-  - id: tags-and-attributes
-    title: Supported Tags and Attributes
-  - id: events
-    title: Event System
-  - id: dom-differences
-    title: DOM Differences
-  - id: special-non-dom-attributes
-    title: Special Non-DOM Attributes
-  - id: reconciliation
-    title: Reconciliation
- title: Flux
-  items:
-  - id: flux-overview
-    title: Flux Overview
-  - id: flux-todo-list
-    title: Flux TodoMVC Tutorial
--- a/docs/_data/nav_tips.yml
+++ b/docs/_data/nav_tips.yml
@@ -1,36 +0,0 @@
- title: Tips
-  items:
-  - id: introduction
-    title: Introduction
-  - id: inline-styles
-    title: Inline Styles
-  - id: if-else-in-JSX
-    title: If-Else in JSX
-  - id: self-closing-tag
-    title: Self-Closing Tag
-  - id: maximum-number-of-jsx-root-nodes
-    title: Maximum Number of JSX Root Nodes
-  - id: style-props-value-px
-    title: Shorthand for Specifying Pixel Values in style props
-  - id: children-props-type
-    title: Type of the Children props
-  - id: controlled-input-null-value
-    title: Value of null for Controlled Input
-  - id: componentWillReceiveProps-not-triggered-after-mounting
-    title: componentWillReceiveProps Not Triggered After Mounting
-  - id: props-in-getInitialState-as-anti-pattern
-    title: Props in getInitialState Is an Anti-Pattern
-  - id: dom-event-listeners
-    title: DOM Event Listeners in a Component
-  - id: initial-ajax
-    title: Load Initial Data via AJAX
-  - id: false-in-jsx
-    title: False in JSX
-  - id: communicate-between-components
-    title: Communicate Between Components
-  - id: expose-component-functions
-    title: Expose Component Functions
-  - id: references-to-components
-    title: References to Components
-  - id: children-undefined
-    title: this.props.children undefined
--- a/docs/_includes/nav_docs.html
+++ b/docs/_includes/nav_docs.html
@@ -1,6 +1,5 @@
 <div class="nav-docs">
-  <!-- Docs Nav -->
-  {% for section in site.data.nav_docs %}
+  {% for section in site.nav_docs_sections %}
    <div class="nav-docs-section">
      <h3>{{ section.title }}</h3>
      <ul>
@@ -25,18 +24,4 @@
      </ul>
    </div>
  {% endfor %}
-
-  <!-- Tips Nav -->
-  {% for section in site.data.nav_tips %}
-    <div class="nav-docs-section">
-      <h3>{{ section.title }}</h3>
-      <ul>
-        {% for item in section.items %}
-          <li>
-            <a href="/react/tips/{{ item.id }}.html"{% if page.id == item.id %} class="active"{% endif %}>{{ item.title }}</a>
-          </li>
-        {% endfor %}
-      </ul>
-    </div>
-  {% endfor %}
 </div>
--- a/docs/_js/es5-sham.min.js
+++ b/docs/_js/es5-sham.min.js
--- a/docs/_js/es5-shim.min.js
+++ b/docs/_js/es5-shim.min.js
--- a/docs/_js/examples/hello.js
+++ b/docs/_js/examples/hello.js
@@ -6,7 +6,7 @@ var HELLO_COMPONENT = "\
 /** @jsx React.DOM */\n\
 var HelloMessage = React.createClass({\n\
  render: function() {\n\
-    return <div>Hello {this.props.name}</div>;\n\
+    return <div>{'Hello ' + this.props.name}</div>;\n\
  }\n\
 });\n\
 \n\
--- a/docs/_js/examples/timer.js
+++ b/docs/_js/examples/timer.js
@@ -3,7 +3,6 @@
 */

 var TIMER_COMPONENT = "\
-/** @jsx React.DOM */\n\
 var Timer = React.createClass({\n\
  getInitialState: function() {\n\
    return {secondsElapsed: 0};\n\
@@ -18,13 +17,13 @@ var Timer = React.createClass({\n\
    clearInterval(this.interval);\n\
  },\n\
  render: function() {\n\
-    return (\n\
-      <div>Seconds Elapsed: {this.state.secondsElapsed}</div>\n\
+    return React.DOM.div({},\n\
+      'Seconds Elapsed: ' + this.state.secondsElapsed\n\
    );\n\
  }\n\
 });\n\
 \n\
-React.renderComponent(<Timer />, mountNode);\
+React.renderComponent(Timer({}), mountNode);\
 ";

 React.renderComponent(
--- a/docs/_js/html-jsx-lib.js
+++ b/docs/_js/html-jsx-lib.js
@@ -1,482 +0,0 @@
-/**
- * Copyright 2013-2014 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * This is a very simple HTML to JSX converter. It turns out that browsers 
- * have good HTML parsers (who would have thought?) so we utilise this by 
- * inserting the HTML into a temporary DOM node, and then do a breadth-first
- * traversal of the resulting DOM tree.
- */
-;(function(global) {
-  'use strict';
-  
-  // https://developer.mozilla.org/en-US/docs/Web/API/Node.nodeType
-  var NODE_TYPE = {
-    ELEMENT: 1,
-    TEXT: 3,
-    COMMENT: 8
-  };
-  var ATTRIBUTE_MAPPING = {
-    'for': 'htmlFor',
-    'class': 'className'
-  };
-
-  /**
-   * Repeats a string a certain number of times.
-   * Also: the future is bright and consists of native string repetition:
-   * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/repeat
-   *
-   * @param {string} string  String to repeat
-   * @param {number} times   Number of times to repeat string. Integer.
-   * @see http://jsperf.com/string-repeater/2 
-   */
-  function repeatString(string, times) {
-    if (times === 1) {
-      return string;
-    }
-    if (times < 0) { throw new Error(); }
-    var repeated = '';
-    while (times) {
-      if (times & 1) {
-        repeated += string;
-      }
-      if (times >>= 1) {
-        string += string;
-      }
-    }
-    return repeated;
-  }
-
-  /**
-   * Determine if the string ends with the specified substring.
-   *
-   * @param {string} haystack String to search in
-   * @param {string} needle   String to search for
-   * @return {boolean}
-   */
-  function endsWith(haystack, needle) {
-    return haystack.slice(-needle.length) === needle;
-  }
-
-  /**
-   * Trim the specified substring off the string. If the string does not end 
-   * with the specified substring, this is a no-op.
-   *
-   * @param {string} haystack String to search in
-   * @param {string} needle   String to search for
-   * @return {string}
-   */
-  function trimEnd(haystack, needle) {
-    return endsWith(haystack, needle)
-      ? haystack.slice(0, -needle.length)
-      : haystack;
-  }
-
-  /**
-   * Convert a hyphenated string to camelCase.
-   */
-  function hyphenToCamelCase(string) {
-    return string.replace(/-(.)/g, function(match, chr) {
-      return chr.toUpperCase();
-    });
-  }
-
-  /**
-   * Determines if the specified string consists entirely of whitespace.
-   */
-  function isEmpty(string) {
-     return !/[^\s]/.test(string);
-  }
-
-  /**
-   * Determines if the specified string consists entirely of numeric characters.
-   */
-  function isNumeric(input) {
-    return input !== undefined 
-      && input !== null 
-      && (typeof input === 'number' || parseInt(input, 10) == input);
-  }
-
-  var HTMLtoJSX = function(config) {
-    this.config = config || {};
-
-    if (this.config.createClass === undefined) {
-      this.config.createClass = true;
-    }
-    if (!this.config.indent) {
-      this.config.indent = '  ';  
-    }
-    if (!this.config.outputClassName) {
-      this.config.outputClassName = 'NewComponent';
-    }
-  };
-  HTMLtoJSX.prototype = {
-    /**
-     * Reset the internal state of the converter
-     */
-    reset: function() {
-      this.output = '';
-      this.level = 0;
-    },
-    /**
-     * Main entry point to the converter. Given the specified HTML, returns a
-     * JSX object representing it.
-     * @param {string} html HTML to convert
-     * @return {string} JSX
-     */
-    convert: function(html) {
-      this.reset();
-
-      // It turns out browsers have good HTML parsers (imagine that). 
-      // Let's take advantage of it.
-      var containerEl = document.createElement('div');
-      containerEl.innerHTML = '\n' + this._cleanInput(html) + '\n';
-
-      if (this.config.createClass) {
-        if (this.config.outputClassName) {
-          this.output = 'var ' + this.config.outputClassName + ' = React.createClass({\n';
-        } else {
-          this.output = 'React.createClass({\n';
-        }
-        this.output += this.config.indent + 'render: function() {' + "\n";
-        this.output += this.config.indent + this.config.indent + 'return (\n';
-      }
-
-      if (this._onlyOneTopLevel(containerEl)) {
-        // Only one top-level element, the component can return it directly
-        // No need to actually visit the container element
-        this._traverse(containerEl);
-      } else {
-        // More than one top-level element, need to wrap the whole thing in a 
-        // container.
-        this.output += this.config.indent + this.config.indent + this.config.indent;
-        this.level++;
-        this._visit(containerEl);
-      }
-      this.output = this.output.trim() + '\n';
-      if (this.config.createClass) {
-        this.output += this.config.indent + this.config.indent + ');\n';
-        this.output += this.config.indent + '}\n';
-        this.output += '});';
-      }
-      return this.output;
-    },
-
-    /**
-     * Cleans up the specified HTML so it's in a format acceptable for 
-     * converting.
-     *
-     * @param {string} html HTML to clean
-     * @return {string} Cleaned HTML
-     */
-    _cleanInput: function(html) {
-      // Remove unnecessary whitespace
-      html = html.trim();
-      // Ugly method to strip script tags. They can wreak havoc on the DOM nodes
-      // so let's not even put them in the DOM.
-      html = html.replace(/<script(.*?)<\/script>/g, '');
-      return html;
-    },
-
-    /**
-     * Determines if there's only one top-level node in the DOM tree. That is,
-     * all the HTML is wrapped by a single HTML tag.
-     *
-     * @param {DOMElement} containerEl Container element
-     * @return {boolean}
-     */
-    _onlyOneTopLevel: function(containerEl) {
-      // Only a single child element
-      if (
-        containerEl.childNodes.length === 1 
-        && containerEl.childNodes[0].nodeType === NODE_TYPE.ELEMENT
-      ) {
-        return true;
-      }
-      // Only one element, and all other children are whitespace
-      var foundElement = false;
-      for (var i = 0, count = containerEl.childNodes.length; i < count; i++) {
-        var child = containerEl.childNodes[i];
-        if (child.nodeType === NODE_TYPE.ELEMENT) {
-          if (foundElement) {
-            // Encountered an element after already encountering another one
-            // Therefore, more than one element at root level
-            return false;
-          } else {
-            foundElement = true;
-          }
-        } else if (child.nodeType === NODE_TYPE.TEXT && !isEmpty(child.textContent)) {
-          // Contains text content
-          return false;
-        }
-      }
-      return true;
-    },
-
-    /**
-     * Gets a newline followed by the correct indentation for the current
-     * nesting level
-     *
-     * @return {string}
-     */
-    _getIndentedNewline: function() {
-      return '\n' + repeatString(this.config.indent, this.level + 2);
-    },
-
-    /**
-     * Handles processing the specified node
-     * 
-     * @param {Node} node
-     */
-    _visit: function(node) {
-      this._beginVisit(node);
-      this._traverse(node);
-      this._endVisit(node);
-    },
-
-    /**
-     * Traverses all the children of the specified node
-     *
-     * @param {Node} node
-     */
-    _traverse: function(node) {
-      this.level++;
-      for (var i = 0, count = node.childNodes.length; i < count; i++) {
-        this._visit(node.childNodes[i]);
-      }
-      this.level--;
-    },
-
-    /**
-     * Handle pre-visit behaviour for the specified node.
-     *
-     * @param {Node} node
-     */
-    _beginVisit: function(node) {
-      switch (node.nodeType) {
-        case NODE_TYPE.ELEMENT:
-          this._beginVisitElement(node);
-          break;
-
-        case NODE_TYPE.TEXT:
-          this._visitText(node);
-          break;
-
-        case NODE_TYPE.COMMENT:
-          this._visitComment(node);
-          break;
-
-        default:
-          console.warn('Unrecognised node type: ' + node.nodeType);
-      }
-    },
-
-    /**
-     * Handles post-visit behaviour for the specified node.
-     *
-     * @param {Node} node
-     */
-    _endVisit: function(node) {
-      switch (node.nodeType) {
-        case NODE_TYPE.ELEMENT:
-          this._endVisitElement(node);
-          break;
-        // No ending tags required for these types
-        case NODE_TYPE.TEXT:
-        case NODE_TYPE.COMMENT:
-          break;
-      }
-    },
-
-    /**
-     * Handles pre-visit behaviour for the specified element node
-     *
-     * @param {DOMElement} node
-     */
-    _beginVisitElement: function(node) {
-      var tagName = node.tagName.toLowerCase();
-      var attributes = [];
-      for (var i = 0, count = node.attributes.length; i < count; i++) {
-        attributes.push(this._getElementAttribute(node, node.attributes[i]));
-      }
-
-      this.output += '<' + tagName;
-      if (attributes.length > 0) {
-        this.output += ' ' + attributes.join(' ');
-      }
-      if (node.firstChild) {
-        this.output += '>';
-      }
-    },
-
-    /**
-     * Handles post-visit behaviour for the specified element node
-     *
-     * @param {Node} node
-     */
-    _endVisitElement: function(node) {
-      // De-indent a bit
-      // TODO: It's inefficient to do it this way :/
-      this.output = trimEnd(this.output, this.config.indent);
-      if (node.firstChild) {
-        this.output += '</' + node.tagName.toLowerCase() + '>';
-      } else {
-        this.output += ' />';
-      }
-    },
-
-    /**
-     * Handles processing of the specified text node
-     *
-     * @param {TextNode} node
-     */
-    _visitText: function(node) {
-      var text = node.textContent;
-      // If there's a newline in the text, adjust the indent level
-      if (text.indexOf('\n') > -1) {
-        text = node.textContent.replace(/\n\s*/g, this._getIndentedNewline());
-      }
-      this.output += text;
-    },
-
-    /**
-     * Handles processing of the specified text node
-     *
-     * @param {Text} node
-     */
-    _visitComment: function(node) {
-      // Do not render the comment
-      // Since we remove comments, we also need to remove the next line break so we
-      // don't end up with extra whitespace after every comment
-      //if (node.nextSibling && node.nextSibling.nodeType === NODE_TYPE.TEXT) {
-      //  node.nextSibling.textContent = node.nextSibling.textContent.replace(/\n\s*/, '');
-      //}
-      this.output += '{/*' + node.textContent.replace('*/', '* /') + '*/}';
-    },
-
-    /**
-     * Gets a JSX formatted version of the specified attribute from the node
-     *
-     * @param {DOMElement} node
-     * @param {object}     attribute
-     * @return {string}
-     */
-    _getElementAttribute: function(node, attribute) {
-      switch (attribute.name) {
-        case 'style':
-          return this._getStyleAttribute(attribute.value);
-        default:
-          var name = ATTRIBUTE_MAPPING[attribute.name] || attribute.name;
-          var result = name + '=';
-          // Numeric values should be output as {123} not "123"
-          if (isNumeric(attribute.value)) {
-            result += '{' + attribute.value + '}';
-          } else {
-            result += '"' + attribute.value.replace('"', '&quot;') + '"';
-          }
-          return result;
-      }
-    },
-
-    /**
-     * Gets a JSX formatted version of the specified element styles
-     *
-     * @param {string} styles
-     * @return {string}
-     */
-    _getStyleAttribute: function(styles) {
-      var jsxStyles = new StyleParser(styles).toJSXString();
-      return 'style={{' + jsxStyles + '}}';
-    }
-  };
-
-  /**
-   * Handles parsing of inline styles
-   * 
-   * @param {string} rawStyle Raw style attribute
-   * @constructor
-   */
-  var StyleParser = function(rawStyle) {
-    this.parse(rawStyle);
-  };
-  StyleParser.prototype = {
-    /**
-     * Parse the specified inline style attribute value
-     * @param {string} rawStyle Raw style attribute
-     */
-    parse: function(rawStyle) {
-      this.styles = {};
-      rawStyle.split(';').forEach(function(style) {
-        style = style.trim();
-        var firstColon = style.indexOf(':');
-        var key = style.substr(0, firstColon);
-        var value = style.substr(firstColon + 1).trim();
-        if (key !== '') {
-          this.styles[key] = value;  
-        }
-      }, this);
-    },
-
-    /**
-     * Convert the style information represented by this parser into a JSX
-     * string
-     *
-     * @return {string}
-     */
-    toJSXString: function() {
-      var output = [];
-      for (var key in this.styles) {
-        if (!this.styles.hasOwnProperty(key)) {
-          continue;
-        }
-        output.push(this.toJSXKey(key) + ': ' + this.toJSXValue(this.styles[key]));
-      }
-      return output.join(', ');
-    },
-
-    /**
-     * Convert the CSS style key to a JSX style key
-     *
-     * @param {string} key CSS style key
-     * @return {string} JSX style key
-     */
-    toJSXKey: function(key) {
-      return hyphenToCamelCase(key);
-    },
-
-    /**
-     * Convert the CSS style value to a JSX style value
-     *
-     * @param {string} value CSS style value
-     * @return {string} JSX style value
-     */
-    toJSXValue: function(value) {
-      if (isNumeric(value)) {
-        // If numeric, no quotes
-        return value;
-      } else if (endsWith(value, 'px')) {
-        // "500px" -> 500
-        return trimEnd(value, 'px');
-      } else {
-        // Proably a string, wrap it in quotes
-        return '\'' + value.replace(/'/g, '"') + '\'';
-      }
-    }
-  };
-
-  // Expose public API
-  global.HTMLtoJSX = HTMLtoJSX;
-}(window));
--- a/docs/_js/html-jsx.js
+++ b/docs/_js/html-jsx.js
@@ -1,91 +0,0 @@
-/**
- * Copyright 2013-2014 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * @jsx React.DOM
- */
-
-/**
- * This is a web interface for the HTML to JSX converter contained in 
- * `html-jsx-lib.js`.
- */
-;(function() {
-
-var HELLO_COMPONENT = "\
-<!-- Hello world -->\n\
-<div class=\"awesome\" style=\"border: 1px solid red\">\n\
-  <label for=\"name\">Enter your name: </label>\n\
-  <input type=\"text\" id=\"name\" />\n\
-</div>\n\
-<p>Enter your HTML here</p>\
-";
-
-  var HTMLtoJSXComponent = React.createClass({
-    getInitialState: function() {
-      return {
-        outputClassName: 'NewComponent',
-        createClass: true
-      };
-    },
-    onReactClassNameChange: function(evt) {
-      this.setState({ outputClassName: evt.target.value });
-    },
-    onCreateClassChange: function(evt) {
-      this.setState({ createClass: evt.target.checked });
-    },
-    setInput: function(input) {
-      this.setState({ input: input });
-      this.convertToJsx();
-    },
-    convertToJSX: function(input) {
-      var converter = new HTMLtoJSX({
-        outputClassName: this.state.outputClassName,
-        createClass: this.state.createClass
-      });
-      return converter.convert(input);
-    },
-  	render: function() {
-      return (
-        <div>
-          <div id="options">
-            <label>
-              <input
-                type="checkbox"
-                checked={this.state.createClass}
-                onChange={this.onCreateClassChange} />
-                Create class
-            </label>
-            <label style={{display: this.state.createClass ? '' : 'none'}}>
-              ·
-              Class name:
-              <input
-                type="text"
-                value={this.state.outputClassName}
-                onChange={this.onReactClassNameChange} />
-            </label>
-          </div>
-          <ReactPlayground
-            codeText={HELLO_COMPONENT}
-            renderCode={true}
-            transformer={this.convertToJSX}
-            showCompiledJSTab={false}
-            editorTabTitle="Live HTML Editor"
-            />
-        </div>
-      );
-    }
-  });
-
-  React.renderComponent(<HTMLtoJSXComponent />, document.getElementById('jsxCompiler'));
-}());
--- a/docs/_js/html5shiv.min.js
+++ b/docs/_js/html5shiv.min.js
@@ -1,8 +0,0 @@
-/*
- HTML5 Shiv v3.6.2 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
-*/
-(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
-c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
-"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video",version:"3.6.2",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment();
-for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
--- a/docs/_js/jsx-compiler.js
+++ b/docs/_js/jsx-compiler.js
@@ -6,45 +6,14 @@ var HELLO_COMPONENT = "\
 /** @jsx React.DOM */\n\
 var HelloMessage = React.createClass({\n\
  render: function() {\n\
-    return <div>Hello {this.props.name}</div>;\n\
+    return <div>{'Hello ' + this.props.name}</div>;\n\
  }\n\
 });\n\
 \n\
 React.renderComponent(<HelloMessage name=\"John\" />, mountNode);\
 ";

-function transformer(harmony, code) {
-  return JSXTransformer.transform(code, {harmony: harmony}).code;
-}
-
-var CompilerPlayground = React.createClass({
-  getInitialState: function() {
-    return {harmony: false};
-  },
-  handleHarmonyChange: function(e) {
-    this.setState({harmony: e.target.checked});
-  },
-  render: function() {
-    return (
-      <div>
-        <ReactPlayground
-          codeText={HELLO_COMPONENT}
-          renderCode={true}
-          transformer={transformer.bind(null, this.state.harmony)}
-          showCompiledJSTab={false}
-        />
-        <label className="compiler-option">
-          <input
-            type="checkbox"
-            onChange={this.handleHarmonyChange}
-            checked={this.state.harmony} />{' '}
-          Enable ES6 transforms (<code>--harmony</code>)
-        </label>
-      </div>
-    );
-  },
-});
 React.renderComponent(
-  <CompilerPlayground />,
+  <ReactPlayground codeText={HELLO_COMPONENT} renderCode={true} />,
  document.getElementById('jsxCompiler')
 );
--- a/docs/_js/live_editor.js
+++ b/docs/_js/live_editor.js
@@ -14,33 +14,25 @@ var IS_MOBILE = (
 );

 var CodeMirrorEditor = React.createClass({
-  componentDidMount: function() {
-    if (IS_MOBILE) return;
-
+  componentDidMount: function(root) {
+    if (IS_MOBILE) {
+      return;
+    }
    this.editor = CodeMirror.fromTextArea(this.refs.editor.getDOMNode(), {
      mode: 'javascript',
      lineNumbers: false,
-      lineWrapping: true,
-      smartIndent: false,  // javascript mode does bad things with jsx indents
      matchBrackets: true,
-      theme: 'solarized-light',
-      readOnly: this.props.readOnly
+      theme: 'solarized-light'
    });
-    this.editor.on('change', this.handleChange);
+    this.editor.on('change', this.onChange);
+    this.onChange();
  },
-
-  componentDidUpdate: function() {
-    if (this.props.readOnly) {
-      this.editor.setValue(this.props.codeText);
+  onChange: function() {
+    if (this.props.onChange) {
+      var content = this.editor.getValue();
+      this.props.onChange(content);
    }
  },
-
-  handleChange: function() {
-    if (!this.props.readOnly) {
-      this.props.onChange && this.props.onChange(this.editor.getValue());
-    }
-  },
-
  render: function() {
    // wrap in a div to fully contain CodeMirror
    var editor;
@@ -52,163 +44,87 @@ var CodeMirrorEditor = React.createClass({
    }

    return (
-      <div style={this.props.style} className={this.props.className}>
+      <div class={this.props.className}>
        {editor}
      </div>
    );
  }
 });

-var selfCleaningTimeout = {
-  componentDidUpdate: function() {
-    clearTimeout(this.timeoutID);
-  },
-
-  setTimeout: function() {
-    clearTimeout(this.timeoutID);
-    this.timeoutID = setTimeout.apply(null, arguments);
-  }
-};
-
 var ReactPlayground = React.createClass({
-  mixins: [selfCleaningTimeout],
-
-  MODES: {JSX: 'JSX', JS: 'JS'}, //keyMirror({JSX: true, JS: true}),
-
-  propTypes: {
-    codeText: React.PropTypes.string.isRequired,
-    transformer: React.PropTypes.func,
-    renderCode: React.PropTypes.bool,
-    showCompiledJSTab: React.PropTypes.bool,
-    editorTabTitle: React.PropTypes.string
-  },
-
-  getDefaultProps: function() {
-    return {
-      transformer: function(code) {
-        return JSXTransformer.transform(code).code;
-      },
-      editorTabTitle: 'Live JSX Editor',
-      showCompiledJSTab: true
-    };
-  },
+  MODES: {XJS: 'XJS', JS: 'JS'}, //keyMirror({XJS: true, JS: true}),

  getInitialState: function() {
-    return {
-      mode: this.MODES.JSX,
-      code: this.props.codeText,
-    };
+    return {mode: this.MODES.XJS, code: this.props.codeText};
  },

-  handleCodeChange: function(value) {
-    this.setState({code: value});
-    this.executeCode();
+  bindState: function(name) {
+    return function(value) {
+      var newState = {};
+      newState[name] = value;
+      this.setState(newState);
+    }.bind(this);
  },

-  handleCodeModeSwitch: function(mode) {
-    this.setState({mode: mode});
-  },
-
-  compileCode: function() {
-    return this.props.transformer(this.state.code);
+  getDesugaredCode: function() {
+    return JSXTransformer.transform(this.state.code).code;
  },

  render: function() {
-    var isJS = this.state.mode === this.MODES.JS;
-    var compiledCode = '';
-    try {
-      compiledCode = this.compileCode();
-    } catch (err) {}
-
-    var JSContent =
-      <CodeMirrorEditor
-        key="js"
-        className="playgroundStage CodeMirror-readonly"
-        onChange={this.handleCodeChange}
-        codeText={compiledCode}
-        readOnly={true}
-      />;
-
-    var JSXContent =
-      <CodeMirrorEditor
-        key="jsx"
-        onChange={this.handleCodeChange}
-        className="playgroundStage"
-        codeText={this.state.code}
-      />;
-
-    var JSXTabClassName =
-      'playground-tab' + (isJS ? '' : ' playground-tab-active');
-    var JSTabClassName =
-      'playground-tab' + (isJS ? ' playground-tab-active' : '');
-
-    var JSTab =
-      <div
-        className={JSTabClassName}
-        onClick={this.handleCodeModeSwitch.bind(this, this.MODES.JS)}>
-          Compiled JS
-      </div>;
-
-    var JSXTab =
-      <div
-        className={JSXTabClassName}
-        onClick={this.handleCodeModeSwitch.bind(this, this.MODES.JSX)}>
-          {this.props.editorTabTitle}
-      </div>
+    var content;
+    if (this.state.mode === this.MODES.XJS) {
+      content =
+        <CodeMirrorEditor
+          onChange={this.bindState('code')}
+          class="playgroundStage"
+          codeText={this.state.code}
+        />;
+    } else if (this.state.mode === this.MODES.JS) {
+      content =
+        <div class="playgroundJS playgroundStage">
+            {this.getDesugaredCode()}
+        </div>;
+    }

    return (
-      <div className="playground">
-        <div>
-          {JSXTab}
-          {this.props.showCompiledJSTab && JSTab}
+      <div class="playground">
+        <div class="playgroundCode">
+          {content}
        </div>
-        <div className="playgroundCode">
-          {isJS ? JSContent : JSXContent}
-        </div>
-        <div className="playgroundPreview">
+        <div class="playgroundPreview">
          <div ref="mount" />
        </div>
      </div>
    );
  },
-
  componentDidMount: function() {
    this.executeCode();
  },
-
-  componentDidUpdate: function(prevProps, prevState) {
-    // execute code only when the state's not being updated by switching tab
-    // this avoids re-displaying the error, which comes after a certain delay
-    if (this.props.transformer !== prevProps.transformer ||
-        this.state.code !== prevState.code) {
-      this.executeCode();
-    }
+  componentDidUpdate: function() {
+    this.executeCode();
  },
-
  executeCode: function() {
    var mountNode = this.refs.mount.getDOMNode();

    try {
-      React.unmountComponentAtNode(mountNode);
+      React.unmountAndReleaseReactRootNode(mountNode);
    } catch (e) { }

    try {
-      var compiledCode = this.compileCode();
      if (this.props.renderCode) {
        React.renderComponent(
-          <CodeMirrorEditor codeText={compiledCode} readOnly={true} />,
+          <pre>{this.getDesugaredCode()}</pre>,
          mountNode
        );
      } else {
-        eval(compiledCode);
+        eval(this.getDesugaredCode());
      }
-    } catch (err) {
-      this.setTimeout(function() {
-        React.renderComponent(
-          <div className="playgroundError">{err.toString()}</div>,
-          mountNode
-        );
-      }, 500);
+    } catch (e) {
+      React.renderComponent(
+        <div content={e.toString()} class="playgroundError" />,
+        mountNode
+      );
    }
  }
 });
+
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -1,36 +1,30 @@
 <!DOCTYPE html>
-<!--[if IE]><![endif]-->
 <html>
 <head>
  <meta charset="utf-8">
  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <title>{{ page.title }} | React</title>
+  <title>React | {{ page.title }}</title>
  <meta name="viewport" content="width=device-width">
-  <meta property="og:title" content="{{ page.title }} | React">
-  <meta property="og:type" content="website">
-  <meta property="og:url" content="http://facebook.github.io/react{{ page.url }}">
-  <meta property="og:image" content="http://facebook.github.io/react/img/logo_og.png">
-  <meta property="og:description" content="A JavaScript library for building user interfaces">
-  <meta property="fb:app_id" content="623268441017527">
+  <meta property="og:title" content="React | {{ page.title }}" />
+  <meta property="og:type" content="website" />
+  <meta property="og:url" content="http://facebook.github.io/react{{ page.url }}" />
+  <meta property="og:image" content="http://facebook.github.io/react/img/logo_og.png" />
+  <meta property="og:description" content="A JavaScript library for building user interfaces" />
+  <meta property="fb:app_id" content="623268441017527" />

  <link rel="shortcut icon" href="/react/favicon.ico">
  <link rel="alternate" type="application/rss+xml" title="{{ site.name }}" href="{{ site.url }}{{ site.baseurl }}/feed.xml">

+  <link rel="stylesheet" href="/react/css/react.css">
  <link rel="stylesheet" href="/react/css/syntax.css">
  <link rel="stylesheet" href="/react/css/codemirror.css">
-  <link rel="stylesheet" href="/react/css/react.css">

  <script type="text/javascript" src="//use.typekit.net/vqa1hcx.js"></script>
  <script type="text/javascript">try{Typekit.load();}catch(e){}</script>

-  <!--[if lte IE 8]>
-  <script type="text/javascript" src="/react/js/html5shiv.min.js"></script>
-  <script type="text/javascript" src="/react/js/es5-shim.min.js"></script>
-  <script type="text/javascript" src="/react/js/es5-sham.min.js"></script>
-  <![endif]-->
  <script type="text/javascript" src="/react/js/codemirror.js"></script>
  <script type="text/javascript" src="/react/js/javascript.js"></script>
-  <script type="text/javascript" src="/react/js/react.js"></script>
+  <script type="text/javascript" src="/react/js/react.min.js"></script>
  <script type="text/javascript" src="/react/js/JSXTransformer.js"></script>
  <script type="text/javascript" src="/react/js/live_editor.js"></script>
  <script type="text/javascript" src="/react/js/showdown.js"></script>
@@ -42,16 +36,17 @@
    <div class="nav-main">
      <div class="wrap">
        <a class="nav-home" href="/react/index.html">
-          <img class="nav-logo" src="/react/img/logo.svg" width="36" height="36">
+          <img class="nav-logo" alt="" src="/react/img/logo_small.png" width="38" height="38">
          React
        </a>
        <ul class="nav-site">
-          <li><a href="/react/docs/getting-started.html"{% if page.sectionid == 'docs' or page.sectionid == 'tips' %} class="active"{% endif %}>docs</a></li>
+          <li><a href="/react/docs/getting-started.html"{% if page.sectionid == 'docs' %} class="active"{% endif %}>docs</a></li>
          <li><a href="/react/support.html"{% if page.id == 'support' %} class="active"{% endif %}>support</a></li>
          <li><a href="/react/downloads.html"{% if page.id == 'downloads' %} class="active"{% endif %}>download</a></li>
          <li><a href="/react/blog/"{% if page.sectionid == 'blog' %} class="active"{% endif %}>blog</a></li>
          <li><a href="http://github.com/facebook/react">github</a>
        </ul>
+        <!-- <iframe src="http://ghbtns.com/github&#45;btn.html?user=facebook&#38;repo=react.js&#38;type=fork"allowtransparency="true" frameborder="0" scrolling="0" width="62" height="20"></iframe> -->
      </div>
    </div>

@@ -74,15 +69,11 @@
    {{ content }}

    <footer class="wrap">
-      <div class="left">
-        A Facebook &amp; Instagram collaboration.<br>
-        <a href="/react/acknowledgements.html">Acknowledgements</a>
-      </div>
-      <div class="right">&copy; 2014 Facebook Inc.</div>
+      <div class="left">A Facebook &amp; Instagram collaboration.</div>
+      <div class="right">&copy; 2013 Facebook Inc.</div>
    </footer>
  </div>
  <div id="fb-root"></div>
-
  <script>
    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
--- a/docs/_layouts/docs.html
+++ b/docs/_layouts/docs.html
@@ -7,12 +7,8 @@ sectionid: docs
  {% include nav_docs.html %}

  <div class="inner-content">
-    <h1>
-      {{ page.title }}
-      <a class="edit-page-link" href="https://github.com/facebook/react/tree/master/docs/{{ page.path }}" target="_blank">Edit on GitHub</a>
-    </h1>
+    <h1>{{ page.title }}</h1>
    <div class="subHeader">{{ page.description }}</div>
-
    {{ content }}

    <div class="docs-prevnext">
@@ -23,5 +19,7 @@ sectionid: docs
        <a class="docs-next" href="/react/docs/{{ page.next }}">Next &rarr;</a>
      {% endif %}
    </div>
+
+    <div class="fb-comments" data-width="650" data-num-posts="10" data-href="{{ site.url }}{{ site.baseurl }}{{ page.url }}"></div>
  </div>
 </section>
--- a/docs/_layouts/post.html
+++ b/docs/_layouts/post.html
@@ -16,5 +16,6 @@ sectionid: blog
    </div>

    <div class="fb-like" data-send="true" data-width="650" data-show-faces="false"></div>
+    <div class="fb-comments" data-width="650" data-num-posts="10" data-href="{{ site.url }}{{ site.baseurl }}{{ page.url }}"></div>
  </div>
 </section>
--- a/docs/_layouts/redirect.html
+++ b/docs/_layouts/redirect.html
@@ -0,0 +1,6 @@
+<html>
+<head>
+  <meta http-equiv="refresh" content="0; {{ page.destination }}">
+</head>
+<body></body>
+</html>
--- a/docs/_layouts/tips.html
+++ b/docs/_layouts/tips.html
@@ -1,23 +0,0 @@
---
-layout: default
-sectionid: tips
---
-
-<section class="content wrap documentationContent">
-  {% include nav_docs.html %}
-
-  <div class="inner-content">
-    <h1>{{ page.title }}</h1>
-    <div class="subHeader">{{ page.description }}</div>
-    {{ content }}
-
-    <div class="docs-prevnext">
-      {% if page.prev %}
-        <a class="docs-prev" href="/react/tips/{{ page.prev }}">&larr; Prev</a>
-      {% endif %}
-      {% if page.next %}
-        <a class="docs-next" href="/react/tips/{{ page.next }}">Next &rarr;</a>
-      {% endif %}
-    </div>
-  </div>
-</section>
--- a/docs/_plugins/header_links.rb
+++ b/docs/_plugins/header_links.rb
@@ -11,7 +11,7 @@ class Redcarpet::Render::HTML
      .gsub(/\s+/, "-")
      .gsub(/[^A-Za-z0-9\-_.]/, "")

-    return "<h#{level}><a class=\"anchor\" name=\"#{clean_title}\"></a>#{title} <a class=\"hash-link\" href=\"##{clean_title}\">#</a></h#{level}>"
+    return "<h#{level} id=\"#{clean_title}\">#{title}</h#{level}>"
  end
 end

--- a/docs/_posts/2013-06-02-jsfiddle-integration.md
+++ b/docs/_posts/2013-06-02-jsfiddle-integration.md
@@ -1,5 +1,6 @@
 ---
 title: JSFiddle Integration
+layout: post
 author: Christopher Chedeau
 ---

--- a/docs/_posts/2013-06-05-why-react.md
+++ b/docs/_posts/2013-06-05-why-react.md
@@ -1,5 +1,6 @@
 ---
 title: Why did we build React?
+layout: post
 author: Pete Hunt
 ---

@@ -30,8 +31,8 @@ to render views, which we see as an advantage over templates for a few reasons:
  **no manual string concatenation** and therefore less surface area for XSS
  vulnerabilities.

-We've also created [JSX](/react/docs/jsx-in-depth.html), an optional syntax
-extension, in case you prefer the readability of HTML to raw JavaScript.
+We've also created [JSX](http://facebook.github.io/react/docs/syntax.html), an optional
+syntax extension, in case you prefer the readability of HTML to raw JavaScript.

 ## Reactive updates are dead simple.

@@ -40,7 +41,7 @@ React really shines when your data changes over time.
 In a traditional JavaScript application, you need to look at what data changed
 and imperatively make changes to the DOM to keep it up-to-date. Even AngularJS,
 which provides a declarative interface via directives and data binding [requires
-a linking function to manually update DOM nodes](http://code.angularjs.org/1.0.8/docs/guide/directive#reasonsbehindthecompilelinkseparation).
+a linking function to manually update DOM nodes](http://docs.angularjs.org/guide/directive#reasonsbehindthecompilelinkseparation).

 React takes a different approach.

@@ -74,15 +75,17 @@ some pretty cool things with it:
 - We've built internal prototypes that run React apps in a web worker and use
  React to drive **native iOS views** via an Objective-C bridge.
 - You can run React
-  [on the server](http://github.com/petehunt/react-server-rendering-example)
+  [on the server](http://github.com/petehunt/react-server-rendering)
  for SEO, performance, code sharing and overall flexibility.
 - Events behave in a consistent, standards-compliant way in all browsers
  (including IE8) and automatically use
  [event delegation](http://davidwalsh.name/event-delegate).

-Head on over to [facebook.github.io/react](/react) to check out what we have
-built. Our documentation is geared towards building apps with the framework,
-but if you are interested in the nuts and bolts
-[get in touch](/react/support.html) with us!
+Head on over to
+[facebook.github.io/react](http://facebook.github.io/react) to check
+out what we have built. Our documentation is geared towards building
+apps with the framework, but if you are interested in the
+nuts and bolts
+[get in touch](http://facebook.github.io/react/support.html) with us!

 Thanks for reading!
--- a/docs/_posts/2013-06-12-community-roundup.md
+++ b/docs/_posts/2013-06-12-community-roundup.md
@@ -1,5 +1,6 @@
 ---
 title: "Community Round-up #1"
+layout: post
 author: Vjeux
 ---

--- a/docs/_posts/2013-06-19-community-roundup-2.md
+++ b/docs/_posts/2013-06-19-community-roundup-2.md
@@ -1,5 +1,6 @@
 ---
 title: "Community Round-up #2"
+layout: post
 author: Vjeux
 ---

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Paul O’Shannessy	283f4a8b04	0.4.2	2013-12-17 22:00:17 -08:00
Thomas Aylott	393a889aac	fixes ReactTextComponent rootID unescapedness	2013-12-17 18:29:50 -08:00
Ben Alpert	3e455a4397	Tweak verbiage about required polyfills I found it weird how the es5-shim comment came after the list of functions; now it's before.	2013-10-08 16:33:35 -07:00
Connor McSheffrey	91b2ac57d4	fixed broken link on Community Round-up #9 blog post closes #409	2013-10-08 11:11:23 -07:00
Vjeux	c8996773ae	Community round-up #9 http://fooo.fr:4000/react/blog/2013/10/03/community-roundup-9.html	2013-10-03 15:19:56 -07:00
Vjeux	a2a7536f38	Add app id for comments moderation This way we can be notified when any new comment appear in the docs/blog and add moderators	2013-10-03 15:19:56 -07:00
Paul O’Shannessy	ce478822e8	Fix 404s to non-existent API docs	2013-09-24 16:02:37 -07:00
Paul O’Shannessy	b88f97f9be	Redirect docs/reference.html	2013-09-24 15:53:30 -07:00
Ben Alpert	ddbf91afd1	Flesh out reference documentation, more API info	2013-09-24 15:14:47 -07:00
Vjeux	ae95674173	Community round-up #8	2013-09-24 14:27:24 -07:00
Paul O’Shannessy	9e11fb626e	Docs: Give headers ids for easy linking This gives markdown headers an id so that we can link directly to sections of our docs. This is better than the alternative of adding them all ourselves.	2013-09-24 14:27:24 -07:00
Keito Uchiyama	ec746d3a1b	Fix typo in doc	2013-09-24 14:27:24 -07:00
Keito Uchiyama	91976ea8b4	Fix use of "it's" in docs	2013-09-24 14:27:24 -07:00
Paul O’Shannessy	9040c5f3a8	Don't update the docs version by default This was leading to a lot of unnecessary churn in the config file since different YAML versions were serializing differently.	2013-09-24 14:27:23 -07:00
yungsters	08d72df56b	Add link to third-party `JavaScript (JSX).tmLanguage` in docs.	2013-09-24 14:27:23 -07:00
Paul O’Shannessy	d6edc1189a	Update wording	2013-09-14 13:49:32 +02:00
Paul O’Shannessy	6f532a839f	Update wording	2013-09-04 15:31:55 -07:00
Cheng Lou	34589c0e0d	Add Stack Overflow link for doc support page.	2013-09-04 15:31:55 -07:00
Vjeux	d91b238015	Add pagination to blog - Add pagination - Display full content in /blog - Truncate Recent posts - Add permalink that lists all the blog posts - Add spacing and bullet around recent posts to make it more readable	2013-09-04 15:31:55 -07:00
Brian Rue	db904c2597	Tutorial: show how to add showdown.js	2013-09-04 15:31:55 -07:00
Paul O’Shannessy	c12929700a	Redirect /docs to the right page I've hit this a few times where I want to get to docs so I take whatever my urlbar gives me and strip out the actual page so I can get to the root, however that's a 404. This introduces a super easy way to redirect, which could be handy in the future as docs get rewritten. I would much rather do this with a real htaccess file or even just handle 404s gracefully, but that's not currently an option with GitHub pages (since we generate our own and don't use a custom domain).	2013-09-04 15:31:55 -07:00
Paul O’Shannessy	30a11d2d7e	[docs] Small tweaks as reported in comments * highlight `</form>` * use correct id in `getElementById` call	2013-09-04 15:31:55 -07:00
Paul O’Shannessy	a5115a2489	Fix capitalization of Tooling Integration page	2013-08-26 14:55:16 -07:00
Vjeux	8b1990caa7	Update the tooling page to include pyReact, react-rails and react-page	2013-08-26 14:55:10 -07:00
Vjeux	007d8b4f79	Community round-up #7 http://fooo.fr:4000/react/blog/2013/08/26/community-roundup-7.html	2013-08-26 14:55:01 -07:00
Paul O’Shannessy	e6b5013a8b	[react-tools] Add src/ to files This is so it's possible to use the original @providesModule source files in a toolchain that understands those.	2013-08-22 23:07:41 -07:00
Clay Allsopp	e4fa9ca9ee	Add CDNJS to docs. Fixes #244 (cherry picked from commit `3d1cc16a9b`)	2013-08-22 11:11:53 -07:00
Paul O’Shannessy	176ef3521c	Docs: fix header (cherry picked from commit `cbe86e04b3`)	2013-08-22 11:11:53 -07:00
Paul O’Shannessy	58635eea36	Use script to find remaining 404s. Fix them. (cherry picked from commit `a558e560bd`)	2013-08-22 11:11:53 -07:00
Clay Allsopp	f8737dc8fe	Fix broken tutorial link and change wording (cherry picked from commit `cfe4152b1d`)	2013-08-22 11:11:53 -07:00
Kunal Mehta	01297cf212	Added PyReact blog post.	2013-08-19 14:52:03 -07:00
Stoyan	89437e6a97	typo fix	2013-08-19 14:51:48 -07:00
Vjeux	ed755945a3	Community Round-up #6	2013-08-05 16:57:24 -07:00
Christopher Chedeau	018e08cdd8	Fix 404 in Getting Started	2013-08-05 09:30:35 -07:00
Peter Cottle	949c69fd56	Fix Github links in examples Looks like we link to github.com/facebook/react/ instead of react-js. This just fixes the links `grep -r "facebook/react.js" .` comes up clean now	2013-08-05 09:30:35 -07:00
Paul O’Shannessy	a244928353	react-rails blog post (cherry picked from commit `dc06704ec7`)	2013-07-30 15:26:56 -07:00
Paul O’Shannessy	c034435052	Updated Readme for 0.4.1 (cherry picked from commit `c347b720a9`)	2013-07-30 15:26:56 -07:00
Paul O’Shannessy	8795a78ca0	Blog post for v0.4.1 (cherry picked from commit `27a1729f6d`)	2013-07-30 15:26:56 -07:00
Paul O’Shannessy	123d091cc0	Updated Changelog for 0.4.1 (cherry picked from commit `a1f5c1dee7`)	2013-07-30 15:26:56 -07:00
Hugo Jobling	764ca84e02	remove dead link the event handling doc page no longer exists (cherry picked from commit `4ab62a6bd2`)	2013-07-30 14:55:58 -07:00
Hugo Jobling	3d78d30f49	put closing paren in correct place (cherry picked from commit `07427ae9d0`)	2013-07-30 14:55:58 -07:00
Hugo Jobling	fae1c48470	update dead jsx link to point to an extant page syntax.html no longer exists, so point people at the in depth article instead. (cherry picked from commit `8f55d94d40`)	2013-07-30 14:55:58 -07:00
Daniel Gasienica	9801937715	Fix incorrect port of standard Python server /ht @zpao (cherry picked from commit `6f2848f4a6`)	2013-07-30 14:55:58 -07:00
Paul O’Shannessy	0cac12d375	v0.4.1	2013-07-26 15:33:52 -07:00
Paul O’Shannessy	1e2d37f7e8	Send branch info from travis for continuous builds (cherry picked from commit `20179b7991`)	2013-07-26 15:00:39 -07:00
Paul O’Shannessy	38bce710ac	Merge master to 0.4-stable	2013-07-26 14:43:36 -07:00
Jakub Malinowski	374c3b8a29	Do not export load in JSXTransformer unless in a browser environment (cherry picked from commit `795a84d60f`)	2013-07-24 14:22:29 -07:00
Jakub Malinowski	c362c16e1e	Allow to execute JSXTransformer outside of browser environment (cherry picked from commit `2b9dd04f4d`)	2013-07-24 14:22:29 -07:00
Vjeux	fa5da5c848	Community Round-up #5 http://fooo.fr:4000/react/blog/2013/07/20/community-roundup-5.html (cherry picked from commit `975b5d978f`)	2013-07-23 09:28:52 -07:00
Jamie Wong	734ee22a0c	s/pased/passed (cherry picked from commit `50a00662cf`)	2013-07-23 09:28:36 -07:00
Cheng Lou	84dbb9bcd1	fix typos (cherry picked from commit `64d72f8c4b`)	2013-07-23 09:28:36 -07:00
Ben Alpert	8ed80cae94	One-character typo fix (cherry picked from commit `222faf4544`)	2013-07-23 09:28:36 -07:00
Jamie Wong	8b995ceb6a	Docs Typo Fix: s/distinciton/distinction (cherry picked from commit `bf275a9097`)	2013-07-23 09:28:36 -07:00
Paul O’Shannessy	2e3594c8bc	Merge branch 'master' into 0.4-stable No need to cherry-pick yet since we've only taken docs changes on master	2013-07-17 13:34:08 -07:00
Paul O’Shannessy	b2b9c690f8	Update readme for 0.4.0 (cherry picked from commit `ec67076090`)	2013-07-17 11:53:07 -07:00
Paul O’Shannessy	7a760a5135	Typo in changelog, update blog leading sentence. (cherry picked from commit `9221b15bff`)	2013-07-17 11:53:07 -07:00