mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-18 19:31:35 +02:00
Code Issues Releases Wiki Activity

merging in remote and recompiling

Browse Source
This commit is contained in:
Mark Otto
2011-08-31 16:27:28 -07:00
parent 6258832776 f6a4dd95b6
commit 0cb6804b69
10 changed files with 42 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
docs/index.html
View File

@@ -12,7 +12,7 @@
<![endif]-->
<!-- Le styles -->
<link href="../bootstrap-1.1.1.css" rel="stylesheet">
<link href="../bootstrap-1.2.0.css" rel="stylesheet">
<link href="assets/css/docs.css" rel="stylesheet">
<link href="assets/js/google-code-prettify/prettify.css" rel="stylesheet">
@@ -78,7 +78,7 @@
<h6>Hotlink the CSS</h6>
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
<form>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.1.min.css"></textarea>
<textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"></textarea>
</form>
</div>
<div class="span5 columns">
@@ -663,9 +663,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 -->
@@ -700,7 +700,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>
@@ -803,9 +803,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">
@@ -824,9 +824,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 -->
@@ -870,11 +870,7 @@
<h3>Example buttons</h3>
<p>Button styles can be applied to anything with the <code>.btn</code> applied. Typically you’ll want to apply these to only <code>&lt;a&gt;</code>, <code>&lt;button&gt;</code>, and select <code>&lt;input&gt;</code> elements. Here’s how it looks:</p>
<div class="well" style="padding: 14px 19px;">
<button class="btn primary">Primary</button>
<button class="btn">Default</button>
<button class="btn info">Info</button>
<button class="btn success">Success</button>
<button class="btn danger">Danger</button>
<button class="btn primary">Primary</button>&nbsp;<button class="btn">Default</button>&nbsp;<button class="btn info">Info</button>&nbsp;<button class="btn success">Success</button>&nbsp;<button class="btn danger">Danger</button>
</div>
<h3>Alternate sizes</h3>
<p>Fancy larger or smaller buttons? Have at it!</p>