diff options
| author | Mark Otto <[email protected]> | 2011-08-31 16:27:28 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-31 16:27:28 -0700 |
| commit | 0cb6804b6953d8fce53fcfae065288fd826d1941 (patch) | |
| tree | b6f8a6f2156a0389b74114dcc985ef1e413ed2d7 /docs | |
| parent | 6258832776b113b09e963680ef121b363dd8d292 (diff) | |
| parent | f6a4dd95b62771b105530c85a98901f06bfecdd7 (diff) | |
| download | bootstrap-0cb6804b6953d8fce53fcfae065288fd826d1941.tar.xz bootstrap-0cb6804b6953d8fce53fcfae065288fd826d1941.zip | |
merging in remote and recompiling
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/docs/index.html b/docs/index.html index 46e2881a8..a4b92344c 100644 --- a/docs/index.html +++ b/docs/index.html @@ -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"><link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.1.1.min.css"></textarea> + <textarea class="copy-code" rows="1"><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><a></code>, <code><button></code>, and select <code><input></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> <button class="btn">Default</button> <button class="btn info">Info</button> <button class="btn success">Success</button> <button class="btn danger">Danger</button> </div> <h3>Alternate sizes</h3> <p>Fancy larger or smaller buttons? Have at it!</p> |