Permalink
Browse files

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

Conflicts:
	README.md
	bootstrap-1.2.0.css
  • Loading branch information...
2 parents 4fb1c5b + 44b18f4 commit 90d174a34d0c1c0da590fa8f21b1852e358ba0f9 @fat fat committed Aug 31, 2011
Showing with 10 additions and 10 deletions.
  1. +1 −1 README.md
  2. +1 −1 bootstrap-1.2.0.css
  3. +7 −7 docs/index.html
  4. +1 −1 lib/scaffolding.less
View
@@ -35,7 +35,7 @@ Releases will be numbered with the follow format:
And constructed with the following guidelines:
* Breaking backwards compatibility bumps the major
-* New additions without breaking backwards compatibility bumpbs the minor
+* New additions without breaking backwards compatibility bumps the minor
* Bug fixes and misc changes bump the patch
For more information on SemVer, please visit http://semver.org/.
View
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Tue Aug 30 23:30:34 PDT 2011
+ * Date: Tue Aug 30 23:37:26 PDT 2011
*/
/* 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).
View
@@ -656,9 +656,9 @@
</div>
</div><!-- /clearfix -->
<div class="clearfix error">
- <label for="xlInput">X-Large Input</label>
+ <label for="xlInput2">X-Large Input</label>
<div class="input">
- <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+ <input class="xlarge error" id="xlInput2" name="xlInput2" size="30" type="text" />
<span class="help-inline">Small snippet of help text</span>
</div>
</div><!-- /clearfix -->
@@ -693,7 +693,7 @@
</div>
</div><!-- /clearfix -->
<div class="clearfix">
- <label for="xlInput">File Input</label>
+ <label for="fileInput">File Input</label>
<div class="input">
<input class="input-file" id="fileInput" name="fileInput" type="file" />
</div>
@@ -796,9 +796,9 @@
<fieldset>
<legend>Example form legend</legend>
<div class="clearfix">
- <label for="xlInput">X-Large Input</label>
+ <label for="xlInput3">X-Large Input</label>
<div class="input">
- <input class="xlarge" id="xlInput" name="xlInput" size="30" type="text" />
+ <input class="xlarge" id="xlInput3" name="xlInput3" size="30" type="text" />
</div>
</div><!-- /clearfix -->
<div class="clearfix">
@@ -817,9 +817,9 @@
<fieldset>
<legend>Example form legend</legend>
<div class="clearfix error">
- <label for="xlInput">X-Large Input</label>
+ <label for="xlInput4">X-Large Input</label>
<div class="input">
- <input class="xlarge error" id="xlInput" name="xlInput" size="30" type="text" />
+ <input class="xlarge error" id="xlInput4" name="xlInput4" size="30" type="text" />
<span class="help-inline">Small snippet of help text</span>
</div>
</div><!-- /clearfix -->
View
@@ -107,4 +107,4 @@ a {
color: @linkColorHover;
text-decoration: underline;
}
-}
+}

0 comments on commit 90d174a

Please sign in to comment.