mirror of
https://github.com/twbs/bootstrap.git
synced 2025-09-25 21:09:06 +02:00
overhaul frontpage jumbotron, add js for twitter buttons back in, fix up some form ids and classes, straighten out the use of primary button variable
This commit is contained in:
Mark Otto
@@ -27,6 +27,7 @@
|
||||
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
<div class="navbar navbar-fixed">
|
||||
@@ -944,7 +945,7 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="input01">Text input</label>
|
||||
<div class="controls">
|
||||
<input type="text" class="xlarge" name="input01">
|
||||
<input type="text" class="input-xlarge" id="input01">
|
||||
<p class="help-block">In addition to freeform text, any HTML5 text-based input appears like so.</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -952,7 +953,7 @@
|
||||
<label class="control-label" for="optionsCheckbox">Checkbox</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckbox" value="option1">
|
||||
<input type="checkbox" id="optionsCheckbox" value="option1">
|
||||
Option one is this and that—be sure to include why it’s great
|
||||
</label>
|
||||
</div>
|
||||
@@ -960,7 +961,7 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="select01">Select list</label>
|
||||
<div class="controls">
|
||||
<select name="select01">
|
||||
<select id="select01">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
@@ -972,7 +973,7 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="multiSelect">Multi-select</label>
|
||||
<div class="controls">
|
||||
<select multiple="multiple" name="multiSelect">
|
||||
<select multiple="multiple" id="multiSelect">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
@@ -984,13 +985,13 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="fileInput">File input</label>
|
||||
<div class="controls">
|
||||
<input class="input-file" id="fileInput" name="fileInput" type="file">
|
||||
<input class="input-file" id="fileInput" type="file">
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="textarea">Textarea</label>
|
||||
<div class="controls">
|
||||
<textarea class="input-xlarge" name="textarea" id="textarea" rows="3"></textarea>
|
||||
<textarea class="input-xlarge" id="textarea" rows="3"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-actions">
|
||||
@@ -1030,20 +1031,20 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="focusedInput">Focused input</label>
|
||||
<div class="controls">
|
||||
<input class="input-xlarge focused" id="focusedInput" name="focusedInput" type="text" value="This is focused…">
|
||||
<input class="input-xlarge focused" id="focusedInput" type="text" value="This is focused…">
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="disabledInput">Disabled input</label>
|
||||
<div class="controls">
|
||||
<input class="input-xlarge disabled" id="disabledInput" name="disabledInput" type="text" placeholder="Disabled input here…" disabled>
|
||||
<input class="input-xlarge disabled" id="disabledInput" type="text" placeholder="Disabled input here…" disabled>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="optionsCheckbox">Disabled checkbox</label>
|
||||
<label class="control-label" for="optionsCheckbox2">Disabled checkbox</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckbox" value="option1" disabled>
|
||||
<input type="checkbox" id="optionsCheckbox2" value="option1" disabled>
|
||||
This is a disabled checkbox
|
||||
</label>
|
||||
</div>
|
||||
@@ -1051,28 +1052,28 @@
|
||||
<div class="control-group warning">
|
||||
<label class="control-label" for="inputError">Input with warning</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="inputError">
|
||||
<input type="text" id="inputError">
|
||||
<span class="help-inline">Something may have gone wrong</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group error">
|
||||
<label class="control-label" for="inputError">Input with error</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="inputError">
|
||||
<input type="text" id="inputError">
|
||||
<span class="help-inline">Please correct the error</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group success">
|
||||
<label class="control-label" for="inputError">Input with success</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="inputError">
|
||||
<input type="text" id="inputError">
|
||||
<span class="help-inline">Woohoo!</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group success">
|
||||
<label class="control-label" for="selectError">Select with success</label>
|
||||
<div class="controls">
|
||||
<select name="selectError">
|
||||
<select id="selectError">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
@@ -1116,9 +1117,9 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label">Form sizes</label>
|
||||
<div class="controls docs-input-sizes">
|
||||
<input class="span2" type="text" name="" placeholder=".span2">
|
||||
<input class="span3" type="text" name="" placeholder=".span3">
|
||||
<input class="span4" type="text" name="" placeholder=".span4">
|
||||
<input class="span2" type="text" placeholder=".span2">
|
||||
<input class="span3" type="text" placeholder=".span3">
|
||||
<input class="span4" type="text" placeholder=".span4">
|
||||
<p class="help-block">Use the same <code>.span*</code> classes from the grid system for input sizes.</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1127,7 +1128,7 @@
|
||||
<div class="controls">
|
||||
<div class="input-prepend">
|
||||
<span class="add-on">@</span>
|
||||
<input class="span2" id="prependedInput" name="prependedInput" size="16" type="text">
|
||||
<input class="span2" id="prependedInput" size="16" type="text">
|
||||
</div>
|
||||
<p class="help-block">Here's some help text</p>
|
||||
</div>
|
||||
@@ -1136,7 +1137,7 @@
|
||||
<label class="control-label" for="appendedInput">Appended text</label>
|
||||
<div class="controls">
|
||||
<div class="input-append">
|
||||
<input class="span2" id="appendedInput" name="appendedInput" size="16" type="text">
|
||||
<input class="span2" id="appendedInput" size="16" type="text">
|
||||
<span class="add-on">.00</span>
|
||||
</div>
|
||||
<p class="help-block">Here's more help text</p>
|
||||
@@ -1146,43 +1147,43 @@
|
||||
<label class="control-label" for="inlineCheckboxes">Inline checkboxes</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox inline">
|
||||
<input type="checkbox" name="inlineCheckbox1" value="option1"> 1
|
||||
<input type="checkbox" id="inlineCheckbox1" value="option1"> 1
|
||||
</label>
|
||||
<label class="checkbox inline">
|
||||
<input type="checkbox" name="inlineCheckbox1" value="option1"> 2
|
||||
<input type="checkbox" id="inlineCheckbox2" value="option2"> 2
|
||||
</label>
|
||||
<label class="checkbox inline">
|
||||
<input type="checkbox" name="inlineCheckbox1" value="option1"> 3
|
||||
<input type="checkbox" id="inlineCheckbox3" value="option3"> 3
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="optionsCheckboxes">Checkboxes</label>
|
||||
<label class="control-label" for="optionsCheckboxList">Checkboxes</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckboxes" value="option1">
|
||||
<input type="checkbox" name="optionsCheckboxList1" value="option1">
|
||||
Option one is this and that—be sure to include why it’s great
|
||||
</label>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckboxes" value="option2">
|
||||
<input type="checkbox" name="optionsCheckboxList2" value="option2">
|
||||
Option two can also be checked and included in form results
|
||||
</label>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckboxes" value="option3">
|
||||
<input type="checkbox" name="optionsCheckboxList3" value="option3">
|
||||
Option three can—yes, you guessed it—also be checked and included in form results
|
||||
</label>
|
||||
<p class="help-text"><strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="optionsRadios">Radio buttons</label>
|
||||
<label class="control-label">Radio buttons</label>
|
||||
<div class="controls">
|
||||
<label class="radio">
|
||||
<input type="radio" checked name="optionsRadios" value="option1">
|
||||
<input type="radio" id="optionsRadios1" value="option1" checked>
|
||||
Option one is this and that—be sure to include why it’s great
|
||||
</label>
|
||||
<label class="radio">
|
||||
<input type="radio" name="optionsRadios" value="option2">
|
||||
<input type="radio" id="optionsRadios2" value="option2">
|
||||
Option two can is something else and selecting it will deselect option one
|
||||
</label>
|
||||
</div>
|
||||
@@ -1482,6 +1483,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="footer">
|
||||
@@ -1494,9 +1496,11 @@
|
||||
</div><!-- /container -->
|
||||
|
||||
|
||||
<!-- Le javascript -->
|
||||
|
||||
<!-- Le javascript
|
||||
================================================== -->
|
||||
<!-- Placed at the end of the document so the pages load faster -->
|
||||
<!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> -->
|
||||
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
|
||||
<script src="../js/tests/vendor/jquery.js"></script>
|
||||
<script src="assets/js/google-code-prettify/prettify.js"></script>
|
||||
<script src="../js/bootstrap-transition.js"></script>
|
||||
|
||||
Reference in New Issue
Block a user