mirror of
https://github.com/twbs/bootstrap.git
synced 2025-08-26 06:44:35 +02:00
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
This commit is contained in:
Jacob Thornton
@@ -192,6 +192,75 @@ body > .navbar-fixed .brand:hover {
|
||||
}
|
||||
|
||||
|
||||
/* Quickstart section for getting le code
|
||||
-------------------------------------------------- */
|
||||
.getting-started {
|
||||
background-color: #f5f5f5;
|
||||
background-repeat: repeat-x;
|
||||
background-image: -khtml-gradient(linear, left top, left bottom, from(#f9f9f9), to(#f5f5f5));
|
||||
background-image: -moz-linear-gradient(#f9f9f9, #f5f5f5);
|
||||
background-image: -ms-linear-gradient(#f9f9f9, #f5f5f5);
|
||||
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f9f9f9), color-stop(100%, #f5f5f5));
|
||||
background-image: -webkit-linear-gradient(#f9f9f9, #f5f5f5);
|
||||
background-image: -o-linear-gradient(#f9f9f9, #f5f5f5);
|
||||
-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0)";
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f9f9f9', endColorstr='#f5f5f5', GradientType=0);
|
||||
background-image: linear-gradient(#f9f9f9, #f5f5f5);
|
||||
-webkit-border-radius: 4px;
|
||||
-moz-border-radius: 4px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.getting-started {
|
||||
border-color: #eee;
|
||||
}
|
||||
.getting-started td {
|
||||
width: 33%;
|
||||
border-right: 1px solid #eee;
|
||||
}
|
||||
.getting-started td + td {
|
||||
border-left: 1px solid #fff;
|
||||
}
|
||||
.getting-started td:last-child {
|
||||
border-right: 0;
|
||||
}
|
||||
.quick-start {
|
||||
padding: 17px 20px;
|
||||
}
|
||||
.quick-start h3,
|
||||
.quick-start p {
|
||||
line-height: 18px;
|
||||
text-align: center;
|
||||
margin-bottom: 9px;
|
||||
}
|
||||
.quick-start p {
|
||||
color: #777;
|
||||
}
|
||||
.quick-start .current-version,
|
||||
.quick-start .current-version a {
|
||||
color: #999;
|
||||
}
|
||||
.quick-start form {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
.quick-start textarea {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
margin-bottom: 0;
|
||||
line-height: 21px;
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
/* Makes inputs behave like true block-level elements */
|
||||
-webkit-box-sizing: border-box; /* Older Webkit */
|
||||
-moz-box-sizing: border-box; /* Older FF */
|
||||
-ms-box-sizing: border-box; /* IE8 */
|
||||
box-sizing: border-box; /* CSS3 spec*/
|
||||
/* Hacks for IE7 to make this work just okay enough to function */
|
||||
*width: 90%;
|
||||
*height: 24px;
|
||||
}
|
||||
|
||||
|
||||
/* Footer
|
||||
-------------------------------------------------- */
|
||||
.footer {
|
||||
@@ -333,7 +402,8 @@ pre.prettyprint {
|
||||
}
|
||||
|
||||
/* Make tables spaced out a bit more */
|
||||
h2 + table {
|
||||
h2 + table,
|
||||
h2 + .row {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
@@ -341,8 +411,10 @@ h2 + table {
|
||||
.example-sites img {
|
||||
max-width: 290px;
|
||||
}
|
||||
.built-with {
|
||||
.marketing-byline {
|
||||
margin: -18px 0 27px;
|
||||
font-size: 18px;
|
||||
font-weight: 300;
|
||||
color: #999;
|
||||
text-align: center;
|
||||
}
|
||||
@@ -385,7 +457,11 @@ form.well {
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
|
||||
/* For input sizes, make them display block */
|
||||
.docs-input-sizes input[type=text] {
|
||||
display: block;
|
||||
margin-bottom: 9px;
|
||||
}
|
||||
|
||||
/* Icons
|
||||
------------------------- */
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
.lit { color: #195f91; }
|
||||
.pun, .opn, .clo { color: #93a1a1; }
|
||||
.fun { color: #dc322f; }
|
||||
.str, .atv { color: #62C462; }
|
||||
.kwd, .linenums .tag { color: #049CD9; }
|
||||
.typ, .atn, .dec, .var { color: #EE5F5B; }
|
||||
.pln { color: #93a1a1; }
|
||||
.str, .atv { color: #D14; }
|
||||
.kwd, .linenums .tag { color: #1e347b; }
|
||||
.typ, .atn, .dec, .var { color: teal; }
|
||||
.pln { color: #48484c; }
|
||||
pre.prettyprint {
|
||||
background-color: #fefbf3;
|
||||
padding: 9px;
|
||||
@@ -17,8 +17,26 @@ pre.prettyprint {
|
||||
background-color: #252525;
|
||||
}
|
||||
|
||||
pre.prettyprint {
|
||||
padding: 8px;
|
||||
background-color: #f7f7f9;
|
||||
border: 1px solid #e1e1e8;
|
||||
-webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
|
||||
-moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
|
||||
box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
|
||||
}
|
||||
|
||||
/* Specify class=linenums on a pre to get line numbering */
|
||||
ol.linenums { margin: 0 0 0 40px; } /* IE indents via margin-left */
|
||||
ol.linenums li { color: #444; line-height: 18px; }
|
||||
ol.linenums {
|
||||
margin: 0 0 0 33px; /* IE indents via margin-left */
|
||||
}
|
||||
ol.linenums li {
|
||||
padding-left: 12px;
|
||||
color: #bebec5;
|
||||
line-height: 18px;
|
||||
text-shadow: 0 1px 0 #fff;
|
||||
}
|
||||
/* Alternate shading for lines */
|
||||
li.L1, li.L3, li.L5, li.L7, li.L9 { }
|
||||
li.L1, li.L3, li.L5, li.L7, li.L9 {
|
||||
|
||||
}
|
||||
@@ -1009,8 +1009,9 @@
|
||||
<hr>
|
||||
<h3>Form validation</h3>
|
||||
<p>It also includes validation styles for errors, warnings, and success. To use, add the a class to the surrounding <code>.control-group</code>.</p>
|
||||
<pre class="prettyprint">
|
||||
<fieldset class="control-group error">
|
||||
<pre class="prettyprint linenums">
|
||||
<fieldset
|
||||
class="control-group error">
|
||||
...
|
||||
</fieldset>
|
||||
</pre>
|
||||
@@ -1024,12 +1025,21 @@
|
||||
<div class="span8">
|
||||
<form class="horizontal-form">
|
||||
<legend>Extending form controls</legend>
|
||||
<fieldset class="control-group">
|
||||
<label class="control-label">Form sizes</label>
|
||||
<div class="controls docs-input-sizes">
|
||||
<input class="span2" type="text" name="" placeholder=".span2">
|
||||
<input class="span3" type="text" name="" placeholder=".span3">
|
||||
<input class="span4" type="text" name="" placeholder=".span4">
|
||||
<p class="help-block">Use the same <code>.span*</code> classes from the grid system for input sizes.</p>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="control-group">
|
||||
<label class="control-label" for="prependedInput">Prepended text</label>
|
||||
<div class="controls">
|
||||
<div class="input-prepend">
|
||||
<span class="add-on">@</span>
|
||||
<input class="input-small" id="prependedInput" name="prependedInput" size="16" type="text">
|
||||
<input class="span2" id="prependedInput" name="prependedInput" size="16" type="text">
|
||||
</div>
|
||||
<p class="help-block">Here's some help text</p>
|
||||
</div>
|
||||
@@ -1038,12 +1048,26 @@
|
||||
<label class="control-label" for="appendedInput">Appended text</label>
|
||||
<div class="controls">
|
||||
<div class="input-append">
|
||||
<input class="input-small" id="appendedInput" name="appendedInput" size="16" type="text">
|
||||
<input class="span2" id="appendedInput" name="appendedInput" size="16" type="text">
|
||||
<span class="add-on">.00</span>
|
||||
</div>
|
||||
<p class="help-block">Here's more help text</p>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="control-group">
|
||||
<label class="control-label" for="inlineCheckboxes">Inline checkboxes</label>
|
||||
<div class="controls">
|
||||
<label class="checkbox inline">
|
||||
<input type="checkbox" name="inlineCheckbox1" value="option1"> 1
|
||||
</label>
|
||||
<label class="checkbox inline">
|
||||
<input type="checkbox" name="inlineCheckbox1" value="option1"> 2
|
||||
</label>
|
||||
<label class="checkbox inline">
|
||||
<input type="checkbox" name="inlineCheckbox1" value="option1"> 3
|
||||
</label>
|
||||
</div>
|
||||
</fieldset>
|
||||
<fieldset class="control-group">
|
||||
<label class="control-label" for="optionsCheckboxes">Checkboxes</label>
|
||||
<div class="controls">
|
||||
@@ -1088,6 +1112,7 @@
|
||||
<hr>
|
||||
<h3>Checkboxes and radios</h3>
|
||||
<p>Up to v1.4, Bootstrap required extra markup around checkboxes and radios to stack them. Now, it's a simple matter of repeating the <code><label class="checkbox"></code> that wraps the <code><input type="checkbox"></code>.</p>
|
||||
<p>Inline checkboxes and radios are also supported. Just add <code>.inline</code> to any <code>.checkbox</code> or <code>.radio</code> and you're done.</p>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /row -->
|
||||
@@ -1178,17 +1203,12 @@
|
||||
|
||||
<br>
|
||||
|
||||
<h2>Button groups <small>Join buttons for more toolbar-like functionality</small></h2>
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h2>Button groups</h2>
|
||||
<p>Use button groups to join multiple buttons together as one composite component. Just build them with a series of <code><a></code> or <code><button></code> elements. Button groups can also function as radios and checkboxes (see <a href="./javascript.html#buttons">the Javascript docs</a> for that).</p>
|
||||
<p>You can also combine sets of button groups into a toolbar for more complex projects.</p>
|
||||
<p><a class="btn js-btn" href="./javascript.html#buttons">Get the javascript »</a></p>
|
||||
<p class="muted">Heads up: CSS for button groups is in a separate file, button-groups.less.</p>
|
||||
</div>
|
||||
<div class="span8">
|
||||
<h3>Linked button group</h3>
|
||||
<p>Using the standard <code><a class="btn" href="#">...</a></code> markup, simply add all the buttons you need.</p>
|
||||
<h3>Button groups</h3>
|
||||
<p>Use button groups to join multiple buttons together as one composite component. Build them with a series of <code><a></code> or <code><button></code> elements.</p>
|
||||
<p>You can also combine sets of <code><div class="btn-group"></code> into a <code><div class="btn-toolbar"></code> for more complex projects.</p>
|
||||
<div class="well" style="padding: 10px; margin-bottom: 9px;">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">Left</a>
|
||||
@@ -1196,7 +1216,6 @@
|
||||
<a class="btn" href="#">Right</a>
|
||||
</div>
|
||||
</div>
|
||||
<p>Level up one more time by wrapping multiple instances of <code><div class="btn-group"></code> with <code><div class="btn-toolbar"></code>.</p>
|
||||
<div class="well" style="padding: 10px;">
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
@@ -1204,24 +1223,132 @@
|
||||
<a class="btn" href="#">2</a>
|
||||
<a class="btn" href="#">3</a>
|
||||
<a class="btn" href="#">4</a>
|
||||
<a class="btn" href="#">5</a>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">5</a>
|
||||
<a class="btn" href="#">6</a>
|
||||
<a class="btn" href="#">7</a>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">8</a>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">9</a>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">10</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>Example markup</h3>
|
||||
<p>Here's how the HTML looks for a standard button group built with anchor tag buttons:</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">1</a>
|
||||
<a class="btn" href="#">2</a>
|
||||
<a class="btn" href="#">3</a>
|
||||
</div>
|
||||
</pre>
|
||||
<p>And with a toolbar for multiple groups:</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
...
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<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><a class="btn js-btn" href="./javascript.html#buttons">Get the javascript »</a></p>
|
||||
<hr>
|
||||
<h4 class="muted">Heads up</h4>
|
||||
<p class="muted">CSS for button groups is in a separate file, button-groups.less.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br>
|
||||
<h2>Button dropdowns <small>Built on button groups to provide contextual menus</small></h2>
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h3>Split button dropdowns</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>
|
||||
<div class="well" style="padding: 10px; margin-bottom: 9px;">
|
||||
<div class="btn-toolbar" style="margin-bottom: 9px;">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">Action</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">
|
||||
<a class="btn primary" href="#">Action</a>
|
||||
<a class="btn primary 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">
|
||||
<a class="btn danger" href="#">Danger</a>
|
||||
<a class="btn danger 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>
|
||||
<div class="btn-toolbar">
|
||||
<div class="btn-group">
|
||||
<a class="btn success" href="#">Success</a>
|
||||
<a class="btn success 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">
|
||||
<a class="btn info" href="#">Info</a>
|
||||
<a class="btn info 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>
|
||||
</div> <!-- /well -->
|
||||
</div>
|
||||
<div class="span8">
|
||||
<h3>Example markup</h3>
|
||||
<p>Similar to a button group, our markup uses regular button markup, but with a handful of additions to refine the style and support Bootstrap's dropdown jQuery plugin.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="btn-group">
|
||||
<a class="btn" href="#">Action</a>
|
||||
<a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
|
||||
<span class="caret"></span>
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
<!-- dropdown menu links -->
|
||||
</ul>
|
||||
</div>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
@@ -1429,5 +1556,11 @@
|
||||
<script src="http://code.jquery.com/jquery-1.7.min.js"></script>
|
||||
<script src="assets/js/google-code-prettify/prettify.js"></script>
|
||||
<script src="assets/js/application.js"></script>
|
||||
<script src="../js/bootstrap-dropdown.js"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
$('.dropdown-toggle').dropdown();
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -227,27 +227,27 @@
|
||||
================================================== -->
|
||||
<section id="sidenav">
|
||||
<div class="page-header">
|
||||
<h1>Side nav <small></small></h1>
|
||||
<h1>Side nav <small>for lists of links</small></h1>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="span3">
|
||||
<h3>Examples</h3>
|
||||
<p>Side navs can be just links, links with headings, and links with icons.</p>
|
||||
<div class="well side-nav">
|
||||
<h6 class="nav-label">Your account</h6>
|
||||
<ul class="nav-group">
|
||||
<li class="active"><a class="nav-item" href="#">Home</a></li>
|
||||
<li><a class="nav-item" href="#">Library</a></li>
|
||||
<li><a class="nav-item" href="#">Profile</a></li>
|
||||
<li><a class="nav-item" href="#">Settings</a></li>
|
||||
<li><a class="nav-item" href="#">Help</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<div class="well side-nav">
|
||||
<h6 class="nav-label">Your account</h6>
|
||||
<ul class="nav-group">
|
||||
<li class="active"><a class="nav-item" href="#"><i class="home"></i> Home</a></li>
|
||||
<li><a class="nav-item" href="#">Profile</a></li>
|
||||
<li><a class="nav-item" href="#">Settings</a></li>
|
||||
</ul>
|
||||
<h6 class="nav-label">Your account</h6>
|
||||
<ul class="nav-group">
|
||||
<li><a class="nav-item" href="#"><i class="home"></i> Home</a></li>
|
||||
<li><a class="nav-item" href="#"><i class="book"></i> Library</a></li>
|
||||
<li><a class="nav-item" href="#"><i class="user"></i> Profile</a></li>
|
||||
<li><a class="nav-item" href="#"><i class="cog"></i> Settings</a></li>
|
||||
@@ -255,6 +255,34 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="span3">
|
||||
<h3>Why use it</h3>
|
||||
<p></p>
|
||||
</div>
|
||||
<div class="span6">
|
||||
<h3>Markup</h3>
|
||||
<p>Marking up a side nav is at the core just writing an unordered list of links.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav-group">
|
||||
<li class="active">
|
||||
<a class="nav-item" href="#">Home</a>
|
||||
</li>
|
||||
<li><a class="nav-item" href="#">Library</a></li>
|
||||
<li><a class="nav-item" href="#">Help</a></li>
|
||||
</ul>
|
||||
</pre>
|
||||
<p>Bootstrap also makes it easy to expand a regular list of links with multiple groups and headings.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<h6 class="nav-label"></h6>
|
||||
<ul class="nav-group">
|
||||
...
|
||||
</ul>
|
||||
<h6 class="nav-label"></h6>
|
||||
<ul class="nav-group">
|
||||
...
|
||||
</ul>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
@@ -267,10 +295,12 @@
|
||||
<div class="page-header">
|
||||
<h1>Navbar</h1>
|
||||
</div>
|
||||
<div class="navbar navbar-static" >
|
||||
<h2>Static navbar example</h2>
|
||||
<p>An example of a static (not fixed to the top) navbar with project name, navigation, and search form.</p>
|
||||
<div class="navbar navbar-static">
|
||||
<div class="navbar-inner">
|
||||
<div class="container" style="width: auto;">
|
||||
<a class="brand" href="#">Project Name</a>
|
||||
<a class="brand" href="#">Project name</a>
|
||||
<ul class="nav">
|
||||
<li class="active"><a href="#">Home</a></li>
|
||||
<li><a href="#">Link</a></li>
|
||||
@@ -306,20 +336,70 @@
|
||||
</div><!-- /navbar -->
|
||||
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<h3>What is it</h3>
|
||||
<p>Our navbar is a fixed bar that houses a website’s logo or name, primary navigation, and search form.</p>
|
||||
<div class="span8">
|
||||
<h3>Navbar scaffolding</h3>
|
||||
<p>The navbar requires only a few divs to structure it well for static or fixed display.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="navbar navbar-static">
|
||||
<div class="navbar-inner">
|
||||
<div class="container" style="width: auto;">
|
||||
...
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</pre>
|
||||
<p>To make the navbar fixed, swamp the <code>.navbar-static</code> class for <code>.navbar-fixed</code>. In your CSS, you will also need to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code><body></code>.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<div class="navbar navbar-fixed">
|
||||
...
|
||||
</div>
|
||||
</pre>
|
||||
<br>
|
||||
<h3>Brand name</h3>
|
||||
<p>A simple link to show your brand or project name only requires an anchor tag.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<a class="brand" href="#">
|
||||
Project name
|
||||
</a>
|
||||
</pre>
|
||||
<br>
|
||||
<h3>Search form</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>
|
||||
<pre class="prettyprint linenums">
|
||||
<form class="navbar-search">
|
||||
<input type="text" class="search-query pull-left" placeholder="Search">
|
||||
</form>
|
||||
</pre>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>Customizable</h3>
|
||||
<p>All elements within, and the entire navbar as well, are optional. You can choose to include a logo/name, nav, search, and a secondary nav—or any combination of that.</p>
|
||||
</div>
|
||||
<div class="span4">
|
||||
<h3>Dropdowns included</h3>
|
||||
<p>As part of the main navigation, we’ve included the ability for you to add dropdowns to your nav. Check out the secondary nav above (right aligned) to see how it’s done. Dropdowns <code><li></code> tags also support <code>.active</code> for showing current page selection.</p>
|
||||
<h3>Nav links</h3>
|
||||
<p>Nav items are simple to add via unordered lists.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav">
|
||||
<li class="active">
|
||||
<a href="#">Home</a>
|
||||
</li>
|
||||
<li><a href="#">Link</a></li>
|
||||
<li><a href="#">Link</a></li>
|
||||
</ul>
|
||||
</pre>
|
||||
<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>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="nav">
|
||||
<li class="dropdown">
|
||||
<a href="#"
|
||||
class="dropdown-toggle"
|
||||
data-toggle="dropdown">
|
||||
Account
|
||||
</a>
|
||||
<ul class="dropdown-menu">
|
||||
...
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</pre>
|
||||
</div>
|
||||
</div>
|
||||
<p><strong>Note:</strong> When using the navbar on any page, be sure to account for the overlap it causes by adding <code>padding-top: 40px;</code> to your <code><body></code>.</p>
|
||||
|
||||
</section>
|
||||
|
||||
@@ -507,34 +587,39 @@
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="span3">
|
||||
<p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation.</p>
|
||||
</div>
|
||||
<div class="span9">
|
||||
<div class="span6">
|
||||
<h3>Why use them</h3>
|
||||
<p>Breadcrumb navigation is used as a way to show users where they are within an app or a site, but not for primary navigation. Keep their use sparse and succinct to be most effective.</p>
|
||||
|
||||
<h3>Examples</h3>
|
||||
<p>A single example shown as it might be displayed across multiple pages.</p>
|
||||
<ul class="breadcrumb">
|
||||
<li class="active">Home</li>
|
||||
</ul>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#">Home</a> <span class="divider">/</span></li>
|
||||
<li class="active">Middle page</li>
|
||||
<li class="active">Library</li>
|
||||
</ul>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#">Home</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Middle page</a> <span class="divider">/</span></li>
|
||||
<li class="active">Another one</li>
|
||||
</ul>
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#">Home</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Middle page</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Another one</a> <span class="divider">/</span></li>
|
||||
<li class="active">You are here</li>
|
||||
<li><a href="#">Library</a> <span class="divider">/</span></li>
|
||||
<li class="active">Data</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="span6">
|
||||
<h3>Markup</h3>
|
||||
<p>HTML is your standard unordered list with links.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
<ul class="breadcrumb">
|
||||
<li><a href="#">Home</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Middle page</a> <span class="divider">/</span></li>
|
||||
<li><a href="#">Another one</a> <span class="divider">/</span></li>
|
||||
<li class="active">You are here</li>
|
||||
<li>
|
||||
<a href="#">Home</a> <span class="divider">/</span>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#">Library</a> <span class="divider">/</span>
|
||||
</li>
|
||||
<li class="active">
|
||||
<a href="#">Data</a>
|
||||
</li>
|
||||
</ul>
|
||||
</pre>
|
||||
</div>
|
||||
@@ -545,13 +630,14 @@
|
||||
|
||||
|
||||
<!-- Step nav
|
||||
================================================== -->
|
||||
==================================================
|
||||
|
||||
COMMENTED OUT AND NOT SUPPORTED AT THIS TIME.
|
||||
|
||||
<section id="stepNav">
|
||||
<div class="page-header">
|
||||
<h1>Step nav <small></small></h1>
|
||||
</div>
|
||||
|
||||
<!-- Step nav -->
|
||||
<div class="row">
|
||||
<div class="span3">
|
||||
<p>Placeholder for now!</p>
|
||||
@@ -571,8 +657,8 @@
|
||||
<br>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</section>
|
||||
-->
|
||||
|
||||
|
||||
|
||||
@@ -682,6 +768,9 @@
|
||||
</pre>
|
||||
</div>
|
||||
</div><!-- /row -->
|
||||
|
||||
<br>
|
||||
|
||||
<!-- Block messages -->
|
||||
<div class="row">
|
||||
<div class="span3">
|
||||
|
||||
@@ -106,8 +106,8 @@
|
||||
|
||||
|
||||
<div class="marketing">
|
||||
<h1>Built with Bootstrap</h1>
|
||||
<p class="built-with">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a>.</p>
|
||||
<h1>Built with Bootstrap.</h1>
|
||||
<p class="marketing-byline">For even more sites built with Bootstrap, <a href="http://builtwithbootstrap.tumblr.com/" target="_blank">visit the unofficial Tumblr</a>.</p>
|
||||
<ul class="thumbnails example-sites">
|
||||
<li class="span4">
|
||||
<a class="thumbnail" href="http://kippt.com/" target="_blank">
|
||||
@@ -126,7 +126,7 @@
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
<h1>Designed for everyone, everywhere</h1>
|
||||
<h1>Designed for everyone, everywhere.</h1>
|
||||
<div class="row">
|
||||
<div class="span4">
|
||||
<img class="icon" src="assets/img/glyphicons/glyphicons_042_group.png">
|
||||
@@ -200,8 +200,40 @@
|
||||
<p>Brought to you by an experienced <a href="http://twitter.com/fat">engineer</a> and <a href="http://twitter.com/mdo">designer</a>.</p>
|
||||
</div>
|
||||
</div><!--/row-->
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Quickstart options
|
||||
================================================== -->
|
||||
<h1>Get started in no time.</h1>
|
||||
<p class="marketing-byline">Built for any skill level, Bootstrap fits your workflow and development process.</p>
|
||||
<table class="bordered-table getting-started">
|
||||
<tbody>
|
||||
<tr>
|
||||
<td class="quick-start">
|
||||
<h3>Hotlink the CSS</h3>
|
||||
<p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="1"><link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap.min.css"></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
<h3>Use it with LESS</h3>
|
||||
<p>A fan of using LESS? No problem, just clone the repo and add these lines:</p>
|
||||
<form>
|
||||
<textarea class="copy-code" rows="2"><link rel="stylesheet/less" href="/path/to/bootstrap.less">
|
||||
<script src="/path/to/less.js"></script></textarea>
|
||||
</form>
|
||||
</td>
|
||||
<td class="quick-start">
|
||||
<h3>Fork on GitHub</h3>
|
||||
<p>Download, fork, pull, file issues, and more with the official Bootstrap repo on Github.</p>
|
||||
<p><a target="_blank" href="https://github.com/twitter/bootstrap" class="btn primary">Bootstrap on GitHub »</a></p>
|
||||
<p class="current-version">Currently <a href="https://github.com/twitter/bootstrap/wiki/Changelog">v2.0.0</a></p>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div><!-- /.marketing -->
|
||||
</div><!-- /#overview -->
|
||||
|
||||
|
||||
|
||||
@@ -235,7 +235,14 @@ $('#myModal').on('hidden', function () {
|
||||
<h3>Modal Heading</h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p>One fine body…</p>
|
||||
<h4>Text in a modal</h4>
|
||||
<p>Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.</p>
|
||||
|
||||
<h4>Popover in a modal</h4>
|
||||
<p>This <a href="#" class="btn" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">button</a> should trigger a popover on hover.</p>
|
||||
|
||||
<h4>Twipsy tooltips in a modal</h4>
|
||||
<p><a href="#" class="twipsy-test" title="Tooltip">This link</a> and <a href="#" class="twipsy-test" title="Tooltip">that link</a> should have Twipsy tooltips on hover.</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn primary">Save changes</a>
|
||||
@@ -274,7 +281,7 @@ $('#myModal').on('hidden', function () {
|
||||
<ul class="tabs">
|
||||
<li class="active"><a href="#">Home</a></li>
|
||||
<li id="secondary" class="dropdown">
|
||||
<a href="#secondary" class="dropdown-toggle" data-toggle="dropdown">Dropdown</a>
|
||||
<a href="#secondary" class="dropdown-toggle" data-toggle="dropdown">Dropdown <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#">Secondary link</a></li>
|
||||
<li><a href="#">Something else here</a></li>
|
||||
@@ -302,7 +309,7 @@ $('#myModal').on('hidden', function () {
|
||||
</form>
|
||||
<ul class="nav secondary-nav">
|
||||
<li id="fat-menu" class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 1</a>
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 1 <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#">Secondary link</a></li>
|
||||
<li><a href="#">Something else here</a></li>
|
||||
@@ -311,7 +318,7 @@ $('#myModal').on('hidden', function () {
|
||||
</ul>
|
||||
</li>
|
||||
<li id="mdo-menu" class="dropdown">
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2</a>
|
||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2 <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu">
|
||||
<li><a href="#">Secondary link</a></li>
|
||||
<li><a href="#">Something else here</a></li>
|
||||
@@ -1144,6 +1151,7 @@ $('.myCarousel').carousel({
|
||||
$('.twipsy-demo.well').twipsy({
|
||||
selector: "a[rel=twipsy]"
|
||||
})
|
||||
$('.twipsy-test').twipsy()
|
||||
|
||||
// popover demo
|
||||
$("a[rel=popover]")
|
||||
|
||||
@@ -403,8 +403,8 @@
|
||||
<tr>
|
||||
<td>Node with makefile</td>
|
||||
<td>
|
||||
<p>Install the less command line compiler with npm by running the following command:</p>
|
||||
<pre>$ npm install lessc</pre>
|
||||
<p>Install the LESS command line compiler with npm by running the following command:</p>
|
||||
<pre>$ npm install less</pre>
|
||||
<p>Once installed just run <code>make</code> from the root of your bootstrap directory and you're all set.</p>
|
||||
<p>Additionally, if you have <a href="https://github.com/mynyml/watchr">watchr</a> installed, you may run <code>make watch</code> to have bootstrap automatically rebuilt every time you edit a file in the bootstrap lib (this isn't required, just a convenience method).</p>
|
||||
</td>
|
||||
@@ -422,7 +422,7 @@
|
||||
<tr>
|
||||
<td>Command line</td>
|
||||
<td>
|
||||
<p>If you already have the less command line tool installed, simply run the following command:</p>
|
||||
<p>Install the LESS command line tool via Node and run the following command:</p>
|
||||
<pre>$ lessc ./lib/bootstrap.less > bootstrap.css</pre>
|
||||
<p>Be sure to include <code>--compress</code> in that command if you're trying to save some bytes!</p>
|
||||
</td>
|
||||
|
||||
@@ -395,7 +395,6 @@
|
||||
<dd><a href="./components.html#sidenav">Side nav</a></dd>
|
||||
<dd><a href="./components.html#navbar">Navbar</a></dd>
|
||||
<dd><a href="./components.html#tabspills">Tabs and pills</a></dd>
|
||||
<dd><a href="./components.html#stepnav">Step nav</a></dd>
|
||||
<dd><a href="./components.html#pagination">Pagination</a></dd>
|
||||
<dd><a href="./components.html#alerts">Alerts and errors</a></dd>
|
||||
<dd><a href="./components.html#modals">Modals</a></dd>
|
||||
|
||||
@@ -92,6 +92,9 @@
|
||||
<li>Typography
|
||||
<ul>
|
||||
<li>Right-aligned option for blockquotes if float: right;</li>
|
||||
<li><code>h4</code> elements were dropped from 16px to 14px with a default <code>line-height</code> of 18px</li>
|
||||
<li><code>h5</code> elements were dropped from 14px to 12px</li>
|
||||
<li><code>h6</code> elements were dropped from 13px to 11px</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>Buttons
|
||||
@@ -99,6 +102,17 @@
|
||||
<li>Added button bar options</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>Examples
|
||||
<ul>
|
||||
<li>Fluid examples redone. <code>.fluid-container</code> now requires a <code>.sidebar-left</code> or <code>.sidebar-right</code> as well. Fluid sidebar element has a new class, <code>.fluid-sidebar</code>.</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>Dropdown menus
|
||||
<ul>
|
||||
<li>Updated the <code>.dropdown-menu</code> to tighten up spacing</li>
|
||||
<li>Now requires you to add a <code><span class="caret"></span></code> to show the dropdown arrow</li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<!--
|
||||
<li>
|
||||
|
||||
Reference in New Issue
Block a user