Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less

Makefile

@@ -1,3 +1,4 @@
+VERSION=1.2.0
 DATE=$(shell DATE)
 BOOTSTRAP = ./bootstrap.css
 BOOTSTRAP_MIN = ./bootstrap.min.css
@@ -7,10 +8,10 @@ WATCHR ?= `which watchr`
 
 build:
 	@@if test ! -z ${LESS_COMPESSOR}; then \
-		sed 's/@DATE/'"${DATE}"'/' ${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp && \
-		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP} && \
-		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress && \
-		rm -f ${BOOTSTRAP_LESS}.tmp && \
+		sed -e 's/@VERSION/'"v${VERSION}"'/' -e 's/@DATE/'"${DATE}"'/' <${BOOTSTRAP_LESS} >${BOOTSTRAP_LESS}.tmp; \
+		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP}; \
+		lessc ${BOOTSTRAP_LESS}.tmp > ${BOOTSTRAP_MIN} --compress; \
+		rm -f ${BOOTSTRAP_LESS}.tmp; \
 		echo "Bootstrap successfully built! - `date`"; \
 	else \
 		echo "You must have the LESS compiler installed in order to build Bootstrap."; \

README.md

@@ -13,12 +13,16 @@ You can use Twitter Bootstrap in one of two ways: just drop the compiled CSS int
 
 Here's what the LESS version looks like:
 
-    <link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
-    <script src="less.js" type="text/javascript"></script>
+``` html
+<link rel="stylesheet/less" type="text/css" href="lib/bootstrap.less">
+<script src="less.js" type="text/javascript"></script>
+```
 
 Or if you prefer, the standard css way:
 
+``` html
     <link rel="stylesheet" type="text/css" href="bootstrap.css">
+```
 
 For more info, refer to the docs!
 
@@ -41,15 +45,21 @@ And constructed with the following guidelines:
 For more information on SemVer, please visit http://semver.org/.
 
 
-Bug Tracker
+Bug tracker
 -----------
 
 Have a bug? Please create an issue here on GitHub!
 
 https://github.com/twitter/bootstrap/issues
 
 
-Mailing List
+Twitter account
+---------------
+
+Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>.
+
+
+Mailing list
 ------------
 
 Have a question? Ask on our mailing list!
@@ -73,7 +83,7 @@ This is a convenience method for watching your less files and automatically buil
 Watchr is required for this command to run.
 
 
-AUTHORS
+Authors
 -------
 
 **Mark Otto**
@@ -87,7 +97,7 @@ AUTHORS
 + http://github.com/fat
 
 
-Copyright and License
+Copyright and license
 ---------------------
 
 Copyright 2011 Twitter, Inc.
@@ -102,4 +112,4 @@ 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.
+limitations under the License.

bootstrap.css

@@ -6,7 +6,11 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
+<<<<<<< HEAD:bootstrap.css
  * Date: Fri Sep 16 10:51:22 PDT 2011
+=======
+ * Date: Mon Sep 12 09:25:40 PDT 2011
+>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -266,7 +270,11 @@ a:hover {
 .row:after {
   clear: both;
 }
+<<<<<<< HEAD:bootstrap.css
 [class*="span"] {
+=======
+.row [class*="span"] {
+>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
   display: inline;
   float: left;
   margin-left: 20px;
@@ -391,6 +399,54 @@ a:hover {
 .offset-two-thirds {
   margin-left: 660px;
 }
+<<<<<<< HEAD:bootstrap.css
+=======
+html, body {
+  background-color: #fff;
+}
+body {
+  margin: 0;
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  font-size: 13px;
+  font-weight: normal;
+  line-height: 18px;
+  color: #808080;
+}
+.container {
+  width: 940px;
+  margin: 0 auto;
+}
+.container-fluid {
+  padding: 0 20px;
+  zoom: 1;
+}
+.container-fluid:before, .container-fluid:after {
+  display: table;
+  content: "";
+}
+.container-fluid:after {
+  clear: both;
+}
+.container-fluid > .sidebar {
+  float: left;
+  width: 220px;
+}
+.container-fluid > .content {
+  min-width: 700px;
+  max-width: 1180px;
+  margin-left: 240px;
+}
+a {
+  color: #0069d6;
+  text-decoration: none;
+  line-height: inherit;
+  font-weight: inherit;
+}
+a:hover {
+  color: #0050a3;
+  text-decoration: underline;
+}
+>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
 /* Typography.less
  * Headings, body text, lists, code, and more for a versatile and durable typography system
  * ---------------------------------------------------------------------------------------- */

lib/bootstrap.less

@@ -1,5 +1,5 @@
 /*!
- * Bootstrap v1.3.0
+ * Bootstrap @VERSION
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0

lib/scaffolding.less

@@ -134,4 +134,4 @@ a {
 .span-one-third     { width: 300px; }
 .span-two-thirds    { width: 620px; }
 .offset-one-third   { margin-left: 340px; }
-.offset-two-thirds  { margin-left: 660px; }
+.offset-two-thirds  { margin-left: 660px; }