rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-28 10:24:19 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source 
Conflicts:
	README.md
	bootstrap-1.2.0.css
This commit is contained in:
Jacob Thornton 2011-08-30 23:37:46 -07:00
commit 90d174a34d
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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/.

2
bootstrap-1.2.0.css vendored
View File

@ -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).

14
docs/index.html
View File

@ -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 -->

2
lib/scaffolding.less
View File

@ -107,4 +107,4 @@ a {
color: @linkColorHover;
text-decoration: underline;
}
}
}