Merge pull request #25 from m5o/2.0.4-wip

update to bootstrap v2.0.4

Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     rake (0.9.2)
     rb-fsevent (0.4.3.1)
-    sass (3.1.10)
+    sass (3.1.19)
 
 PLATFORMS
   ruby

README.md

@@ -1,31 +1,41 @@
-TWITTER BOOTSTRAP
+[Twitter Bootstrap](http://twitter.github.com/bootstrap) [![Build Status](https://secure.travis-ci.org/twitter/bootstrap.png)](http://travis-ci.org/twitter/bootstrap)
 =================
 
-Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more.
+Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
 
-To get started -- checkout http://twitter.github.com/bootstrap!
+To get started, checkout http://twitter.github.com/bootstrap!
 
 
-Usage
------
+
+Quick start
+-----------
+
+Clone the repo, `git clone git@github.com:twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).
+
+
+
+SASS: Usage
+-----------
 
 You can use the SASS Twitter Bootstrap by dropping the compiled CSS into any new project and start cranking.
 
 Because SASS always outputs standard css, just link to the final output like normal:
 
-    <link rel="stylesheet" type="text/css" href="bootstrap-2.0.3.css">
+`<link rel="stylesheet" type="text/css" href="bootstrap-2.0.4.css">`
 
 For more info, refer to the docs!
 
 
-Basic modification
-------------------
+
+SASS: Basic modification
+------------------------
 
 You can learn more about SASS at:
 
-    http://sass-lang.com
+[sass-lang.com](http://sass-lang.com)
+
+SASS runs as a local GEM on your system. You can run `sass --watch lib/bootstrap.scss:bootstrap-2.0.4.css`
 
-SASS runs as a local GEM on your system. You can run "sass --watch lib/bootstrap.scss:bootstrap-2.0.3.css"
 
 
 Versioning
@@ -39,21 +49,23 @@ Releases will be numbered with the follow format:
 
 And constructed with the following guidelines:
 
-* Breaking backward compatibility bumps the major
-* New additions without breaking backward compatibility bumps the minor
-* Bug fixes and misc changes bump the patch
+* Breaking backward compatibility bumps the major (and resets the minor and patch)
+* New additions without breaking backward compatibility bumps the minor (and resets the patch)
+* Bug fixes and misc changes bumps the patch
 
 For more information on SemVer, please visit http://semver.org/.
 
 
+
 Bug tracker
 -----------
 
-Have a bug? Please create an issue here on GitHub!
+Have a bug? Please create an issue here on GitHub! Also, when filing please make sure you're familiar with [necolas's guidelines](https://github.com/necolas/issue-guidelines). thanks! <3
 
 https://github.com/twitter/bootstrap/issues
 
 
+
 Twitter account
 ---------------
 
@@ -78,6 +90,7 @@ twitter-bootstrap@googlegroups.com
 http://groups.google.com/group/twitter-bootstrap
 
 
+
 IRC
 ---
 
@@ -86,8 +99,9 @@ Server: irc.freenode.net
 Channel: ##twitter-bootstrap (the double ## is not a typo)
 
 
-SASS Developers
----------------
+
+SASS: Developers
+----------------
 
 We have included a Rakefile with convenience methods for working with the SASS Bootstrap library.
 
@@ -99,6 +113,7 @@ The lessc compiler is required for this command to run.
 This is a convenience method for watching your Sass files and automatically building them whenever you save.
 
 
+
 Developers
 ----------
 
@@ -121,6 +136,12 @@ Runs jshint and qunit tests headlessly in phantom js (used for ci). Depends on h
 This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
 
 
+Contributing
+------------
+
+Please make all pull requests against wip-* branches. Also, if your unit test contains javascript patches or features - you must include relevant unit tests. Thanks!
+
+
 Authors
 -------
 
@@ -135,6 +156,7 @@ Authors
 + http://github.com/fat
 
 
+
 Sass Conversion
 ---------------
 
@@ -158,6 +180,25 @@ The Twitter Bootstrap was lovingly converted to Sass by:
 And [others](https://github.com/jlong/sass-twitter-bootstrap/contributors)
 
 
+
+Sass Conversion Quick Tips
+--------------------------
+
+* replace @ with $
+* replace . with @include for mixins
+* replace `spin` with `adjust-hue`
+* add !default to variable definitions
+* replace #gradient > .vertical with @include gradient-vertical
+* replace #grid > .style with @include grid-style
+* use grid-core and grid-fluid mixins instead of #grid > .core and #grid > .fluid
+* use font-shorthand instead of #font > .shorthand
+* replace fadein with fade-in
+* move @import for reset below mixins, because it uses tab-focus mixin in bootstrap.scss
+* explicitly provide .clearfix, .hide-text and .input-block-level for compatibility with LESS output
+* pass grid-* mixin arguments to generators, because otherwise the generator mixins will use the default variables pull transition definition into variable
+
+
+
 Copyright and license
 ---------------------
 

Rakefile

@@ -9,7 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'rake'
 
-VERSION = "2.0.3"
+VERSION = "2.0.4"
 BOOTSTRAP_CSS = "bootstrap-#{VERSION}.css"
 BOOTSTRAP_MIN_CSS = "bootstrap-#{VERSION}.min.css"
 BOOTSTRAP_RESPONSIVE_CSS = "bootstrap-responsive-#{VERSION}.css"