mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-11 18:02:28 +03: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
Vendored
+6
-2
@@ -27,6 +27,7 @@
|
||||
|
||||
<body data-spy="scroll" data-target=".subnav" data-offset="50">
|
||||
|
||||
|
||||
<!-- Navbar
|
||||
================================================== -->
|
||||
<div class="navbar navbar-fixed">
|
||||
@@ -64,6 +65,7 @@
|
||||
|
||||
{{>body}}
|
||||
|
||||
|
||||
<!-- Footer
|
||||
================================================== -->
|
||||
<footer class="footer">
|
||||
@@ -76,9 +78,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>
|
||||
|
||||
+29
-29
@@ -880,7 +880,7 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="input01">{{_i}}Text input{{/i}}</label>
|
||||
<div class="controls">
|
||||
<input type="text" class="xlarge" name="input01">
|
||||
<input type="text" class="input-xlarge" id="input01">
|
||||
<p class="help-block">{{_i}}In addition to freeform text, any HTML5 text-based input appears like so.{{/i}}</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -888,7 +888,7 @@
|
||||
<label class="control-label" for="optionsCheckbox">{{_i}}Checkbox{{/i}}</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckbox" value="option1">
|
||||
<input type="checkbox" id="optionsCheckbox" value="option1">
|
||||
{{_i}}Option one is this and that—be sure to include why it’s great{{/i}}
|
||||
</label>
|
||||
</div>
|
||||
@@ -896,7 +896,7 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="select01">{{_i}}Select list{{/i}}</label>
|
||||
<div class="controls">
|
||||
<select name="select01">
|
||||
<select id="select01">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
@@ -908,7 +908,7 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="multiSelect">{{_i}}Multi-select{{/i}}</label>
|
||||
<div class="controls">
|
||||
<select multiple="multiple" name="multiSelect">
|
||||
<select multiple="multiple" id="multiSelect">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
@@ -920,13 +920,13 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="fileInput">{{_i}}File input{{/i}}</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">{{_i}}Textarea{{/i}}</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">
|
||||
@@ -966,20 +966,20 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="focusedInput">{{_i}}Focused input{{/i}}</label>
|
||||
<div class="controls">
|
||||
<input class="input-xlarge focused" id="focusedInput" name="focusedInput" type="text" value="{{_i}}This is focused…{{/i}}">
|
||||
<input class="input-xlarge focused" id="focusedInput" type="text" value="{{_i}}This is focused…{{/i}}">
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="disabledInput">{{_i}}Disabled input{{/i}}</label>
|
||||
<div class="controls">
|
||||
<input class="input-xlarge disabled" id="disabledInput" name="disabledInput" type="text" placeholder="{{_i}}Disabled input here…{{/i}}" disabled>
|
||||
<input class="input-xlarge disabled" id="disabledInput" type="text" placeholder="{{_i}}Disabled input here…{{/i}}" disabled>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="optionsCheckbox">{{_i}}Disabled checkbox{{/i}}</label>
|
||||
<label class="control-label" for="optionsCheckbox2">{{_i}}Disabled checkbox{{/i}}</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckbox" value="option1" disabled>
|
||||
<input type="checkbox" id="optionsCheckbox2" value="option1" disabled>
|
||||
{{_i}}This is a disabled checkbox{{/i}}
|
||||
</label>
|
||||
</div>
|
||||
@@ -987,28 +987,28 @@
|
||||
<div class="control-group warning">
|
||||
<label class="control-label" for="inputError">{{_i}}Input with warning{{/i}}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="inputError">
|
||||
<input type="text" id="inputError">
|
||||
<span class="help-inline">{{_i}}Something may have gone wrong{{/i}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group error">
|
||||
<label class="control-label" for="inputError">{{_i}}Input with error{{/i}}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="inputError">
|
||||
<input type="text" id="inputError">
|
||||
<span class="help-inline">{{_i}}Please correct the error{{/i}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group success">
|
||||
<label class="control-label" for="inputError">{{_i}}Input with success{{/i}}</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="inputError">
|
||||
<input type="text" id="inputError">
|
||||
<span class="help-inline">{{_i}}Woohoo!{{/i}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group success">
|
||||
<label class="control-label" for="selectError">{{_i}}Select with success{{/i}}</label>
|
||||
<div class="controls">
|
||||
<select name="selectError">
|
||||
<select id="selectError">
|
||||
<option>1</option>
|
||||
<option>2</option>
|
||||
<option>3</option>
|
||||
@@ -1052,9 +1052,9 @@
|
||||
<div class="control-group">
|
||||
<label class="control-label">{{_i}}Form sizes{{/i}}</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">{{_i}}Use the same <code>.span*</code> classes from the grid system for input sizes.{{/i}}</p>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1063,7 +1063,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">{{_i}}Here's some help text{{/i}}</p>
|
||||
</div>
|
||||
@@ -1072,7 +1072,7 @@
|
||||
<label class="control-label" for="appendedInput">{{_i}}Appended text{{/i}}</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">{{_i}}Here's more help text{{/i}}</p>
|
||||
@@ -1082,43 +1082,43 @@
|
||||
<label class="control-label" for="inlineCheckboxes">{{_i}}Inline checkboxes{{/i}}</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">{{_i}}Checkboxes{{/i}}</label>
|
||||
<label class="control-label" for="optionsCheckboxList">{{_i}}Checkboxes{{/i}}</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckboxes" value="option1">
|
||||
<input type="checkbox" name="optionsCheckboxList1" value="option1">
|
||||
{{_i}}Option one is this and that—be sure to include why it’s great{{/i}}
|
||||
</label>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckboxes" value="option2">
|
||||
<input type="checkbox" name="optionsCheckboxList2" value="option2">
|
||||
{{_i}}Option two can also be checked and included in form results{{/i}}
|
||||
</label>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" name="optionsCheckboxes" value="option3">
|
||||
<input type="checkbox" name="optionsCheckboxList3" value="option3">
|
||||
{{_i}}Option three can—yes, you guessed it—also be checked and included in form results{{/i}}
|
||||
</label>
|
||||
<p class="help-text">{{_i}}<strong>Note:</strong> Labels surround all the options for much larger click areas and a more usable form.{{/i}}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="optionsRadios">{{_i}}Radio buttons{{/i}}</label>
|
||||
<label class="control-label">{{_i}}Radio buttons{{/i}}</label>
|
||||
<div class="controls">
|
||||
<label class="radio">
|
||||
<input type="radio" checked name="optionsRadios" value="option1">
|
||||
<input type="radio" id="optionsRadios1" value="option1" checked>
|
||||
{{_i}}Option one is this and that—be sure to include why it’s great{{/i}}
|
||||
</label>
|
||||
<label class="radio">
|
||||
<input type="radio" name="optionsRadios" value="option2">
|
||||
<input type="radio" id="optionsRadios2" value="option2">
|
||||
{{_i}}Option two can is something else and selecting it will deselect option one{{/i}}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
Vendored
+30
-28
@@ -4,18 +4,17 @@
|
||||
================================================== -->
|
||||
<header class="jumbotron masthead">
|
||||
<div class="inner">
|
||||
<h1>{{_i}}Bootstrap,<br> from Twitter{{/i}}</h1>
|
||||
<p class="lead">{{_i}}Bootstrap is a responsive frontend toolkit from Twitter designed to kickstart web development, featuring HTML, CSS, and JS for dozens of base elements and common design components.{{/i}}</p>
|
||||
<h1>{{_i}}Twitter Bootstrap{{/i}}</h1>
|
||||
<p class="lead">{{_i}}Bootstrap is a comprehensive front-end toolkit from Twitter designed to kickstart web development. It features HTML, CSS, and JS for dozens of base elements, commonly used design components, and more.{{/i}}</p>
|
||||
<p class="download-info">
|
||||
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View on GitHub{{/i}}</a>
|
||||
<a href="./download.html" class="btn btn-large">{{_i}}Customize and Download{{/i}}</a>
|
||||
<a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
|
||||
<a href="./download.html" class="btn btn-large">{{_i}}Customize and download{{/i}}</a>
|
||||
</p>
|
||||
|
||||
<div class="benefits">
|
||||
<h4>{{_i}}Feature highlights{{/i}}</h4>
|
||||
<ul>
|
||||
<li><span>✔</span> {{_i}}Built on LESS{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Complete styleguide docs{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Complete style guide docs{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Fully responsive design{{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Small footprint (10kb gzipped){{/i}}</li>
|
||||
<li><span>✔</span> {{_i}}Support for IE7 and up{{/i}}</li>
|
||||
@@ -24,30 +23,30 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ul class="quick-links">
|
||||
<li><a href="https://github.com/twitter/bootstrap/">GitHub repo</a></li>
|
||||
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
|
||||
<li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">{{_i}}Roadmap{{/i}}</a></li>
|
||||
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">{{_i}}Changelog{{/i}}</a></li>
|
||||
<li class="divider">·</li>
|
||||
<li>
|
||||
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="114px" height="20px"></iframe>
|
||||
</li>
|
||||
<li>
|
||||
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
|
||||
</li>
|
||||
<li class="divider">·</li>
|
||||
<li class="follow-btn">
|
||||
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a>
|
||||
</li>
|
||||
<li class="tweet-btn">
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
|
||||
</li>
|
||||
</ul>
|
||||
</header>
|
||||
|
||||
<ul class="quick-links">
|
||||
<li><strong>{{_i}}Quick links{{/i}}</strong></li>
|
||||
<li><a href="https://github.com/twitter/bootstrap/">GitHub</a></li>
|
||||
<li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li>
|
||||
<li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">{{_i}}Roadmap{{/i}}</a></li>
|
||||
<li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">{{_i}}Changelog{{/i}}</a></li>
|
||||
<li class="divider">·</li>
|
||||
<li>
|
||||
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="114px" height="20px"></iframe>
|
||||
</li>
|
||||
<li>
|
||||
<iframe class="github-btn" src="http://markdotto.github.com/github-buttons/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="98px" height="20px"></iframe>
|
||||
</li>
|
||||
<li class="divider">·</li>
|
||||
<li class="follow-btn">
|
||||
<a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-width="145px" data-link-color="#0069D6" data-show-count="false">{{_i}}Follow @twbootstrap{{/i}}</a>
|
||||
</li>
|
||||
<li class="tweet-btn">
|
||||
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a>
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<hr class="soften">
|
||||
|
||||
<div class="marketing">
|
||||
<h1>{{_i}}Built with Bootstrap.{{/i}}</h1>
|
||||
@@ -70,6 +69,8 @@
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<hr class="soften">
|
||||
|
||||
<h1>{{_i}}Designed for everyone, everywhere.{{/i}}</h1>
|
||||
<p class="marketing-byline">{{_i}}Need reasons to love Bootstrap? Look no further.{{/i}}</p>
|
||||
<div class="row">
|
||||
@@ -146,6 +147,7 @@
|
||||
</div>
|
||||
</div><!--/row-->
|
||||
|
||||
<hr class="soften">
|
||||
|
||||
<!-- Quickstart options
|
||||
================================================== -->
|
||||
|
||||
Vendored
+2
-2
@@ -237,8 +237,8 @@
|
||||
<table class="table table-bordered table-striped">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="span3"><code>@primaryButtonColor</code></td>
|
||||
<td><code>@blue</code></td>
|
||||
<td class="span3"><code>@primaryButtonBackground</code></td>
|
||||
<td><code>@linkColor</code></td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
Reference in New Issue
Block a user