aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-01-26 10:00:09 -0800
committerMark Otto <[email protected]>2012-01-26 10:00:09 -0800
commit0ef4b6419fd83170dd62049a2850c5e8466635c9 (patch)
tree23e649cbd61892a8755a4e9af2c7f790d9fd7fa3 /docs
parent106625a2ece84fd5e1e68144411c8d00db05c23f (diff)
downloadbootstrap-0ef4b6419fd83170dd62049a2850c5e8466635c9.tar.xz
bootstrap-0ef4b6419fd83170dd62049a2850c5e8466635c9.zip
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
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/docs.css50
-rw-r--r--docs/base-css.html66
-rw-r--r--docs/components.html8
-rw-r--r--docs/download.html8
-rw-r--r--docs/examples.html8
-rw-r--r--docs/index.html66
-rw-r--r--docs/javascript.html8
-rw-r--r--docs/less.html12
-rw-r--r--docs/scaffolding.html8
-rw-r--r--docs/templates/layout.mustache8
-rw-r--r--docs/templates/pages/base-css.mustache58
-rw-r--r--docs/templates/pages/index.mustache58
-rw-r--r--docs/templates/pages/less.mustache4
-rw-r--r--docs/upgrading.html8
14 files changed, 217 insertions, 153 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 9f21f901f..d266dd92e 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -50,31 +50,41 @@ section {
line-height: 1;
}
+/* Faded out hr */
+hr.soften {
+ height: 1px;
+ margin: 54px 0;
+ background-image: -webkit-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+ background-image: -moz-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+ background-image: -ms-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+ background-image: -o-linear-gradient(left, rgba(0,0,0,0), rgba(0,0,0,.1), rgba(0,0,0,0));
+ border: 0;
+}
+
/* Jumbotrons
-------------------------------------------------- */
.jumbotron {
position: relative;
- text-shadow: 0 1px 0 #fff;
}
.jumbotron h1 {
- margin-right: 40%;
margin-bottom: 9px;
- font-size: 90px;
+ font-size: 108px;
letter-spacing: -1px;
line-height: 1;
}
.jumbotron p {
- margin-right: 32%;
- margin-bottom: 20px;
+ margin-bottom: 18px;
font-size: 25px;
font-weight: 300;
line-height: 36px;
+ color: #333;
}
.jumbotron .btn-large {
font-size: 20px;
+ font-weight: normal;
padding: 14px 24px;
- margin-right: 5px;
+ margin-right: 10px;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
@@ -84,9 +94,26 @@ section {
color: #999;
}
+/* Masthead (docs home) */
+.masthead {
+ padding: 36px 0 0;
+}
+.masthead h1,
+.masthead p {
+ text-align: center;
+}
+.masthead h1 {
+ margin-bottom: 18px;
+}
+.masthead p {
+ margin: 0 5% 27px;
+}
+
+
/* Benefits list in masthead */
.benefits {
- width: 280px;
+ display: none;
+ width: 260px;
position: absolute;
right: 0;
bottom: 0;
@@ -213,16 +240,9 @@ section {
.quick-links {
min-height: 30px;
padding: 5px 20px;
- margin: 45px 0;
+ margin: 36px 0;
list-style: none;
text-align: center;
- background-color: #eee;
- -webkit-border-radius: 3px;
- -moz-border-radius: 3px;
- border-radius: 3px;
- -webkit-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
- -moz-box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
- box-shadow: inset 0 1px 0 rgba(0,0,0,.03);
overflow: hidden;
}
.quick-links li {
diff --git a/docs/base-css.html b/docs/base-css.html
index a2eff98ee..bbe7ecd88 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -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&mdash;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&mdash;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&mdash;yes, you guessed it&mdash;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&mdash;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>
diff --git a/docs/components.html b/docs/components.html
index 2ccfd26e6..49f3f8369 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -1248,6 +1249,7 @@
</section>
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -1260,9 +1262,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>
diff --git a/docs/download.html b/docs/download.html
index 58fdd5659..3ad6ec921 100644
--- a/docs/download.html
+++ b/docs/download.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -301,6 +302,7 @@
</div>
</section><!-- /download -->
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -313,9 +315,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>
diff --git a/docs/examples.html b/docs/examples.html
index bc52bea55..0d3e11f5a 100644
--- a/docs/examples.html
+++ b/docs/examples.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -89,6 +90,7 @@
</section>
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -101,9 +103,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>
diff --git a/docs/index.html b/docs/index.html
index f3738e837..333077601 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -68,18 +69,17 @@
================================================== -->
<header class="jumbotron masthead">
<div class="inner">
- <h1>Bootstrap,<br> from Twitter</h1>
- <p class="lead">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.</p>
+ <h1>Twitter Bootstrap</h1>
+ <p class="lead">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.</p>
<p class="download-info">
- <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View on GitHub</a>
- <a href="./download.html" class="btn btn-large">Customize and Download</a>
+ <a href="https://github.com/twitter/bootstrap/" class="btn primary btn-large">View project on GitHub</a>
+ <a href="./download.html" class="btn btn-large">Customize and download</a>
</p>
-
<div class="benefits">
<h4>Feature highlights</h4>
<ul>
<li><span>&#10004;</span> Built on LESS</li>
- <li><span>&#10004;</span> Complete styleguide docs</li>
+ <li><span>&#10004;</span> Complete style guide docs</li>
<li><span>&#10004;</span> Fully responsive design</li>
<li><span>&#10004;</span> Small footprint (10kb gzipped)</li>
<li><span>&#10004;</span> Support for IE7 and up</li>
@@ -88,30 +88,30 @@
</ul>
</div>
</div>
- </header>
- <ul class="quick-links">
- <li><strong>Quick links</strong></li>
- <li><a href="https://github.com/twitter/bootstrap/">GitHub</a></li>
- <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li>
- <li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">Roadmap</a></li>
- <li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></li>
- <li class="divider">&middot;</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">&middot;</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">Follow @twbootstrap</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>
+ <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">Issues</a></li>
+ <li><a href="https://github.com/twitter/bootstrap/wiki/Roadmap">Roadmap</a></li>
+ <li><a href="https://github.com/twitter/bootstrap/wiki/Changelog">Changelog</a></li>
+ <li class="divider">&middot;</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">&middot;</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">Follow @twbootstrap</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>
+ <hr class="soften">
<div class="marketing">
<h1>Built with Bootstrap.</h1>
@@ -134,6 +134,8 @@
</li>
</ul>
+ <hr class="soften">
+
<h1>Designed for everyone, everywhere.</h1>
<p class="marketing-byline">Need reasons to love Bootstrap? Look no further.</p>
<div class="row">
@@ -210,6 +212,7 @@
</div>
</div><!--/row-->
+ <hr class="soften">
<!-- Quickstart options
================================================== -->
@@ -243,6 +246,7 @@
</div><!-- /.marketing -->
</div><!-- /#overview -->
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -255,9 +259,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>
diff --git a/docs/javascript.html b/docs/javascript.html
index 34d61ef9c..400a93dd2 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -1356,6 +1357,7 @@ $('.myCarousel').carousel({
</div>
</div>
</section>
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -1368,9 +1370,11 @@ $('.myCarousel').carousel({
</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>
diff --git a/docs/less.html b/docs/less.html
index f6321fc69..d2e083c2e 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -301,8 +302,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>
@@ -755,6 +756,7 @@
</div><!-- /row -->
</section>
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -767,9 +769,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>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 2ba8d5d7a..2c8d873e7 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -379,6 +380,7 @@
</div>
</div>
</section>
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -391,9 +393,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>
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache
index addcb224f..547b99bb4 100644
--- a/docs/templates/layout.mustache
+++ b/docs/templates/layout.mustache
@@ -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>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index c2dd661ae..325883872 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -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&mdash;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&mdash;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&mdash;yes, you guessed it&mdash;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&mdash;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>
diff --git a/docs/templates/pages/index.mustache b/docs/templates/pages/index.mustache
index 33bfd035f..5bc52644d 100644
--- a/docs/templates/pages/index.mustache
+++ b/docs/templates/pages/index.mustache
@@ -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>&#10004;</span> {{_i}}Built on LESS{{/i}}</li>
- <li><span>&#10004;</span> {{_i}}Complete styleguide docs{{/i}}</li>
+ <li><span>&#10004;</span> {{_i}}Complete style guide docs{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Fully responsive design{{/i}}</li>
<li><span>&#10004;</span> {{_i}}Small footprint (10kb gzipped){{/i}}</li>
<li><span>&#10004;</span> {{_i}}Support for IE7 and up{{/i}}</li>
@@ -24,30 +23,30 @@
</ul>
</div>
</div>
- </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">&middot;</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">&middot;</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>
+ <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">&middot;</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">&middot;</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>
+ <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
================================================== -->
diff --git a/docs/templates/pages/less.mustache b/docs/templates/pages/less.mustache
index f2c266842..6478e3b2f 100644
--- a/docs/templates/pages/less.mustache
+++ b/docs/templates/pages/less.mustache
@@ -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>
diff --git a/docs/upgrading.html b/docs/upgrading.html
index fb1fbfcfe..e80fac2d6 100644
--- a/docs/upgrading.html
+++ b/docs/upgrading.html
@@ -27,6 +27,7 @@
<body data-spy="scroll" data-target=".subnav" data-offset="50">
+
<!-- Navbar
================================================== -->
<div class="navbar navbar-fixed">
@@ -148,6 +149,7 @@
</li>
-->
</ul>
+
<!-- Footer
================================================== -->
<footer class="footer">
@@ -160,9 +162,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>
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-06 11:32:18 +0000