Skip to content
GitLab
Commit a3971306 authored by Jonathan Camile's avatar Jonathan Camile
Browse files

Merge branch '2.0.2-wip' of https://github.com/twitter/bootstrap into features/warning_progress_bar

parents 15759d9e fbebb046
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1333 additions and 358 deletions
+1333 -358
README.md
+ 19
- 4
View file @ a3971306
TWITTER BOOTSTRAP [Twitter Bootstrap](http://twitter.github.com/bootstrap)
================= =================
Bootstrap is Twitter's toolkit for kickstarting CSS for websites, apps, and more. It includes base CSS styles for typography, forms, buttons, tables, grids, navigation, alerts, and more. Bootstrap provides simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions. In other words, it's a front-end toolkit for faster, more beautiful web development. It's created and maintained by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat) at Twitter.
To get started, checkout http://twitter.github.com/bootstrap!
Quick start
-----------
Clone the repo, `git clone git@github.com:twitter/bootstrap.git`, or [download the latest release](https://github.com/twitter/bootstrap/zipball/master).
To get started -- checkout http://twitter.github.com/bootstrap!
Versioning Versioning
...@@ -24,6 +32,7 @@ And constructed with the following guidelines: ...@@ -24,6 +32,7 @@ And constructed with the following guidelines:
For more information on SemVer, please visit http://semver.org/. For more information on SemVer, please visit http://semver.org/.
Bug tracker Bug tracker
----------- -----------
...@@ -32,10 +41,12 @@ Have a bug? Please create an issue here on GitHub! ...@@ -32,10 +41,12 @@ Have a bug? Please create an issue here on GitHub!
https://github.com/twitter/bootstrap/issues https://github.com/twitter/bootstrap/issues
Twitter account Twitter account
--------------- ---------------
Keep up to date on announcements and more by following Bootstrap on Twitter, <a href="http://twitter.com/TwBootstrap">@TwBootstrap</a>. Keep up to date on announcements and more by following Bootstrap on Twitter, [@TwBootstrap](http://twitter.com/TwBootstrap).
Mailing list Mailing list
...@@ -48,6 +59,7 @@ twitter-bootstrap@googlegroups.com ...@@ -48,6 +59,7 @@ twitter-bootstrap@googlegroups.com
http://groups.google.com/group/twitter-bootstrap http://groups.google.com/group/twitter-bootstrap
IRC IRC
--- ---
...@@ -56,6 +68,7 @@ Server: irc.freenode.net ...@@ -56,6 +68,7 @@ Server: irc.freenode.net
Channel: ##twitter-bootstrap (the double ## is not a typo) Channel: ##twitter-bootstrap (the double ## is not a typo)
Developers Developers
---------- ----------
...@@ -68,6 +81,7 @@ Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages. ...@@ -68,6 +81,7 @@ Runs the LESS compiler to rebuild the `/less` files and compiles the docs pages.
This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem. This is a convenience method for watching just Less files and automatically building them whenever you save. Requires the Watchr gem.
Authors Authors
------- -------
...@@ -82,6 +96,7 @@ Authors ...@@ -82,6 +96,7 @@ Authors
+ http://github.com/fat + http://github.com/fat
Copyright and license Copyright and license
--------------------- ---------------------
......
docs/assets/bootstrap.zip
+ 0
- 0
View file @ a3971306
No preview for this file type
docs/assets/css/bootstrap-responsive.css
+ 91
- 26
View file @ a3971306
...@@ -21,6 +21,52 @@ ...@@ -21,6 +21,52 @@
display: none; display: none;
visibility: hidden; visibility: hidden;
} }
.visible-phone {
display: none;
}
.visible-tablet {
display: none;
}
.visible-desktop {
display: block;
}
.hidden-phone {
display: block;
}
.hidden-tablet {
display: block;
}
.hidden-desktop {
display: none;
}
@media (max-width: 767px) {
.visible-phone {
display: block;
}
.hidden-phone {
display: none;
}
.hidden-desktop {
display: block;
}
.visible-desktop {
display: none;
}
}
@media (min-width: 768px) and (max-width: 979px) {
.visible-tablet {
display: block;
}
.hidden-tablet {
display: none;
}
.hidden-desktop {
display: block;
}
.visible-desktop {
display: none;
}
}
@media (max-width: 480px) { @media (max-width: 480px) {
.nav-collapse { .nav-collapse {
-webkit-transform: translate3d(0, 0, 0); -webkit-transform: translate3d(0, 0, 0);
...@@ -128,6 +174,9 @@ ...@@ -128,6 +174,9 @@
float: left; float: left;
margin-left: 20px; margin-left: 20px;
} }
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
width: 724px;
}
.span1 { .span1 {
width: 42px; width: 42px;
} }
...@@ -161,7 +210,7 @@ ...@@ -161,7 +210,7 @@
.span11 { .span11 {
width: 662px; width: 662px;
} }
.span12, .container { .span12 {
width: 724px; width: 724px;
} }
.offset1 { .offset1 {
...@@ -197,6 +246,9 @@ ...@@ -197,6 +246,9 @@
.offset11 { .offset11 {
margin-left: 702px; margin-left: 702px;
} }
.offset12 {
margin-left: 764px;
}
.row-fluid { .row-fluid {
width: 100%; width: 100%;
*zoom: 1; *zoom: 1;
...@@ -251,40 +303,43 @@ ...@@ -251,40 +303,43 @@
.row-fluid > .span12 { .row-fluid > .span12 {
width: 99.999999993%; width: 99.999999993%;
} }
input.span1, textarea.span1, .uneditable-input.span1 { input, textarea, .uneditable-input {
margin-left: 0;
}
input > .span1, textarea > .span1, .uneditable-input > .span1 {
width: 32px; width: 32px;
} }
input.span2, textarea.span2, .uneditable-input.span2 { input > .span2, textarea > .span2, .uneditable-input > .span2 {
width: 94px; width: 94px;
} }
input.span3, textarea.span3, .uneditable-input.span3 { input > .span3, textarea > .span3, .uneditable-input > .span3 {
width: 156px; width: 156px;
} }
input.span4, textarea.span4, .uneditable-input.span4 { input > .span4, textarea > .span4, .uneditable-input > .span4 {
width: 218px; width: 218px;
} }
input.span5, textarea.span5, .uneditable-input.span5 { input > .span5, textarea > .span5, .uneditable-input > .span5 {
width: 280px; width: 280px;
} }
input.span6, textarea.span6, .uneditable-input.span6 { input > .span6, textarea > .span6, .uneditable-input > .span6 {
width: 342px; width: 342px;
} }
input.span7, textarea.span7, .uneditable-input.span7 { input > .span7, textarea > .span7, .uneditable-input > .span7 {
width: 404px; width: 404px;
} }
input.span8, textarea.span8, .uneditable-input.span8 { input > .span8, textarea > .span8, .uneditable-input > .span8 {
width: 466px; width: 466px;
} }
input.span9, textarea.span9, .uneditable-input.span9 { input > .span9, textarea > .span9, .uneditable-input > .span9 {
width: 528px; width: 528px;
} }
input.span10, textarea.span10, .uneditable-input.span10 { input > .span10, textarea > .span10, .uneditable-input > .span10 {
width: 590px; width: 590px;
} }
input.span11, textarea.span11, .uneditable-input.span11 { input > .span11, textarea > .span11, .uneditable-input > .span11 {
width: 652px; width: 652px;
} }
input.span12, textarea.span12, .uneditable-input.span12 { input > .span12, textarea > .span12, .uneditable-input > .span12 {
width: 714px; width: 714px;
} }
} }
...@@ -395,6 +450,7 @@ ...@@ -395,6 +450,7 @@
@media (min-width: 980px) { @media (min-width: 980px) {
.nav-collapse.collapse { .nav-collapse.collapse {
height: auto !important; height: auto !important;
overflow: visible !important;
} }
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
...@@ -413,6 +469,9 @@ ...@@ -413,6 +469,9 @@
float: left; float: left;
margin-left: 30px; margin-left: 30px;
} }
.container, .navbar-fixed-top .container, .navbar-fixed-bottom .container {
width: 1170px;
}
.span1 { .span1 {
width: 70px; width: 70px;
} }
...@@ -446,7 +505,7 @@ ...@@ -446,7 +505,7 @@
.span11 { .span11 {
width: 1070px; width: 1070px;
} }
.span12, .container { .span12 {
width: 1170px; width: 1170px;
} }
.offset1 { .offset1 {
...@@ -482,6 +541,9 @@ ...@@ -482,6 +541,9 @@
.offset11 { .offset11 {
margin-left: 1130px; margin-left: 1130px;
} }
.offset12 {
margin-left: 1230px;
}
.row-fluid { .row-fluid {
width: 100%; width: 100%;
*zoom: 1; *zoom: 1;
...@@ -536,40 +598,43 @@ ...@@ -536,40 +598,43 @@
.row-fluid > .span12 { .row-fluid > .span12 {
width: 100%; width: 100%;
} }
input.span1, textarea.span1, .uneditable-input.span1 { input, textarea, .uneditable-input {
margin-left: 0;
}
input > .span1, textarea > .span1, .uneditable-input > .span1 {
width: 60px; width: 60px;
} }
input.span2, textarea.span2, .uneditable-input.span2 { input > .span2, textarea > .span2, .uneditable-input > .span2 {
width: 160px; width: 160px;
} }
input.span3, textarea.span3, .uneditable-input.span3 { input > .span3, textarea > .span3, .uneditable-input > .span3 {
width: 260px; width: 260px;
} }
input.span4, textarea.span4, .uneditable-input.span4 { input > .span4, textarea > .span4, .uneditable-input > .span4 {
width: 360px; width: 360px;
} }
input.span5, textarea.span5, .uneditable-input.span5 { input > .span5, textarea > .span5, .uneditable-input > .span5 {
width: 460px; width: 460px;
} }
input.span6, textarea.span6, .uneditable-input.span6 { input > .span6, textarea > .span6, .uneditable-input > .span6 {
width: 560px; width: 560px;
} }
input.span7, textarea.span7, .uneditable-input.span7 { input > .span7, textarea > .span7, .uneditable-input > .span7 {
width: 660px; width: 660px;
} }
input.span8, textarea.span8, .uneditable-input.span8 { input > .span8, textarea > .span8, .uneditable-input > .span8 {
width: 760px; width: 760px;
} }
input.span9, textarea.span9, .uneditable-input.span9 { input > .span9, textarea > .span9, .uneditable-input > .span9 {
width: 860px; width: 860px;
} }
input.span10, textarea.span10, .uneditable-input.span10 { input > .span10, textarea > .span10, .uneditable-input > .span10 {
width: 960px; width: 960px;
} }
input.span11, textarea.span11, .uneditable-input.span11 { input > .span11, textarea > .span11, .uneditable-input > .span11 {
width: 1060px; width: 1060px;
} }
input.span12, textarea.span12, .uneditable-input.span12 { input > .span12, textarea > .span12, .uneditable-input > .span12 {
width: 1160px; width: 1160px;
} }
.thumbnails { .thumbnails {
......
docs/assets/css/bootstrap.css
+ 282
- 89
View file @ a3971306
This diff is collapsed.
docs/assets/css/docs.css
+ 72
- 6
View file @ a3971306
...@@ -79,6 +79,9 @@ hr.soften { ...@@ -79,6 +79,9 @@ hr.soften {
-moz-border-radius: 6px; -moz-border-radius: 6px;
border-radius: 6px; border-radius: 6px;
} }
.jumbotron .btn-large small {
font-size: 14px;
}
/* Masthead (docs home) */ /* Masthead (docs home) */
.masthead { .masthead {
...@@ -427,17 +430,17 @@ hr.soften { ...@@ -427,17 +430,17 @@ hr.soften {
.download-btn { .download-btn {
margin: 36px 0 108px; margin: 36px 0 108px;
} }
.download p, #download p,
.download h4 { #download h4 {
max-width: 50%; max-width: 50%;
margin: 0 auto; margin: 0 auto;
color: #999; color: #999;
text-align: center; text-align: center;
} }
.download h4 { #download h4 {
margin-bottom: 0; margin-bottom: 0;
} }
.download p { #download p {
margin-bottom: 18px; margin-bottom: 18px;
} }
.download-btn .btn { .download-btn .btn {
...@@ -482,8 +485,7 @@ hr.soften { ...@@ -482,8 +485,7 @@ hr.soften {
/* Misc /* Misc
-------------------------------------------------- */ -------------------------------------------------- */
img {
.browser-support {
max-width: 100%; max-width: 100%;
} }
...@@ -558,6 +560,70 @@ form.well { ...@@ -558,6 +560,70 @@ form.well {
background-color: #fff; background-color: #fff;
} }
/* Responsive table
------------------------- */
.responsive-utilities th small {
display: block;
font-weight: normal;
color: #999;
}
.responsive-utilities tbody th {
font-weight: normal;
}
.responsive-utilities td {
text-align: center;
}
.responsive-utilities td.is-visible {
color: #468847;
background-color: #dff0d8 !important;
}
.responsive-utilities td.is-hidden {
color: #ccc;
background-color: #f9f9f9 !important;
}
/* Responsive tests
------------------------- */
.responsive-utilities-test {
margin-top: 5px;
margin-left: 0;
list-style: none;
overflow: hidden; /* clear floats */
}
.responsive-utilities-test li {
position: relative;
float: left;
width: 25%;
height: 43px;
font-size: 14px;
font-weight: bold;
line-height: 43px;
color: #999;
text-align: center;
border: 1px solid #ddd;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.responsive-utilities-test li + li {
margin-left: 10px;
}
.responsive-utilities-test span {
position: absolute;
top: -1px;
left: -1px;
right: -1px;
bottom: -1px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.responsive-utilities-test span {
color: #468847;
background-color: #dff0d8;
border: 1px solid #d6e9c6;
}
/* Responsive Docs /* Responsive Docs
-------------------------------------------------- */ -------------------------------------------------- */
......
docs/assets/js/bootstrap-carousel.js
+ 6
- 2
View file @ a3971306
...@@ -29,6 +29,9 @@ ...@@ -29,6 +29,9 @@
this.$element = $(element) this.$element = $(element)
this.options = $.extend({}, $.fn.carousel.defaults, options) this.options = $.extend({}, $.fn.carousel.defaults, options)
this.options.slide && this.slide(this.options.slide) this.options.slide && this.slide(this.options.slide)
this.options.pause == 'hover' && this.$element
.on('mouseenter', $.proxy(this.pause, this))
.on('mouseleave', $.proxy(this.cycle, this))
} }
Carousel.prototype = { Carousel.prototype = {
...@@ -83,14 +86,14 @@ ...@@ -83,14 +86,14 @@
, fallback = type == 'next' ? 'first' : 'last' , fallback = type == 'next' ? 'first' : 'last'
, that = this , that = this
if (!$next.length) return
this.sliding = true this.sliding = true
isCycling && this.pause() isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]() $next = $next.length ? $next : this.$element.find('.item')[fallback]()
if ($next.hasClass('active')) return
if (!$.support.transition && this.$element.hasClass('slide')) { if (!$.support.transition && this.$element.hasClass('slide')) {
this.$element.trigger('slide') this.$element.trigger('slide')
$active.removeClass('active') $active.removeClass('active')
...@@ -136,6 +139,7 @@ ...@@ -136,6 +139,7 @@
$.fn.carousel.defaults = { $.fn.carousel.defaults = {
interval: 5000 interval: 5000
, pause: 'hover'
} }
$.fn.carousel.Constructor = Carousel $.fn.carousel.Constructor = Carousel
......
docs/assets/js/bootstrap-tooltip.js
+ 1
- 1
View file @ a3971306
...@@ -206,7 +206,7 @@ ...@@ -206,7 +206,7 @@
title = $e.attr('data-original-title') title = $e.attr('data-original-title')
|| (typeof o.title == 'function' ? o.title.call($e[0]) : o.title) || (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
title = title.toString().replace(/(^\s*|\s*$)/, "") title = (title || '').toString().replace(/(^\s*|\s*$)/, "")
return title return title
} }
......
docs/base-css.html
+ 59
- 54
View file @ a3971306
...@@ -166,7 +166,8 @@ ...@@ -166,7 +166,8 @@
Wraps abbreviations and acronyms to show the expanded version on hover Wraps abbreviations and acronyms to show the expanded version on hover
</td> </td>
<td> <td>
Include optional <code>title</code> for expanded text <p>Include optional <code>title</code> attribute for expanded text</p>
Use <code>.initialism</code> class for uppercase abbreviations.
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -205,8 +206,9 @@ ...@@ -205,8 +206,9 @@
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example abbreviations</h3> <h3>Example abbreviations</h3>
<p>Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.</p> <p>Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.</p>
<p><abbr title="HyperText Markup Language">HTML</abbr> is the best thing since sliced bread.</p> <p>Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.</p>
<p><abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.</p>
<p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p> <p>An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.</p>
</div> </div>
</div> </div>
...@@ -569,7 +571,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -569,7 +571,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<th>#</th> <th>#</th>
<th>First Name</th> <th>First Name</th>
<th>Last Name</th> <th>Last Name</th>
<th>Language</th> <th>Username</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -577,19 +579,19 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -577,19 +579,19 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td>Larry</td>
<td>Dent</td> <td>the Bird</td>
<td>HTML</td> <td>@twitter</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -614,7 +616,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -614,7 +616,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<th>#</th> <th>#</th>
<th>First Name</th> <th>First Name</th>
<th>Last Name</th> <th>Last Name</th>
<th>Language</th> <th>Username</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -622,19 +624,19 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -622,19 +624,19 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td>Larry</td>
<td>Dent</td> <td>the Bird</td>
<td>HTML</td> <td>@twitter</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -658,31 +660,31 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -658,31 +660,31 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<th>#</th> <th>#</th>
<th>First Name</th> <th>First Name</th>
<th>Last Name</th> <th>Last Name</th>
<th>Language</th> <th>Username</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>1</td> <td rowspan="2">1</td>
<td colspan="2">Mark Otto</td> <td>Mark</td>
<td>CSS</td> <td>Otto</td>
<td>@mdo</td>
</tr>
<tr>
<td>Mark</td>
<td>Otto</td>
<td>@TwBootstrap</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td rowspan="2">Javascript</td> <td>@fat</td>
</tr>
</tr>
<td>3</td>
<td>Stu</td>
<td>Dent</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Brosef</td> <td colspan="2">Larry the Bird</td>
<td>Stalin</td> <td>@twitter</td>
<td>HTML</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -706,7 +708,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -706,7 +708,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<th>#</th> <th>#</th>
<th>First Name</th> <th>First Name</th>
<th>Last Name</th> <th>Last Name</th>
<th>Language</th> <th>Username</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -714,19 +716,18 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -714,19 +716,18 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td colspan="2">Larry the Bird</td>
<td>Dent</td> <td>@twitter</td>
<td>HTML</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -747,37 +748,36 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -747,37 +748,36 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<div class="span8"> <div class="span8">
<table class="table table-striped table-bordered table-condensed"> <table class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr>
<th></th>
<th colspan="2">Full name</th>
<th></th>
</tr>
<tr> <tr>
<th>#</th> <th>#</th>
<th class="yellow">First Name</th> <th>First Name</th>
<th class="blue">Last Name</th> <th>Last Name</th>
<th class="green">Language</th> <th>Username</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<tr> <tr>
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td colspan="2">Larry the Bird</td>
<td>Dent</td> <td>@twitter</td>
<td>HTML</td>
</tr>
<tr>
<td>4</td>
<td>Brosef</td>
<td>Stalin</td>
<td>HTML</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -862,6 +862,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -862,6 +862,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<form class="well"> <form class="well">
<label>Label name</label> <label>Label name</label>
<input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span> <input type="text" class="span3" placeholder="Type something…"> <span class="help-inline">Associated help text!</span>
<p class="help-block">Example block-level help text here.</p>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox"> Check me out <input type="checkbox"> Check me out
</label> </label>
...@@ -908,7 +909,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -908,7 +909,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
<input type="text" class="input-small" placeholder="Email"> <input type="text" class="input-small" placeholder="Email">
<input type="password" class="input-small" placeholder="Password"> <input type="password" class="input-small" placeholder="Password">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox"> Remember? <input type="checkbox"> Remember me
</label> </label>
<button type="submit" class="btn">Sign in</button> <button type="submit" class="btn">Sign in</button>
</form> </form>
...@@ -916,7 +917,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -916,7 +917,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
&lt;form class="well form-inline"&gt; &lt;form class="well form-inline"&gt;
&lt;input type="text" class="input-small" placeholder="Email"&gt; &lt;input type="text" class="input-small" placeholder="Email"&gt;
&lt;input type="password" class="input-small" placeholder="Password"&gt; &lt;input type="password" class="input-small" placeholder="Password"&gt;
&lt;button type="submit" class="btn"&gt;Go&lt;/button&gt; &lt;label class="checkbox"&gt;
&lt;input type="checkbox"&gt; Remember me
&lt;/label&gt;
&lt;button type="submit" class="btn"&gt;Sign in&lt;/button&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div> </div>
...@@ -1512,9 +1516,6 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -1512,9 +1516,6 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</ul> </ul>
</div> </div>
</div> </div>
<div class="alert alert-info">
<strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code>. In the docs, we show a light red background color on hover to highlight the icon's size.
</div>
<br> <br>
...@@ -1527,7 +1528,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -1527,7 +1528,7 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
</div> </div>
<div class="span4"> <div class="span4">
<h3>How to use</h3> <h3>How to use</h3>
<p>With v2.0.1, we have opted to use an <code>&lt;i&gt;</code> tag for all our icons, but they have no case class&mdash;only a shared prefix. To use, place the following code just about anywhere:</p> <p>Bootstrap uses an <code>&lt;i&gt;</code> tag for all icons, but they have no case class&mdash;only a shared prefix. To use, place the following code just about anywhere:</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;i class="icon-search"&gt;&lt;/i&gt; &lt;i class="icon-search"&gt;&lt;/i&gt;
</pre> </pre>
...@@ -1536,6 +1537,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline. ...@@ -1536,6 +1537,10 @@ For example, &lt;code&gt;section&lt;/code&gt; should be wrapped as inline.
&lt;i class="icon-search icon-white"&gt;&lt;/i&gt; &lt;i class="icon-search icon-white"&gt;&lt;/i&gt;
</pre> </pre>
<p>There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p> <p>There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.</p>
<p>
<span class="label label-info">Heads up!</span>
When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code>&lt;i&gt;</code> tag for proper spacing.
</p>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Use cases</h3> <h3>Use cases</h3>
......
docs/components.html
+ 265
- 26
View file @ a3971306
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
</ul> </ul>
</li> </li>
<li><a href="#labels">Labels</a></li> <li><a href="#labels">Labels</a></li>
<li><a href="#badges">Badges</a></li>
<li><a href="#typography">Typography</a></li> <li><a href="#typography">Typography</a></li>
<li><a href="#thumbnails">Thumbnails</a></li> <li><a href="#thumbnails">Thumbnails</a></li>
<li><a href="#alerts">Alerts</a></li> <li><a href="#alerts">Alerts</a></li>
...@@ -175,9 +176,8 @@ ...@@ -175,9 +176,8 @@
<h3>Checkbox and radio flavors</h3> <h3>Checkbox and radio flavors</h3>
<p>Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View <a href="./javascript.html#buttons">the Javascript docs</a> for that.</p> <p>Button groups can also function as radios, where only one button may be active, or checkboxes, where any number of buttons may be active. View <a href="./javascript.html#buttons">the Javascript docs</a> for that.</p>
<p><a class="btn js-btn" href="./javascript.html#buttons">Get the javascript &raquo;</a></p> <p><a class="btn js-btn" href="./javascript.html#buttons">Get the javascript &raquo;</a></p>
<hr> <h3>Dropdowns in button groups</h3>
<h4 class="muted">Heads up</h4> <p><span class="label label-info">Heads up!</span> Buttons with dropdowns must be individually wrapped in their own <code>.btn-group</code> within a <code>.btn-toolbar</code> for proper rendering.</p>
<p class="muted">CSS for button groups is in a separate file, button-groups.less.</p>
</div> </div>
</div> </div>
</section> </section>
...@@ -188,12 +188,13 @@ ...@@ -188,12 +188,13 @@
================================================== --> ================================================== -->
<section id="buttonDropdowns"> <section id="buttonDropdowns">
<div class="page-header"> <div class="page-header">
<h1>Buttons dropdowns <small>Contextual dropdown menus built on button groups</small></h1> <h1>Button dropdown menus <small>Built on button groups to provide contextual menus</small></h1>
</div> </div>
<h2>Button dropdowns</h2>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<h3>Button dropdowns</h3> <h3>Overview and examples</h3>
<p>Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p> <p>Use any button to trigger a dropdown menu by placing it within a <code>.btn-group</code> and providing the proper menu markup.</p>
<div class="btn-toolbar" style="margin-top: 18px;"> <div class="btn-toolbar" style="margin-top: 18px;">
<div class="btn-group"> <div class="btn-group">
...@@ -248,6 +249,16 @@ ...@@ -248,6 +249,16 @@
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
</ul> </ul>
</div><!-- /btn-group --> </div><!-- /btn-group -->
<div class="btn-group">
<a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#">Inverse <span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div><!-- /btn-group -->
</div><!-- /btn-toolbar --> </div><!-- /btn-toolbar -->
<hr> <hr>
<p><span class="label label-info">Heads up!</span> Button dropdowns require the <a href="./javascript.html#dropdowns">Bootstrap dropdown plugin</a> to function.</p> <p><span class="label label-info">Heads up!</span> Button dropdowns require the <a href="./javascript.html#dropdowns">Bootstrap dropdown plugin</a> to function.</p>
...@@ -268,10 +279,14 @@ ...@@ -268,10 +279,14 @@
</pre> </pre>
</div> </div>
</div> </div>
<div class="alert alert-info">
<strong>Heads up!</strong> In some cases&mdash;like mobile&mdash;dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.
</div>
<h2>Split button dropdowns</h2>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<h3>Split button dropdowns</h3> <h3>Overview and examples</h3>
<p>Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.</p> <p>Building on the button group styles and markup, we can easily create a split button. Split buttons feature a standard action on the left and a dropdown toggle on the right with contextual links.</p>
<div class="btn-toolbar" style="margin-top: 18px;"> <div class="btn-toolbar" style="margin-top: 18px;">
<div class="btn-group"> <div class="btn-group">
...@@ -331,7 +346,41 @@ ...@@ -331,7 +346,41 @@
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
</ul> </ul>
</div><!-- /btn-group --> </div><!-- /btn-group -->
</div> <div class="btn-group">
<a class="btn btn-inverse" href="#">Inverse</a>
<a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div><!-- /btn-group -->
</div><!-- /btn-toolbar -->
<h3>Right aligned menus</h3>
<p>Add <code>.pull-right</code> to the <code>.dropdown-menu</code> of any button dropdown for right aligned menus.</p>
<div class="btn-toolbar">
<div class="btn-group">
<a class="btn" href="#">Right</a>
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu pull-right">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div><!-- /btn-group -->
</div><!-- /btn-toolbar -->
<pre class="prettyprint linenums">
&lt;div class="btn-group"&gt;
...
&lt;ul class="dropdown-menu pull-right"&gt;
&lt;!-- dropdown menu links --&gt;
&lt;/ul&gt;
&lt;/div&gt;
</pre>
</div> </div>
<div class="span8"> <div class="span8">
<h3>Example markup</h3> <h3>Example markup</h3>
...@@ -347,6 +396,44 @@ ...@@ -347,6 +396,44 @@
&lt;/ul&gt; &lt;/ul&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
<h3>Dropup menus</h3>
<p>Dropdown menus can also be toggled from the bottom up by adding a single class to the immediate parent of <code>.dropdown-menu</code>. It will flip the direction of the <code>.caret</code> and reposition the menu itself to move from the bottom up instead of top down.</p>
<div class="btn-toolbar" style="margin-top: 9px;">
<div class="btn-group dropup">
<a class="btn" href="#">Dropup</a>
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div><!-- /btn-group -->
<div class="btn-group dropup">
<a class="btn primary" href="#">Right dropup</a>
<a class="btn primary dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a>
<ul class="dropdown-menu pull-right">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</div><!-- /btn-group -->
</div>
<pre class="prettyprint linenums">
&lt;div class="btn-group dropup"&gt;
&lt;a class="btn" href="#"&gt;Dropup&lt;/a&gt;
&lt;a class="btn dropdown-toggle" data-toggle="dropdown" href="#"&gt;
&lt;span class="caret"&gt;&lt;/span&gt;
&lt;/a&gt;
&lt;ul class="dropdown-menu"&gt;
&lt;!-- dropdown menu links --&gt;
&lt;/ul&gt;
&lt;/div&gt;
</pre>
</div> </div>
</div> </div>
</section> </section>
...@@ -453,7 +540,7 @@ ...@@ -453,7 +540,7 @@
<h3>Tabs with dropdowns</h3> <h3>Tabs with dropdowns</h3>
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Help</a></li>
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a> <a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -464,6 +551,16 @@ ...@@ -464,6 +551,16 @@
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropup <b class="caret bottom-up"></b></a>
<ul class="dropdown-menu bottom-up pull-right">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</li>
</ul> </ul>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="nav nav-tabs"&gt; &lt;ul class="nav nav-tabs"&gt;
...@@ -485,7 +582,7 @@ ...@@ -485,7 +582,7 @@
<h3>Pills with dropdowns</h3> <h3>Pills with dropdowns</h3>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li class="active"><a href="#">Home</a></li> <li class="active"><a href="#">Home</a></li>
<li><a href="#">Profile</a></li> <li><a href="#">Help</a></li>
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a> <a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropdown <b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
...@@ -496,6 +593,16 @@ ...@@ -496,6 +593,16 @@
<li><a href="#">Separated link</a></li> <li><a href="#">Separated link</a></li>
</ul> </ul>
</li> </li>
<li class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown" href="#">Dropup <b class="caret bottom-up"></b></a>
<ul class="dropdown-menu bottom-up pull-right">
<li><a href="#">Action</a></li>
<li><a href="#">Another action</a></li>
<li><a href="#">Something else here</a></li>
<li class="divider"></li>
<li><a href="#">Separated link</a></li>
</ul>
</li>
</ul> </ul>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="nav nav-pills"&gt; &lt;ul class="nav nav-pills"&gt;
...@@ -521,8 +628,18 @@ ...@@ -521,8 +628,18 @@
<h3>Application-style navigation</h3> <h3>Application-style navigation</h3>
<p>Nav lists provide a simple and easy way to build groups of nav links with optional headers. They're best used in sidebars like the Finder in OS X.</p> <p>Nav lists provide a simple and easy way to build groups of nav links with optional headers. They're best used in sidebars like the Finder in OS X.</p>
<p>Structurally, they're built on the same core nav styles as tabs and pills, so usage and customization are straightforward.</p> <p>Structurally, they're built on the same core nav styles as tabs and pills, so usage and customization are straightforward.</p>
<hr>
<h4>With icons</h4> <h4>With icons</h4>
<p>Nav lists are also easy to equip with icons. Add the proper <code>&lt;i&gt;</code> tag with class and you're set.</p> <p>Nav lists are also easy to equip with icons. Add the proper <code>&lt;i&gt;</code> tag with class and you're set.</p>
<h4>Horizontal dividers</h4>
<p>Add a horizontal divider by creating an empty list item with the class <code>.divider</code>, like so:</p>
<pre class="prettyprint linenums">
&lt;ul class="nav nav-list"&gt;
...
&lt;li class="divider"&gt;&lt;/li&gt;
...
&lt;/ul&gt;
</pre>
</div> </div>
<div class="span4"> <div class="span4">
<h3>Example nav list</h3> <h3>Example nav list</h3>
...@@ -536,6 +653,7 @@ ...@@ -536,6 +653,7 @@
<li class="nav-header">Another list header</li> <li class="nav-header">Another list header</li>
<li><a href="#">Profile</a></li> <li><a href="#">Profile</a></li>
<li><a href="#">Settings</a></li> <li><a href="#">Settings</a></li>
<li class="divider"></li>
<li><a href="#">Help</a></li> <li><a href="#">Help</a></li>
</ul> </ul>
</div> <!-- /well --> </div> <!-- /well -->
...@@ -566,6 +684,7 @@ ...@@ -566,6 +684,7 @@
<li class="nav-header">Another list header</li> <li class="nav-header">Another list header</li>
<li><a href="#"><i class="icon-user"></i> Profile</a></li> <li><a href="#"><i class="icon-user"></i> Profile</a></li>
<li><a href="#"><i class="icon-cog"></i> Settings</a></li> <li><a href="#"><i class="icon-cog"></i> Settings</a></li>
<li class="divider"></li>
<li><a href="#"><i class="icon-flag"></i> Help</a></li> <li><a href="#"><i class="icon-flag"></i> Help</a></li>
</ul> </ul>
</div> <!-- /well --> </div> <!-- /well -->
...@@ -754,7 +873,7 @@ ...@@ -754,7 +873,7 @@
<p>An example of a static (not fixed to the top) navbar with project name, navigation, and search form.</p> <p>An example of a static (not fixed to the top) navbar with project name, navigation, and search form.</p>
<div class="navbar"> <div class="navbar">
<div class="navbar-inner"> <div class="navbar-inner">
<div class="container" style="width: auto;"> <div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse"> <a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
...@@ -816,13 +935,24 @@ ...@@ -816,13 +935,24 @@
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
<h3>Fixed navbar</h3> <h3>Fixed navbar</h3>
<p>To make the navbar fixed to the top of the viewport, add <code>.navbar-fixed-top</code> to the outermost div, <code>.navbar</code>.</p> <p>Fix the navbar to the top or bottom of the viewport with an additional class on the outermost div, <code>.navbar</code>.</p>
<div class="row">
<div class="span4">
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="navbar navbar-fixed-top"&gt; &lt;div class="navbar navbar-fixed-top"&gt;
... ...
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
<p>In your CSS, you will also need to account for the overlap it causes by adding 40px or more of padding to your <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p> </div><!--/span-->
<div class="span4">
<pre class="prettyprint linenums">
&lt;div class="navbar navbar-fixed-bottom"&gt;
...
&lt;/div&gt;
</pre>
</div><!--/span-->
</div><!--/row-->
<p>When you affix the navbar, remember to account for the hidden area underneath. Add 40px or more of apdding to the <code>&lt;body&gt;</code>. Be sure to add this after the core Bootstrap CSS and before the optional responsive CSS.</p>
<h3>Brand name</h3> <h3>Brand name</h3>
<p>A simple link to show your brand or project name only requires an anchor tag.</p> <p>A simple link to show your brand or project name only requires an anchor tag.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -830,8 +960,14 @@ ...@@ -830,8 +960,14 @@
Project name Project name
&lt;/a&gt; &lt;/a&gt;
</pre> </pre>
<h3>Search form</h3> <h3>Forms in navbar</h3>
<p>Search forms receive custom styles in the navbar with the <code>.navbar-search</code> class. Include <code>.pull-left</code> or <code>.pull-right</code> on the <code>form</code> to align it.</p> <p>To properly style and position a form within the navbar, add the appropriate classes as shown below. For a default form, include <code>.navbar-form</code> and either <code>.pull-left</code> or <code>.pull-right</code> to properly align it.</p>
<pre class="prettyprint linenums">
&lt;form class="navbar-form pull-left"&gt;
&lt;input type="text" class="span2"&gt;
&lt;/form&gt;
</pre>
<p>For a more customized search form, add the <code>.navbar-search</code> class to receive specialized styles in the navbar.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;form class="navbar-search pull-left"&gt; &lt;form class="navbar-search pull-left"&gt;
&lt;input type="text" class="search-query" placeholder="Search"&gt; &lt;input type="text" class="search-query" placeholder="Search"&gt;
...@@ -890,8 +1026,8 @@ ...@@ -890,8 +1026,8 @@
</pre> </pre>
<h3>Component alignment</h3> <h3>Component alignment</h3>
<p>To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p> <p>To align a nav, search form, or text, use the <code>.pull-left</code> or <code>.pull-right</code> utility classes. Both classes will add a CSS float in the specified direction.</p>
<h3>Adding dropdowns</h3> <h3>Adding dropdown menus</h3>
<p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.</p> <p>Adding dropdowns and dropups to the nav is super simple, but does require the use of <a href="./javascript.html/#dropdown">our javascript plugin</a>.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="nav"&gt; &lt;ul class="nav"&gt;
&lt;li class="dropdown"&gt; &lt;li class="dropdown"&gt;
...@@ -908,6 +1044,9 @@ ...@@ -908,6 +1044,9 @@
&lt;/ul&gt; &lt;/ul&gt;
</pre> </pre>
<p><a class="btn" href="./javascript.html#dropdowns">Get the javascript &rarr;</a></p> <p><a class="btn" href="./javascript.html#dropdowns">Get the javascript &rarr;</a></p>
<hr>
<h3>Text in the navbar</h3>
<p>Wrap strings of text in a <code>&lt;p&gt;</code> tag for proper leading and color.</p>
</div><!-- /.span --> </div><!-- /.span -->
</div><!-- /.row --> </div><!-- /.row -->
...@@ -953,9 +1092,7 @@ ...@@ -953,9 +1092,7 @@
&lt;li&gt; &lt;li&gt;
&lt;a href="#"&gt;Library&lt;/a&gt; &lt;span class="divider"&gt;/&lt;/span&gt; &lt;a href="#"&gt;Library&lt;/a&gt; &lt;span class="divider"&gt;/&lt;/span&gt;
&lt;/li&gt; &lt;/li&gt;
&lt;li class="active"&gt; &lt;li class="active"&gt;Data&lt;/li&gt;
&lt;a href="#"&gt;Data&lt;/a&gt;
&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
</pre> </pre>
</div> </div>
...@@ -1144,12 +1281,116 @@ ...@@ -1144,12 +1281,116 @@
<code>&lt;span class="label label-info"&gt;Info&lt;/span&gt;</code> <code>&lt;span class="label label-info"&gt;Info&lt;/span&gt;</code>
</td> </td>
</tr> </tr>
<tr>
<td>
<span class="label label-inverse">Inverse</span>
</td>
<td>
<code>&lt;span class="label label-inverse"&gt;Inverse&lt;/span&gt;</code>
</td>
</tr>
</tbody> </tbody>
</table> </table>
</section> </section>
<!-- Badges
================================================== -->
<section id="badges">
<div class="page-header">
<h1>Badges <small>Indicators and unread counts</small></h1>
</div>
<div class="row">
<div class="span4">
<h3>About</h3>
<p>Badges are small, simple components for displaying an indicator or count of some sort. They're commonly found in email clients like Mail.app or on mobile apps for push notifications.</p>
</div><!-- /.span -->
<div class="span8">
<h3>Available classes</h3>
<table class="table table-bordered table-striped">
<thead>
<tr>
<th>Name</th>
<th>Example</th>
<th>Markup</th>
</tr>
</thead>
<tbody>
<tr>
<td>
Default
</td>
<td>
<span class="badge">1</span>
</td>
<td>
<code>&lt;span class="badge"&gt;1&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
Success
</td>
<td>
<span class="badge badge-success">2</span>
</td>
<td>
<code>&lt;span class="badge badge-success"&gt;2&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
Warning
</td>
<td>
<span class="badge badge-warning">4</span>
</td>
<td>
<code>&lt;span class="badge badge-warning"&gt;4&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
Error
</td>
<td>
<span class="badge badge-error">6</span>
</td>
<td>
<code>&lt;span class="badge badge-error"&gt;1&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
Info
</td>
<td>
<span class="badge badge-info">8</span>
</td>
<td>
<code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
Inverse
</td>
<td>
<span class="badge badge-inverse">10</span>
</td>
<td>
<code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
</td>
</tr>
</tbody>
</table>
</div><!-- /.span -->
</div><!-- /.row -->
</section>
<!-- Typographic components <!-- Typographic components
================================================== --> ================================================== -->
<section id="typography"> <section id="typography">
...@@ -1188,8 +1429,11 @@ ...@@ -1188,8 +1429,11 @@
<p>A simple shell for an <code>h1</code> to appropratiely space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).</p> <p>A simple shell for an <code>h1</code> to appropratiely space out and segment sections of content on a page. It can utilize the <code>h1</code>'s default <code>small</code>, element as well most other components (with additional styles).</p>
</div> </div>
<div class="span8"> <div class="span8">
<div class="page-header">
<h1>Example page header <small>Subtext for header</small></h1>
</div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="page-haeder"&gt; &lt;div class="page-header"&gt;
&lt;h1&gt;Example page header&lt;/h1&gt; &lt;h1&gt;Example page header&lt;/h1&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
...@@ -1525,7 +1769,7 @@ ...@@ -1525,7 +1769,7 @@
================================================== --> ================================================== -->
<section id="misc"> <section id="misc">
<div class="page-header"> <div class="page-header">
<h1>Miscellaneous <small>Wells, badges, and close icon</small></h1> <h1>Miscellaneous <small>Lightweight utility components</small></h1>
</div> </div>
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
...@@ -1539,11 +1783,6 @@ ...@@ -1539,11 +1783,6 @@
... ...
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</div><!--/span-->
<div class="span4" style="display: none;">
<h2>Badges</h2>
<p>Use a badge on an element for an unread count or as a simple indicator.</p>
<pre class="prettyprint linenums">&lt;span class="badge"&gt;3&lt;/div&gt;</pre>
</div><!--/span--> </div><!--/span-->
<div class="span4"> <div class="span4">
<h2>Close icon</h2> <h2>Close icon</h2>
......
docs/download.html
+ 2
- 1
View file @ a3971306
...@@ -108,6 +108,7 @@ ...@@ -108,6 +108,7 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label> <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> Headings, body, etc</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label> <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> Code and pre</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> Labels</label> <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> Labels</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="badges.less"> Badges</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label> <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> Tables</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label> <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> Forms</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label> <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> Buttons</label>
...@@ -210,7 +211,7 @@ ...@@ -210,7 +211,7 @@
</div><!-- /span --> </div><!-- /span -->
<div class="span4"> <div class="span4">
<h4 class="muted">Heads up!</h4> <h4 class="muted">Heads up!</h4>
<p class="muted">All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p> <p class="muted">All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
</div><!-- /span --> </div><!-- /span -->
</div><!-- /row --> </div><!-- /row -->
</section> </section>
......
docs/examples/fluid.html
+ 5
- 5
View file @ a3971306
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<!-- Le fav and touch icons --> <!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico"> <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png"> <link rel="apple-touch-icon" href="../assets/ico/bootstrap-apple-57x57.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="../assets/ico/bootstrap-apple-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="../assets/ico/bootstrap-apple-114x114.png">
</head> </head>
<body> <body>
......
docs/examples/hero.html
+ 5
- 5
View file @ a3971306
...@@ -19,14 +19,14 @@ ...@@ -19,14 +19,14 @@
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<!-- Le fav and touch icons --> <!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico"> <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png"> <link rel="apple-touch-icon" href="../assets/ico/bootstrap-apple-57x57.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="../assets/ico/bootstrap-apple-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="../assets/ico/bootstrap-apple-114x114.png">
</head> </head>
<body> <body>
......
docs/examples/starter-template.html
+ 5
- 5
View file @ a3971306
...@@ -18,14 +18,14 @@ ...@@ -18,14 +18,14 @@
<!-- Le HTML5 shim, for IE6-8 support of HTML5 elements --> <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
<!--[if lt IE 9]> <!--[if lt IE 9]>
<script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script> <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]--> <![endif]-->
<!-- Le fav and touch icons --> <!-- Le fav and touch icons -->
<link rel="shortcut icon" href="images/favicon.ico"> <link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon" href="images/apple-touch-icon.png"> <link rel="apple-touch-icon" href="../assets/ico/bootstrap-apple-57x57.png">
<link rel="apple-touch-icon" sizes="72x72" href="images/apple-touch-icon-72x72.png"> <link rel="apple-touch-icon" sizes="72x72" href="../assets/ico/bootstrap-apple-72x72.png">
<link rel="apple-touch-icon" sizes="114x114" href="images/apple-touch-icon-114x114.png"> <link rel="apple-touch-icon" sizes="114x114" href="../assets/ico/bootstrap-apple-114x114.png">
</head> </head>
<body> <body>
......
docs/index.html
+ 1
- 1
View file @ a3971306
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p> <p>Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.</p>
<p class="download-info"> <p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">View project on GitHub</a> <a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">View project on GitHub</a>
<a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap</a> <a href="assets/bootstrap.zip" class="btn btn-large">Download Bootstrap <small>(v2.0.2)</small></a>
</p> </p>
</div> </div>
......
docs/javascript.html
+ 25
- 8
View file @ a3971306
...@@ -214,8 +214,8 @@ ...@@ -214,8 +214,8 @@
<p>One fine body…</p> <p>One fine body…</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="btn btn-primary">Save changes</a>
<a href="#" class="btn">Close</a> <a href="#" class="btn">Close</a>
<a href="#" class="btn btn-primary">Save changes</a>
</div> </div>
</div> </div>
</div> <!-- /well --> </div> <!-- /well -->
...@@ -237,10 +237,21 @@ ...@@ -237,10 +237,21 @@
<h4>Tooltips in a modal</h4> <h4>Tooltips in a modal</h4>
<p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.</p> <p><a href="#" class="tooltip-test" title="Tooltip">This link</a> and <a href="#" class="tooltip-test" title="Tooltip">that link</a> should have tooltips on hover.</p>
<hr>
<h4>Overflowing text to show optional scrollbar</h4>
<p>We set a fixed <code>max-height</code> on the <code>.modal-body</code>. Watch it overflow with all this extra lorem ipsum text we've included.</p>
<p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
<p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
<p>Cras mattis consectetur purus sit amet fermentum. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Morbi leo risus, porta ac consectetur ac, vestibulum at eros.</p>
<p>Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Vivamus sagittis lacus vel augue laoreet rutrum faucibus dolor auctor.</p>
<p>Aenean lacinia bibendum nulla sed consectetur. Praesent commodo cursus magna, vel scelerisque nisl consectetur et. Donec sed odio dui. Donec ullamcorper nulla non metus auctor fringilla.</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" class="btn btn-primary">Save changes</a>
<a href="#" class="btn" data-dismiss="modal" >Close</a> <a href="#" class="btn" data-dismiss="modal" >Close</a>
<a href="#" class="btn btn-primary">Save changes</a>
</div> </div>
</div> </div>
<a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a> <a data-toggle="modal" href="#myModal" class="btn btn-primary btn-large">Launch demo modal</a>
...@@ -265,7 +276,7 @@ ...@@ -265,7 +276,7 @@
<td>backdrop</td> <td>backdrop</td>
<td>boolean</td> <td>boolean</td>
<td>true</td> <td>true</td>
<td>Includes a modal-backdrop element</td> <td>Includes a modal-backdrop element. Alternatively, specify <code>static</code> for a backdrop which doesn't close the modal on click.</td>
</tr> </tr>
<tr> <tr>
<td>keyboard</td> <td>keyboard</td>
...@@ -298,8 +309,8 @@ ...@@ -298,8 +309,8 @@
&lt;p&gt;One fine body…&lt;/p&gt; &lt;p&gt;One fine body…&lt;/p&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;div class="modal-footer"&gt; &lt;div class="modal-footer"&gt;
&lt;a href="#" class="btn btn-primary"&gt;Save changes&lt;/a&gt;
&lt;a href="#" class="btn"&gt;Close&lt;/a&gt; &lt;a href="#" class="btn"&gt;Close&lt;/a&gt;
&lt;a href="#" class="btn btn-primary"&gt;Save changes&lt;/a&gt;
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
...@@ -464,7 +475,7 @@ $('#myModal').on('hidden', function () { ...@@ -464,7 +475,7 @@ $('#myModal').on('hidden', function () {
</div> </div>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;ul class="nav pills"&gt; &lt;ul class="nav nav-pills"&gt;
&lt;li class="active"&gt;&lt;a href="#"&gt;Regular link&lt;/a&gt;&lt;/li&gt; &lt;li class="active"&gt;&lt;a href="#"&gt;Regular link&lt;/a&gt;&lt;/li&gt;
&lt;li class="dropdown" id="menu1"&gt; &lt;li class="dropdown" id="menu1"&gt;
&lt;a class="dropdown-toggle" data-toggle="dropdown" href="#menu1"&gt; &lt;a class="dropdown-toggle" data-toggle="dropdown" href="#menu1"&gt;
...@@ -1299,10 +1310,16 @@ $('#myCollapsible').on('hidden', function () { ...@@ -1299,10 +1310,16 @@ $('#myCollapsible').on('hidden', function () {
<td>5000</td> <td>5000</td>
<td>The amount of time to delay between automatically cycling an item.</td> <td>The amount of time to delay between automatically cycling an item.</td>
</tr> </tr>
<tr>
<td>pause</td>
<td>string</td>
<td>"hover"</td>
<td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td>
</tr>
</tbody> </tbody>
</table> </table>
<h3>Markup</h3> <h3>Markup</h3>
<p>Data attributes are integral to the carousel plugin. Check out the example code below for the various markup types.</p> <p>Data attributes are used for the previous and next conrols. Check out the example markup below.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div id="myCarousel" class="carousel"&gt; &lt;div id="myCarousel" class="carousel"&gt;
&lt;!-- Carousel items --&gt; &lt;!-- Carousel items --&gt;
...@@ -1320,7 +1337,7 @@ $('#myCollapsible').on('hidden', function () { ...@@ -1320,7 +1337,7 @@ $('#myCollapsible').on('hidden', function () {
<h4>.carousel(options)</h4> <h4>.carousel(options)</h4>
<p>Initializes the carousel with an optional options <code>object</code> and starts cycling through items.</p> <p>Initializes the carousel with an optional options <code>object</code> and starts cycling through items.</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
$('.myCarousel').carousel({ $('.carousel').carousel({
interval: 2000 interval: 2000
}) })
</pre> </pre>
...@@ -1335,7 +1352,7 @@ $('.myCarousel').carousel({ ...@@ -1335,7 +1352,7 @@ $('.myCarousel').carousel({
<h4>.carousel('next')</h4> <h4>.carousel('next')</h4>
<p>Cycles to the next item.</p> <p>Cycles to the next item.</p>
<h3>Events</h3> <h3>Events</h3>
<p>Bootstrap's modal class exposes a few events for hooking into modal functionality.</p> <p>Bootstrap's carousel class exposes two events for hooking into carousel functionality.</p>
<table class="table table-bordered table-striped"> <table class="table table-bordered table-striped">
<thead> <thead>
<tr> <tr>
......
docs/scaffolding.html
+ 168
- 43
View file @ a3971306
...@@ -81,8 +81,9 @@ ...@@ -81,8 +81,9 @@
<p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p> <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
<div class="subnav"> <div class="subnav">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li><a href="#global">Global styles</a></li>
<li><a href="#gridSystem">Grid system</a></li> <li><a href="#gridSystem">Grid system</a></li>
<li><a href="#fluidGridSystem">Fluid gird system</a></li> <li><a href="#fluidGridSystem">Fluid grid system</a></li>
<li><a href="#gridCustomization">Customizing</a></li> <li><a href="#gridCustomization">Customizing</a></li>
<li><a href="#layouts">Layouts</a></li> <li><a href="#layouts">Layouts</a></li>
<li><a href="#responsive">Responsive design</a></li> <li><a href="#responsive">Responsive design</a></li>
...@@ -92,6 +93,45 @@ ...@@ -92,6 +93,45 @@
<!-- Global Bootstrap settings
================================================== -->
<section id="global">
<div class="page-header">
<h1>Global styles <small>for CSS reset, typography, and links</small></h1>
</div>
<div class="row">
<div class="span4">
<h2>Requires HTML5 doctype</h2>
<p>Bootstrap makes use of HTML elements and CSS properties that require the use of the HTML5 doctype. Be sure to include it at the beginning of every Bootstrapped page in your project.</p>
<pre class="prettyprint linenums">
&lt;!DOCTYPE html&gt;
&lt;html lang="en"&gt;
...
&lt;/html&gt;
</pre>
</div><!-- /.span -->
<div class="span4">
<h2>Typography and links</h2>
<p>Within the <strong>scaffolding.less</strong> file, we set basic global display, typography, and link styles. Specifically, we:</p>
<ul>
<li>Remove margin on the body</li>
<li>Set <code>background-color: white;</code> on the <code>body</code></li>
<li>Use the <code>@baseFontFamily</code>, <code>@baseFontSize</code>, and <code>@baseLineHeight</code> attributes as our typographyic base</li>
<li>Set the global link color via <code>@linkColor</code> and apply link underlines only on <code>:hover</code></li>
</ul>
</div><!-- /.span -->
<div class="span4">
<h2>Reset via Normalize</h2>
<p>As of Bootstrap 2, the traditional CSS reset has evolved to make use of elements from <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize.css</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> that also powers the <a href="http://html5boilerplate.com" target="_blank">HTML5 Boilerplate</a>.</p>
<p>The new reset can still be found in <strong>reset.less</strong>, but with many elements removed for brevity and accuracy.</p>
</div><!-- /.span -->
</div><!-- /.row -->
</section>
<!-- Grid system <!-- Grid system
================================================== --> ================================================== -->
<section id="gridSystem"> <section id="gridSystem">
...@@ -133,7 +173,7 @@ ...@@ -133,7 +173,7 @@
<div class="span4"> <div class="span4">
<p>The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.</p> <p>The default grid system provided as part of Bootstrap is a <strong>940px-wide, 12-column grid</strong>.</p>
<p>It also has four responsive variations for various devices and resolutions: phone, tablet portrait, table landscape and small desktops, and large widescreen desktops.</p> <p>It also has four responsive variations for various devices and resolutions: phone, tablet portrait, table landscape and small desktops, and large widescreen desktops.</p>
</div> </div><!-- /.span -->
<div class="span4"> <div class="span4">
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
...@@ -141,11 +181,11 @@ ...@@ -141,11 +181,11 @@
&lt;div class="span8"&gt;...&lt;/div&gt; &lt;div class="span8"&gt;...&lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</div> </div><!-- /.span -->
<div class="span4"> <div class="span4">
<p>As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.</p> <p>As shown here, a basic layout can be created with two "columns," each spanning a number of the 12 foundational columns we defined as part of our grid system.</p>
</div> </div><!-- /.span -->
</div><!-- /row --> </div><!-- /.row -->
<br> <br>
...@@ -189,7 +229,7 @@ ...@@ -189,7 +229,7 @@
</div> </div>
</div> </div>
</div> </div>
</div><!-- /span6 --> </div><!-- /.span -->
<div class="span6"> <div class="span6">
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row"&gt; &lt;div class="row"&gt;
...@@ -202,8 +242,8 @@ ...@@ -202,8 +242,8 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</div> </div><!-- /.span -->
</div> </div><!-- /.row -->
</section> </section>
...@@ -251,11 +291,11 @@ ...@@ -251,11 +291,11 @@
<div class="span4"> <div class="span4">
<h3>Percents, not pixels</h3> <h3>Percents, not pixels</h3>
<p>The fluid grid system uses percents for column widths instead of fixed pixels. It also has the same responsive variations as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.</p> <p>The fluid grid system uses percents for column widths instead of fixed pixels. It also has the same responsive variations as our fixed grid system, ensuring proper proportions for key screen resolutions and devices.</p>
</div> </div><!-- /.span -->
<div class="span4"> <div class="span4">
<h3>Fluid rows</h3> <h3>Fluid rows</h3>
<p>Make any row fluid simply by changing <code>.row</code> to <code>.row-fluid</code>. The columns stay the exact same, making it super straightforward to flip between fixed and fluid layouts.</p> <p>Make any row fluid simply by changing <code>.row</code> to <code>.row-fluid</code>. The columns stay the exact same, making it super straightforward to flip between fixed and fluid layouts.</p>
</div> </div><!-- /.span -->
<div class="span4"> <div class="span4">
<h3>Markup</h3> <h3>Markup</h3>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
...@@ -264,8 +304,8 @@ ...@@ -264,8 +304,8 @@
&lt;div class="span8"&gt;...&lt;/div&gt; &lt;div class="span8"&gt;...&lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</div> </div><!-- /.span -->
</div><!-- /row --> </div><!-- /.row -->
<h2>Fluid nesting</h2> <h2>Fluid nesting</h2>
<div class="row"> <div class="row">
...@@ -284,7 +324,7 @@ ...@@ -284,7 +324,7 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div><!-- /.span -->
<div class="span6"> <div class="span6">
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;div class="row-fluid"&gt; &lt;div class="row-fluid"&gt;
...@@ -297,8 +337,8 @@ ...@@ -297,8 +337,8 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</div> </div><!-- /.span -->
</div> </div><!-- /.row -->
</section> </section>
...@@ -345,16 +385,16 @@ ...@@ -345,16 +385,16 @@
<div class="span4"> <div class="span4">
<h3>Variables in LESS</h3> <h3>Variables in LESS</h3>
<p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.</p> <p>Built into Bootstrap are a handful of variables for customizing the default 940px grid system, documented above. All variables for the grid are stored in variables.less.</p>
</div> </div><!-- /.span -->
<div class="span4"> <div class="span4">
<h3>How to customize</h3> <h3>How to customize</h3>
<p>Modifying the grid means changing the three <code>@grid*</code> variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the <a href="less.html#compiling">four ways documented to recompile</a>. If you're adding more columns, be sure to add the CSS for those in grid.less.</p> <p>Modifying the grid means changing the three <code>@grid*</code> variables and recompiling Bootstrap. Change the grid variables in variables.less and use one of the <a href="less.html#compiling">four ways documented to recompile</a>. If you're adding more columns, be sure to add the CSS for those in grid.less.</p>
</div> </div><!-- /.span -->
<div class="span4"> <div class="span4">
<h3>Staying responsive</h3> <h3>Staying responsive</h3>
<p>Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.</p> <p>Customization of the grid only works at the default level, the 940px grid. To maintain the responsive aspects of Bootstrap, you'll also have to customize the grids in responsive.less.</p>
</div> </div><!-- /.span -->
</div><!-- /row --> </div><!-- /.row -->
</section> </section>
...@@ -381,7 +421,7 @@ ...@@ -381,7 +421,7 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/body&gt; &lt;/body&gt;
</pre> </pre>
</div><!-- /col --> </div><!-- /.span -->
<div class="span6"> <div class="span6">
<h2>Fluid layout</h2> <h2>Fluid layout</h2>
<p><code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p> <p><code>&lt;div class="container-fluid"&gt;</code> gives flexible page structure, min- and max-widths, and a left-hand sidebar. It's great for apps and docs.</p>
...@@ -401,8 +441,8 @@ ...@@ -401,8 +441,8 @@
&lt;/div&gt; &lt;/div&gt;
&lt;/div&gt; &lt;/div&gt;
</pre> </pre>
</div><!-- /col --> </div><!-- /.span -->
</div><!-- /row --> </div><!-- /.row -->
</section> </section>
...@@ -417,8 +457,16 @@ ...@@ -417,8 +457,16 @@
<!-- Supported devices --> <!-- Supported devices -->
<div class="row"> <div class="row">
<div class="span4"> <div class="span4">
<img src="assets/img/responsive-illustrations.png" alt="Responsive devices"> <p><img src="assets/img/responsive-illustrations.png" alt="Responsive devices"></p>
</div> <h3>What they do</h3>
<p>Media queries allow for custom CSS based on a number of conditions&mdash;ratios, widths, display type, etc&mdash;but usually focuses around <code>min-width</code> and <code>max-width</code>.</p>
<ul>
<li>Modify the width of column in our grid</li>
<li>Stack elements instead of float wherever necessary</li>
<li>Resize headings and text to be more appropriate for devices</li>
</ul>
<p>Use media queries responsibly and only as a start to your mobile audiences. For larger projects, do consider dedicated code bases and not layers of media queries.</p>
</div><!-- /.span -->
<div class="span8"> <div class="span8">
<h2>Supported devices</h2> <h2>Supported devices</h2>
<p>Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p> <p>Bootstrap supports a handful of media queries in a single file to help make your projects more appropriate on different devices and screen resolutions. Here's what's included:</p>
...@@ -438,13 +486,13 @@ ...@@ -438,13 +486,13 @@
<td class="muted" colspan="2">Fluid columns, no fixed widths</td> <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
</tr> </tr>
<tr> <tr>
<td>Portrait tablets</td> <td>Smartphones to tablets</td>
<td>480px to 768px</td> <td>767px and below</td>
<td class="muted" colspan="2">Fluid columns, no fixed widths</td> <td class="muted" colspan="2">Fluid columns, no fixed widths</td>
</tr> </tr>
<tr> <tr>
<td>Landscape tablets</td> <td>Portrait tablets</td>
<td>768px to 979px</td> <td>768px and above</td>
<td>42px</td> <td>42px</td>
<td>20px</td> <td>20px</td>
</tr> </tr>
...@@ -466,23 +514,15 @@ ...@@ -466,23 +514,15 @@
<h3>Requires meta tag</h3> <h3>Requires meta tag</h3>
<p>To ensure devices display responsive pages properly, include the viewport meta tag.</p> <p>To ensure devices display responsive pages properly, include the viewport meta tag.</p>
<pre class="prettyprint linenums">&lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;</pre> <pre class="prettyprint linenums">&lt;meta name="viewport" content="width=device-width, initial-scale=1.0"&gt;</pre>
</div><!-- /.span -->
<h3>What they do</h3> </div><!-- /.row -->
<p>Media queries allow for custom CSS based on a number of conditions&mdash;ratios, widths, display type, etc&mdash;but usually focuses around <code>min-width</code> and <code>max-width</code>.</p>
<ul>
<li>Modify the width of column in our grid</li>
<li>Stack elements instead of float wherever necessary</li>
<li>Resize headings and text to be more appropriate for devices</li>
</ul>
</div>
</div>
<br> <br>
<!-- Media query code --> <!-- Media query code -->
<h2>Using the media queries</h2> <h2>Using the media queries</h2>
<div class="row"> <div class="row">
<div class="span5"> <div class="span4">
<p>Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:</p> <p>Bootstrap doesn't automatically include these media queries, but understanding and adding them is very easy and requires minimal setup. You have a few options for including the responsive features of Bootstrap:</p>
<ol> <ol>
<li>Use the compiled responsive version, bootstrap-responsive.css</li> <li>Use the compiled responsive version, bootstrap-responsive.css</li>
...@@ -490,8 +530,8 @@ ...@@ -490,8 +530,8 @@
<li>Modify and recompile responsive.less as a separate file</li> <li>Modify and recompile responsive.less as a separate file</li>
</ol> </ol>
<p><strong>Why not just include it?</strong> Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.</p> <p><strong>Why not just include it?</strong> Truth be told, not everything needs to be responsive. Instead of encouraging developers to remove this feature, we figure it best to enable it.</p>
</div> </div><!-- /.span -->
<div class="span7"> <div class="span8">
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
// Landscape phones and down // Landscape phones and down
@media (max-width: 480px) { ... } @media (max-width: 480px) { ... }
...@@ -505,8 +545,93 @@ ...@@ -505,8 +545,93 @@
// Large desktop // Large desktop
@media (min-width: 1200px) { .. } @media (min-width: 1200px) { .. }
</pre> </pre>
</div> </div><!-- /.span -->
</div> </div><!-- /.row -->
<br>
<!-- Responsive utility classes -->
<h2>Responsive utility classes</h2>
<div class="row">
<div class="span4">
<h3>What are they</h2>
<p>For faster mobile-friendly development, use these basic utility classes for showing and hidding content by device.</p>
<h3>When to use</h2>
<p>Use on a limited basis and avoid creating entirely different versions of the same site. Instead, use them to complement each device's presentation.</p>
<p>For example, you might show a <code>&lt;select&gt;</code> element for nav on mobile layouts, but not on tablets or desktops.</p>
</div><!-- /.span -->
<div class="span8">
<h3>Support classes</h3>
<p>Shown here is a table of the classes we support and their effect on a given media query layout (labeled by device). They can be found in <code>responsive.less</code>.</p>
<table class="table table-bordered table-striped responsive-utilities">
<thead>
<tr>
<th>Class</th>
<th>Phones <small>480px and below</small></th>
<th>Tablets <small>767px and below</small></th>
<th>Desktops <small>768px and above</small></th>
</tr>
</thead>
<tbody>
<tr>
<th><code>.visible-phone</code></th>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
</tr>
<tr>
<th><code>.visible-tablet</code></th>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
</tr>
<tr>
<th><code>.visible-desktop</code></th>
<td class="is-hidden">Hidden</td>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
</tr>
<tr>
<th><code>.hidden-phone</code></th>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
</tr>
<tr>
<th><code>.hidden-tablet</code></th>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
<td class="is-visible">Visible</td>
</tr>
<tr>
<th><code>.hidden-desktop</code></th>
<td class="is-visible">Visible</td>
<td class="is-visible">Visible</td>
<td class="is-hidden">Hidden</td>
</tr>
</tbody>
</table>
<h3>Test case</h3>
<p>Resize your browser or load on different devices to test the above clases.</p>
<h4>Visible on...</h4>
<ul class="responsive-utilities-test">
<li>Phone<span class="visible-phone">&#10004; Phone</span></li>
<li>Tablet<span class="visible-tablet">&#10004; Tablet</span></li>
<li>Desktop<span class="visible-desktop">&#10004; Desktop</span></li>
</ul>
<h4>Hidden on...</h4>
<ul class="responsive-utilities-test hidden-on">
<li>Phone<span class="hidden-phone">&#10004; Phone</span></li>
<li>Tablet<span class="hidden-tablet">&#10004; Tablet</span></li>
<li>Desktop<span class="hidden-desktop">&#10004; Desktop</span></li>
</ul>
</div><!-- /.span -->
</div><!-- /.row -->
<div class="row">
<div class="span4">
</div><!-- /.span -->
</div><!-- /.row -->
</section> </section>
......
docs/templates/pages/base-css.mustache
+ 59
- 54
View file @ a3971306
...@@ -90,7 +90,8 @@ ...@@ -90,7 +90,8 @@
{{_i}}Wraps abbreviations and acronyms to show the expanded version on hover{{/i}} {{_i}}Wraps abbreviations and acronyms to show the expanded version on hover{{/i}}
</td> </td>
<td> <td>
{{_i}}Include optional <code>title</code> for expanded text{{/i}} <p>{{_i}}Include optional <code>title</code> attribute for expanded text{{/i}}</p>
{{_i}}Use <code>.initialism</code> class for uppercase abbreviations.{{/i}}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -129,8 +130,9 @@ ...@@ -129,8 +130,9 @@
</div> </div>
<div class="span4"> <div class="span4">
<h3>{{_i}}Example abbreviations{{/i}}</h3> <h3>{{_i}}Example abbreviations{{/i}}</h3>
<p>{{_i}}Abbreviations are styled with uppercase text and a light dotted bottom border. They also have a help cursor on hover so users have extra indication something will be shown on hover.{{/i}}</p> <p>{{_i}}Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover. This gives users extra indication something will be shown on hover.{{/i}}</p>
<p>{{_i}}<abbr title="HyperText Markup Language">HTML</abbr> is the best thing since sliced bread.{{/i}}</p> <p>{{_i}}Add the <code>initialism</code> class to an abbreviation to increase typographic harmony by giving it a slightly smaller text size.{{/i}}</p>
<p>{{_i}}<abbr title="HyperText Markup Language" class="initialism">HTML</abbr> is the best thing since sliced bread.{{/i}}</p>
<p>{{_i}}An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.{{/i}}</p> <p>{{_i}}An abbreviation of the word attribute is <abbr title="attribute">attr</abbr>.{{/i}}</p>
</div> </div>
</div> </div>
...@@ -493,7 +495,7 @@ ...@@ -493,7 +495,7 @@
<th>#</th> <th>#</th>
<th>{{_i}}First Name{{/i}}</th> <th>{{_i}}First Name{{/i}}</th>
<th>{{_i}}Last Name{{/i}}</th> <th>{{_i}}Last Name{{/i}}</th>
<th>{{_i}}Language{{/i}}</th> <th>{{_i}}Username{{/i}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -501,19 +503,19 @@ ...@@ -501,19 +503,19 @@
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td>Larry</td>
<td>Dent</td> <td>the Bird</td>
<td>HTML</td> <td>@twitter</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -538,7 +540,7 @@ ...@@ -538,7 +540,7 @@
<th>#</th> <th>#</th>
<th>{{_i}}First Name{{/i}}</th> <th>{{_i}}First Name{{/i}}</th>
<th>{{_i}}Last Name{{/i}}</th> <th>{{_i}}Last Name{{/i}}</th>
<th>{{_i}}Language{{/i}}</th> <th>{{_i}}Username{{/i}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -546,19 +548,19 @@ ...@@ -546,19 +548,19 @@
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td>Larry</td>
<td>Dent</td> <td>the Bird</td>
<td>HTML</td> <td>@twitter</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -582,31 +584,31 @@ ...@@ -582,31 +584,31 @@
<th>#</th> <th>#</th>
<th>{{_i}}First Name{{/i}}</th> <th>{{_i}}First Name{{/i}}</th>
<th>{{_i}}Last Name{{/i}}</th> <th>{{_i}}Last Name{{/i}}</th>
<th>{{_i}}Language{{/i}}</th> <th>{{_i}}Username{{/i}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td>1</td> <td rowspan="2">1</td>
<td colspan="2">Mark Otto</td> <td>Mark</td>
<td>CSS</td> <td>Otto</td>
<td>@mdo</td>
</tr>
<tr>
<td>Mark</td>
<td>Otto</td>
<td>@TwBootstrap</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td rowspan="2">Javascript</td> <td>@fat</td>
</tr>
</tr>
<td>3</td>
<td>Stu</td>
<td>Dent</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Brosef</td> <td colspan="2">Larry the Bird</td>
<td>Stalin</td> <td>@twitter</td>
<td>HTML</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -630,7 +632,7 @@ ...@@ -630,7 +632,7 @@
<th>#</th> <th>#</th>
<th>{{_i}}First Name{{/i}}</th> <th>{{_i}}First Name{{/i}}</th>
<th>{{_i}}Last Name{{/i}}</th> <th>{{_i}}Last Name{{/i}}</th>
<th>{{_i}}Language{{/i}}</th> <th>{{_i}}Username{{/i}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
...@@ -638,19 +640,18 @@ ...@@ -638,19 +640,18 @@
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td colspan="2">Larry the Bird</td>
<td>Dent</td> <td>@twitter</td>
<td>HTML</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -671,37 +672,36 @@ ...@@ -671,37 +672,36 @@
<div class="span8"> <div class="span8">
<table class="table table-striped table-bordered table-condensed"> <table class="table table-striped table-bordered table-condensed">
<thead> <thead>
<tr>
<th></th>
<th colspan="2">{{_i}}Full name{{/i}}</th>
<th></th>
</tr>
<tr> <tr>
<th>#</th> <th>#</th>
<th class="yellow">{{_i}}First Name{{/i}}</th> <th>{{_i}}First Name{{/i}}</th>
<th class="blue">{{_i}}Last Name{{/i}}</th> <th>{{_i}}Last Name{{/i}}</th>
<th class="green">{{_i}}Language{{/i}}</th> <th>{{_i}}Username{{/i}}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr>
<tr> <tr>
<td>1</td> <td>1</td>
<td>Mark</td> <td>Mark</td>
<td>Otto</td> <td>Otto</td>
<td>CSS</td> <td>@mdo</td>
</tr> </tr>
<tr> <tr>
<td>2</td> <td>2</td>
<td>Jacob</td> <td>Jacob</td>
<td>Thornton</td> <td>Thornton</td>
<td>Javascript</td> <td>@fat</td>
</tr> </tr>
<tr> <tr>
<td>3</td> <td>3</td>
<td>Stu</td> <td colspan="2">Larry the Bird</td>
<td>Dent</td> <td>@twitter</td>
<td>HTML</td>
</tr>
<tr>
<td>4</td>
<td>Brosef</td>
<td>Stalin</td>
<td>HTML</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
...@@ -786,6 +786,7 @@ ...@@ -786,6 +786,7 @@
<form class="well"> <form class="well">
<label>{{_i}}Label name{{/i}}</label> <label>{{_i}}Label name{{/i}}</label>
<input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> <span class="help-inline">Associated help text!</span> <input type="text" class="span3" placeholder="{{_i}}Type something…{{/i}}"> <span class="help-inline">Associated help text!</span>
<p class="help-block">{{_i}}Example block-level help text here.{{/i}}</p>
<label class="checkbox"> <label class="checkbox">
<input type="checkbox"> {{_i}}Check me out{{/i}} <input type="checkbox"> {{_i}}Check me out{{/i}}
</label> </label>
...@@ -832,7 +833,7 @@ ...@@ -832,7 +833,7 @@
<input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"> <input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}">
<input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"> <input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}">
<label class="checkbox"> <label class="checkbox">
<input type="checkbox"> {{_i}}Remember?{{/i}} <input type="checkbox"> {{_i}}Remember me{{/i}}
</label> </label>
<button type="submit" class="btn">{{_i}}Sign in{{/i}}</button> <button type="submit" class="btn">{{_i}}Sign in{{/i}}</button>
</form> </form>
...@@ -840,7 +841,10 @@ ...@@ -840,7 +841,10 @@
&lt;form class="well form-inline"&gt; &lt;form class="well form-inline"&gt;
&lt;input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"&gt; &lt;input type="text" class="input-small" placeholder="{{_i}}Email{{/i}}"&gt;
&lt;input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"&gt; &lt;input type="password" class="input-small" placeholder="{{_i}}Password{{/i}}"&gt;
&lt;button type="submit" class="btn"&gt;{{_i}}Go{{/i}}&lt;/button&gt; &lt;label class="checkbox"&gt;
&lt;input type="checkbox"&gt; {{_i}}Remember me{{/i}}
&lt;/label&gt;
&lt;button type="submit" class="btn"&gt;{{_i}}Sign in{{/i}}&lt;/button&gt;
&lt;/form&gt; &lt;/form&gt;
</pre> </pre>
</div> </div>
...@@ -1436,9 +1440,6 @@ ...@@ -1436,9 +1440,6 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="alert alert-info">
{{_i}}<strong>Heads up!</strong> Icon classes are echoed via CSS <code>:after</code>. In the docs, we show a light red background color on hover to highlight the icon's size.{{/i}}
</div>
<br> <br>
...@@ -1451,7 +1452,7 @@ ...@@ -1451,7 +1452,7 @@
</div> </div>
<div class="span4"> <div class="span4">
<h3>{{_i}}How to use{{/i}}</h3> <h3>{{_i}}How to use{{/i}}</h3>
<p>{{_i}}With v2.0.1, we have opted to use an <code>&lt;i&gt;</code> tag for all our icons, but they have no case class&mdash;only a shared prefix. To use, place the following code just about anywhere:{{/i}}</p> <p>{{_i}}Bootstrap uses an <code>&lt;i&gt;</code> tag for all icons, but they have no case class&mdash;only a shared prefix. To use, place the following code just about anywhere:{{/i}}</p>
<pre class="prettyprint linenums"> <pre class="prettyprint linenums">
&lt;i class="icon-search"&gt;&lt;/i&gt; &lt;i class="icon-search"&gt;&lt;/i&gt;
</pre> </pre>
...@@ -1460,6 +1461,10 @@ ...@@ -1460,6 +1461,10 @@
&lt;i class="icon-search icon-white"&gt;&lt;/i&gt; &lt;i class="icon-search icon-white"&gt;&lt;/i&gt;
</pre> </pre>
<p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p> <p>{{_i}}There are 120 classes to choose from for your icons. Just add an <code>&lt;i&gt;</code> tag with the right classes and you're set. You can find the full list in <strong>sprites.less</strong> or right here in this document.{{/i}}</p>
<p>
<span class="label label-info">{{_i}}Heads up!{{/i}}</span>
{{_i}}When using beside strings of text, as in buttons or nav links, be sure to leave a space after the <code>&lt;i&gt;</code> tag for proper spacing.{{/i}}
</p>
</div> </div>
<div class="span4"> <div class="span4">
<h3>{{_i}}Use cases{{/i}}</h3> <h3>{{_i}}Use cases{{/i}}</h3>
......
docs/templates/pages/components.mustache
+ 265
- 26
View file @ a3971306
This diff is collapsed.
docs/templates/pages/download.mustache
+ 2
- 1
View file @ a3971306
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
<label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> {{_i}}Headings, body, etc{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="type.less"> {{_i}}Headings, body, etc{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> {{_i}}Code and pre{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="code.less"> {{_i}}Code and pre{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> {{_i}}Labels{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="labels.less"> {{_i}}Labels{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="badges.less"> {{_i}}Badges{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> {{_i}}Tables{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="tables.less"> {{_i}}Tables{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> {{_i}}Forms{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="forms.less"> {{_i}}Forms{{/i}}</label>
<label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> {{_i}}Buttons{{/i}}</label> <label class="checkbox"><input checked="checked" type="checkbox" value="buttons.less"> {{_i}}Buttons{{/i}}</label>
...@@ -134,7 +135,7 @@ ...@@ -134,7 +135,7 @@
</div><!-- /span --> </div><!-- /span -->
<div class="span4"> <div class="span4">
<h4 class="muted">{{_i}}Heads up!{{/i}}</h4> <h4 class="muted">{{_i}}Heads up!{{/i}}</h4>
<p class="muted">{{_i}}All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.{{/i}}</p> <p class="muted">{{_i}}All checked plugins will be compiled into a single file, bootstrap.js. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.{{/i}}</p>
</div><!-- /span --> </div><!-- /span -->
</div><!-- /row --> </div><!-- /row -->
</section> </section>
......
docs/templates/pages/index.mustache
+ 1
- 1
View file @ a3971306
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<p>{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}</p> <p>{{_i}}Simple and flexible HTML, CSS, and Javascript for popular user interface components and interactions.{{/i}}</p>
<p class="download-info"> <p class="download-info">
<a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">{{_i}}View project on GitHub{{/i}}</a> <a href="https://github.com/twitter/bootstrap/" class="btn btn-primary btn-large">{{_i}}View project on GitHub{{/i}}</a>
<a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap{{/i}}</a> <a href="assets/bootstrap.zip" class="btn btn-large">{{_i}}Download Bootstrap <small>(v2.0.2)</small>{{/i}}</a>
</p> </p>
</div> </div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment