mirror of
https://github.com/twbs/bootstrap.git
synced 2025-02-06 04:08:22 +01:00
Keep origin in track
This commit is contained in:
commit
1e6d386b8d
Binary file not shown.
14
docs/assets/css/bootstrap-responsive.css
vendored
14
docs/assets/css/bootstrap-responsive.css
vendored
@ -7,6 +7,16 @@
|
|||||||
*
|
*
|
||||||
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
* Designed and built with all the love in the world @twitter by @mdo and @fat.
|
||||||
*/
|
*/
|
||||||
|
.clearfix {
|
||||||
|
*zoom: 1;
|
||||||
|
}
|
||||||
|
.clearfix:before, .clearfix:after {
|
||||||
|
display: table;
|
||||||
|
content: "";
|
||||||
|
}
|
||||||
|
.clearfix:after {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
.hidden {
|
.hidden {
|
||||||
display: none;
|
display: none;
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
@ -102,7 +112,7 @@
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (min-width: 768px) and (max-width: 980px) {
|
@media (min-width: 768px) and (max-width: 979px) {
|
||||||
.row {
|
.row {
|
||||||
margin-left: -20px;
|
margin-left: -20px;
|
||||||
*zoom: 1;
|
*zoom: 1;
|
||||||
@ -278,7 +288,7 @@
|
|||||||
width: 714px;
|
width: 714px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@media (max-width: 980px) {
|
@media (max-width: 979px) {
|
||||||
body {
|
body {
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
}
|
}
|
||||||
|
36
docs/assets/css/bootstrap.css
vendored
36
docs/assets/css/bootstrap.css
vendored
@ -33,7 +33,7 @@ html {
|
|||||||
-ms-text-size-adjust: 100%;
|
-ms-text-size-adjust: 100%;
|
||||||
}
|
}
|
||||||
a:focus {
|
a:focus {
|
||||||
outline: thin dotted;
|
outline: thin dotted #333;
|
||||||
outline: 5px auto -webkit-focus-ring-color;
|
outline: 5px auto -webkit-focus-ring-color;
|
||||||
outline-offset: -2px;
|
outline-offset: -2px;
|
||||||
}
|
}
|
||||||
@ -94,6 +94,16 @@ textarea {
|
|||||||
overflow: auto;
|
overflow: auto;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
}
|
}
|
||||||
|
.clearfix {
|
||||||
|
*zoom: 1;
|
||||||
|
}
|
||||||
|
.clearfix:before, .clearfix:after {
|
||||||
|
display: table;
|
||||||
|
content: "";
|
||||||
|
}
|
||||||
|
.clearfix:after {
|
||||||
|
clear: both;
|
||||||
|
}
|
||||||
body {
|
body {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
@ -488,6 +498,7 @@ pre {
|
|||||||
white-space: pre;
|
white-space: pre;
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
|
word-wrap: break-word;
|
||||||
}
|
}
|
||||||
pre.prettyprint {
|
pre.prettyprint {
|
||||||
margin-bottom: 18px;
|
margin-bottom: 18px;
|
||||||
@ -530,11 +541,16 @@ input,
|
|||||||
button,
|
button,
|
||||||
select,
|
select,
|
||||||
textarea {
|
textarea {
|
||||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: normal;
|
font-weight: normal;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
}
|
}
|
||||||
|
input,
|
||||||
|
button,
|
||||||
|
select,
|
||||||
|
textarea {
|
||||||
|
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||||
|
}
|
||||||
label {
|
label {
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 5px;
|
margin-bottom: 5px;
|
||||||
@ -573,11 +589,16 @@ input[type="image"], input[type="checkbox"], input[type="radio"] {
|
|||||||
/* IE7 */
|
/* IE7 */
|
||||||
|
|
||||||
line-height: normal;
|
line-height: normal;
|
||||||
border: 0;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
-webkit-border-radius: 0;
|
-webkit-border-radius: 0;
|
||||||
-moz-border-radius: 0;
|
-moz-border-radius: 0;
|
||||||
border-radius: 0;
|
border-radius: 0;
|
||||||
|
border: 0 \9;
|
||||||
|
/* IE9 and down */
|
||||||
|
|
||||||
|
}
|
||||||
|
input[type="image"] {
|
||||||
|
border: 0;
|
||||||
}
|
}
|
||||||
input[type="file"] {
|
input[type="file"] {
|
||||||
width: auto;
|
width: auto;
|
||||||
@ -670,7 +691,7 @@ select:focus {
|
|||||||
-webkit-box-shadow: none;
|
-webkit-box-shadow: none;
|
||||||
-moz-box-shadow: none;
|
-moz-box-shadow: none;
|
||||||
box-shadow: none;
|
box-shadow: none;
|
||||||
outline: thin dotted;
|
outline: thin dotted #333;
|
||||||
outline: 5px auto -webkit-focus-ring-color;
|
outline: 5px auto -webkit-focus-ring-color;
|
||||||
outline-offset: -2px;
|
outline-offset: -2px;
|
||||||
}
|
}
|
||||||
@ -1744,7 +1765,7 @@ table .span12 {
|
|||||||
transition: background-position 0.1s linear;
|
transition: background-position 0.1s linear;
|
||||||
}
|
}
|
||||||
.btn:focus {
|
.btn:focus {
|
||||||
outline: thin dotted;
|
outline: thin dotted #333;
|
||||||
outline: 5px auto -webkit-focus-ring-color;
|
outline: 5px auto -webkit-focus-ring-color;
|
||||||
outline-offset: -2px;
|
outline-offset: -2px;
|
||||||
}
|
}
|
||||||
@ -1786,6 +1807,11 @@ table .span12 {
|
|||||||
.btn-small [class^="icon-"] {
|
.btn-small [class^="icon-"] {
|
||||||
margin-top: -1px;
|
margin-top: -1px;
|
||||||
}
|
}
|
||||||
|
.btn-mini {
|
||||||
|
padding: 2px 6px;
|
||||||
|
font-size: 11px;
|
||||||
|
line-height: 14px;
|
||||||
|
}
|
||||||
.btn-primary,
|
.btn-primary,
|
||||||
.btn-primary:hover,
|
.btn-primary:hover,
|
||||||
.btn-warning,
|
.btn-warning,
|
||||||
|
11
docs/assets/js/bootstrap-alert.js
vendored
11
docs/assets/js/bootstrap-alert.js
vendored
@ -51,11 +51,14 @@
|
|||||||
|
|
||||||
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
|
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
|
||||||
|
|
||||||
$parent.removeClass('in')
|
$parent
|
||||||
|
.trigger('close')
|
||||||
|
.removeClass('in')
|
||||||
|
|
||||||
function removeElement() {
|
function removeElement() {
|
||||||
$parent.remove()
|
$parent
|
||||||
$parent.trigger('closed')
|
.trigger('closed')
|
||||||
|
.remove()
|
||||||
}
|
}
|
||||||
|
|
||||||
$.support.transition && $parent.hasClass('fade') ?
|
$.support.transition && $parent.hasClass('fade') ?
|
||||||
@ -88,4 +91,4 @@
|
|||||||
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
|
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-button.js
vendored
2
docs/assets/js/bootstrap-button.js
vendored
@ -95,4 +95,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
5
docs/assets/js/bootstrap-carousel.js
vendored
5
docs/assets/js/bootstrap-carousel.js
vendored
@ -61,6 +61,7 @@
|
|||||||
|
|
||||||
, pause: function () {
|
, pause: function () {
|
||||||
clearInterval(this.interval)
|
clearInterval(this.interval)
|
||||||
|
this.interval = null
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,6 +83,8 @@
|
|||||||
, 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()
|
||||||
@ -151,4 +154,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-collapse.js
vendored
2
docs/assets/js/bootstrap-collapse.js
vendored
@ -133,4 +133,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-dropdown.js
vendored
2
docs/assets/js/bootstrap-dropdown.js
vendored
@ -89,4 +89,4 @@
|
|||||||
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-modal.js
vendored
2
docs/assets/js/bootstrap-modal.js
vendored
@ -207,4 +207,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-popover.js
vendored
2
docs/assets/js/bootstrap-popover.js
vendored
@ -92,4 +92,4 @@
|
|||||||
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
|
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-scrollspy.js
vendored
2
docs/assets/js/bootstrap-scrollspy.js
vendored
@ -122,4 +122,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-tab.js
vendored
2
docs/assets/js/bootstrap-tab.js
vendored
@ -127,4 +127,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-tooltip.js
vendored
2
docs/assets/js/bootstrap-tooltip.js
vendored
@ -267,4 +267,4 @@
|
|||||||
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
||||||
}
|
}
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-transition.js
vendored
2
docs/assets/js/bootstrap-transition.js
vendored
@ -48,4 +48,4 @@
|
|||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
docs/assets/js/bootstrap-typeahead.js
vendored
2
docs/assets/js/bootstrap-typeahead.js
vendored
@ -268,4 +268,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
@ -1266,37 +1266,37 @@ For example, <code>section</code> should be wrapped as inline.
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn" href="#">Default</a></td>
|
<td><button class="btn" href="#">Default</button></td>
|
||||||
<td><code>.btn</code></td>
|
<td><code>.btn</code></td>
|
||||||
<td>Standard gray button with gradient</td>
|
<td>Standard gray button with gradient</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-primary" href="#">Primary</a></td>
|
<td><button class="btn btn-primary" href="#">Primary</button></td>
|
||||||
<td><code>.btn-primary</code></td>
|
<td><code>.btn-primary</code></td>
|
||||||
<td>Provides extra visual weight and identifies the primary action in a set of buttons</td>
|
<td>Provides extra visual weight and identifies the primary action in a set of buttons</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-info" href="#">Info</a></td>
|
<td><button class="btn btn-info" href="#">Info</button></td>
|
||||||
<td><code>.btn-info</code></td>
|
<td><code>.btn-info</code></td>
|
||||||
<td>Used as an alternate to the default styles</td>
|
<td>Used as an alternate to the default styles</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-success" href="#">Success</a></td>
|
<td><button class="btn btn-success" href="#">Success</button></td>
|
||||||
<td><code>.btn-success</code></td>
|
<td><code>.btn-success</code></td>
|
||||||
<td>Indicates a successful or positive action</td>
|
<td>Indicates a successful or positive action</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-warning" href="#">Warning</a></td>
|
<td><button class="btn btn-warning" href="#">Warning</button></td>
|
||||||
<td><code>.btn-warning</code></td>
|
<td><code>.btn-warning</code></td>
|
||||||
<td>Indicates caution should be taken with this action</td>
|
<td>Indicates caution should be taken with this action</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-danger" href="#">Danger</a></td>
|
<td><button class="btn btn-danger" href="#">Danger</button></td>
|
||||||
<td><code>.btn-danger</code></td>
|
<td><code>.btn-danger</code></td>
|
||||||
<td>Indicates a dangerous or potentially negative action</td>
|
<td>Indicates a dangerous or potentially negative action</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-inverse" href="#">Inverse</a></td>
|
<td><button class="btn btn-inverse" href="#">Inverse</button></td>
|
||||||
<td><code>.btn-inverse</code></td>
|
<td><code>.btn-inverse</code></td>
|
||||||
<td>Alternate dark gray button, not tied to a semantic action or use</td>
|
<td>Alternate dark gray button, not tied to a semantic action or use</td>
|
||||||
</tr>
|
</tr>
|
||||||
@ -1313,7 +1313,7 @@ For example, <code>section</code> should be wrapped as inline.
|
|||||||
</div>
|
</div>
|
||||||
<div class="span4">
|
<div class="span4">
|
||||||
<h3>Multiple sizes</h3>
|
<h3>Multiple sizes</h3>
|
||||||
<p>Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.</p>
|
<p>Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.</p>
|
||||||
<p>
|
<p>
|
||||||
<button class="btn btn-large btn-primary">Primary action</button>
|
<button class="btn btn-large btn-primary">Primary action</button>
|
||||||
<button class="btn btn-large">Action</button>
|
<button class="btn btn-large">Action</button>
|
||||||
@ -1322,6 +1322,10 @@ For example, <code>section</code> should be wrapped as inline.
|
|||||||
<button class="btn btn-small btn-primary">Primary action</button>
|
<button class="btn btn-small btn-primary">Primary action</button>
|
||||||
<button class="btn btn-small">Action</button>
|
<button class="btn btn-small">Action</button>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
<button class="btn btn-mini btn-primary">Primary action</button>
|
||||||
|
<button class="btn btn-mini">Action</button>
|
||||||
|
</p>
|
||||||
<br>
|
<br>
|
||||||
<h3>Disabled state</h3>
|
<h3>Disabled state</h3>
|
||||||
<p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.</p>
|
<p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.</p>
|
||||||
|
@ -900,11 +900,19 @@
|
|||||||
<li><a href="#">Link</a></li>
|
<li><a href="#">Link</a></li>
|
||||||
<li><a href="#">Link</a></li>
|
<li><a href="#">Link</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</pre>
|
||||||
|
<p>You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:</p>
|
||||||
|
<pre class="prettyprint linenums">
|
||||||
|
<ul class="nav">
|
||||||
|
...
|
||||||
|
<li class="divider-vertical"></li>
|
||||||
|
...
|
||||||
|
</ul>
|
||||||
</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 dropdowns</h3>
|
||||||
<p>Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.</p>
|
<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">
|
<pre class="prettyprint linenums">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
@ -920,7 +928,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</pre>
|
</pre>
|
||||||
<p><a class="btn" href="./javascript.html#dropdown">Get the javascript →</a></p>
|
<p><a class="btn" href="./javascript.html#dropdowns">Get the javascript →</a></p>
|
||||||
</div><!-- /.span -->
|
</div><!-- /.span -->
|
||||||
</div><!-- /.row -->
|
</div><!-- /.row -->
|
||||||
|
|
||||||
|
@ -289,7 +289,7 @@
|
|||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
<div class="modal">
|
<div class="modal" id="myModal">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<a class="close" data-dismiss="modal">×</a>
|
<a class="close" data-dismiss="modal">×</a>
|
||||||
<h3>Modal header</h3>
|
<h3>Modal header</h3>
|
||||||
|
@ -444,7 +444,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Landscape tablets</td>
|
<td>Landscape tablets</td>
|
||||||
<td>768px to 980px</td>
|
<td>768px to 979px</td>
|
||||||
<td>42px</td>
|
<td>42px</td>
|
||||||
<td>20px</td>
|
<td>20px</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
20
docs/templates/pages/base-css.mustache
vendored
20
docs/templates/pages/base-css.mustache
vendored
@ -1190,37 +1190,37 @@
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn" href="#">{{_i}}Default{{/i}}</a></td>
|
<td><button class="btn" href="#">{{_i}}Default{{/i}}</button></td>
|
||||||
<td><code>.btn</code></td>
|
<td><code>.btn</code></td>
|
||||||
<td>{{_i}}Standard gray button with gradient{{/i}}</td>
|
<td>{{_i}}Standard gray button with gradient{{/i}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</a></td>
|
<td><button class="btn btn-primary" href="#">{{_i}}Primary{{/i}}</button></td>
|
||||||
<td><code>.btn-primary</code></td>
|
<td><code>.btn-primary</code></td>
|
||||||
<td>{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}</td>
|
<td>{{_i}}Provides extra visual weight and identifies the primary action in a set of buttons{{/i}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-info" href="#">{{_i}}Info{{/i}}</a></td>
|
<td><button class="btn btn-info" href="#">{{_i}}Info{{/i}}</button></td>
|
||||||
<td><code>.btn-info</code></td>
|
<td><code>.btn-info</code></td>
|
||||||
<td>{{_i}}Used as an alternate to the default styles{{/i}}</td>
|
<td>{{_i}}Used as an alternate to the default styles{{/i}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-success" href="#">{{_i}}Success{{/i}}</a></td>
|
<td><button class="btn btn-success" href="#">{{_i}}Success{{/i}}</button></td>
|
||||||
<td><code>.btn-success</code></td>
|
<td><code>.btn-success</code></td>
|
||||||
<td>{{_i}}Indicates a successful or positive action{{/i}}</td>
|
<td>{{_i}}Indicates a successful or positive action{{/i}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</a></td>
|
<td><button class="btn btn-warning" href="#">{{_i}}Warning{{/i}}</button></td>
|
||||||
<td><code>.btn-warning</code></td>
|
<td><code>.btn-warning</code></td>
|
||||||
<td>{{_i}}Indicates caution should be taken with this action{{/i}}</td>
|
<td>{{_i}}Indicates caution should be taken with this action{{/i}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</a></td>
|
<td><button class="btn btn-danger" href="#">{{_i}}Danger{{/i}}</button></td>
|
||||||
<td><code>.btn-danger</code></td>
|
<td><code>.btn-danger</code></td>
|
||||||
<td>{{_i}}Indicates a dangerous or potentially negative action{{/i}}</td>
|
<td>{{_i}}Indicates a dangerous or potentially negative action{{/i}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><a class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</a></td>
|
<td><button class="btn btn-inverse" href="#">{{_i}}Inverse{{/i}}</button></td>
|
||||||
<td><code>.btn-inverse</code></td>
|
<td><code>.btn-inverse</code></td>
|
||||||
<td>{{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}</td>
|
<td>{{_i}}Alternate dark gray button, not tied to a semantic action or use{{/i}}</td>
|
||||||
</tr>
|
</tr>
|
||||||
@ -1237,7 +1237,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="span4">
|
<div class="span4">
|
||||||
<h3>{{_i}}Multiple sizes{{/i}}</h3>
|
<h3>{{_i}}Multiple sizes{{/i}}</h3>
|
||||||
<p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.{{/i}}</p>
|
<p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.{{/i}}</p>
|
||||||
<p>
|
<p>
|
||||||
<button class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</button>
|
<button class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||||
<button class="btn btn-large">{{_i}}Action{{/i}}</button>
|
<button class="btn btn-large">{{_i}}Action{{/i}}</button>
|
||||||
@ -1246,6 +1246,10 @@
|
|||||||
<button class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</button>
|
<button class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||||
<button class="btn btn-small">{{_i}}Action{{/i}}</button>
|
<button class="btn btn-small">{{_i}}Action{{/i}}</button>
|
||||||
</p>
|
</p>
|
||||||
|
<p>
|
||||||
|
<button class="btn btn-mini btn-primary">{{_i}}Primary action{{/i}}</button>
|
||||||
|
<button class="btn btn-mini">{{_i}}Action{{/i}}</button>
|
||||||
|
</p>
|
||||||
<br>
|
<br>
|
||||||
<h3>{{_i}}Disabled state{{/i}}</h3>
|
<h3>{{_i}}Disabled state{{/i}}</h3>
|
||||||
<p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.{{/i}}</p>
|
<p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.{{/i}}</p>
|
||||||
|
12
docs/templates/pages/components.mustache
vendored
12
docs/templates/pages/components.mustache
vendored
@ -824,11 +824,19 @@
|
|||||||
<li><a href="#">{{_i}}Link{{/i}}</a></li>
|
<li><a href="#">{{_i}}Link{{/i}}</a></li>
|
||||||
<li><a href="#">{{_i}}Link{{/i}}</a></li>
|
<li><a href="#">{{_i}}Link{{/i}}</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
|
</pre>
|
||||||
|
<p>{{_i}}You can easily add dividers to your nav links with an empty list item and a simple class. Just add this between links:{{/i}}</p>
|
||||||
|
<pre class="prettyprint linenums">
|
||||||
|
<ul class="nav">
|
||||||
|
...
|
||||||
|
<li class="divider-vertical"></li>
|
||||||
|
...
|
||||||
|
</ul>
|
||||||
</pre>
|
</pre>
|
||||||
<h3>{{_i}}Component alignment{{/i}}</h3>
|
<h3>{{_i}}Component alignment{{/i}}</h3>
|
||||||
<p>{{_i}}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.{{/i}}</p>
|
<p>{{_i}}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.{{/i}}</p>
|
||||||
<h3>{{_i}}Adding dropdowns{{/i}}</h3>
|
<h3>{{_i}}Adding dropdowns{{/i}}</h3>
|
||||||
<p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdown">our javascript plugin</a>.{{/i}}</p>
|
<p>{{_i}}Adding dropdowns to the nav is super simple, but does require the use of <a href="./javascript.html#dropdowns">our javascript plugin</a>.{{/i}}</p>
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
<ul class="nav">
|
<ul class="nav">
|
||||||
<li class="dropdown">
|
<li class="dropdown">
|
||||||
@ -844,7 +852,7 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</pre>
|
</pre>
|
||||||
<p><a class="btn" href="./javascript.html#dropdown">{{_i}}Get the javascript →{{/i}}</a></p>
|
<p><a class="btn" href="./javascript.html#dropdowns">{{_i}}Get the javascript →{{/i}}</a></p>
|
||||||
</div><!-- /.span -->
|
</div><!-- /.span -->
|
||||||
</div><!-- /.row -->
|
</div><!-- /.row -->
|
||||||
|
|
||||||
|
2
docs/templates/pages/javascript.mustache
vendored
2
docs/templates/pages/javascript.mustache
vendored
@ -213,7 +213,7 @@
|
|||||||
</pre>
|
</pre>
|
||||||
|
|
||||||
<pre class="prettyprint linenums">
|
<pre class="prettyprint linenums">
|
||||||
<div class="modal">
|
<div class="modal" id="myModal">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<a class="close" data-dismiss="modal">×</a>
|
<a class="close" data-dismiss="modal">×</a>
|
||||||
<h3>Modal header</h3>
|
<h3>Modal header</h3>
|
||||||
|
2
docs/templates/pages/scaffolding.mustache
vendored
2
docs/templates/pages/scaffolding.mustache
vendored
@ -368,7 +368,7 @@
|
|||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>{{_i}}Landscape tablets{{/i}}</td>
|
<td>{{_i}}Landscape tablets{{/i}}</td>
|
||||||
<td>768px to 980px</td>
|
<td>768px to 979px</td>
|
||||||
<td>42px</td>
|
<td>42px</td>
|
||||||
<td>20px</td>
|
<td>20px</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
5
docs/templates/pages/upgrading.mustache
vendored
5
docs/templates/pages/upgrading.mustache
vendored
@ -179,13 +179,10 @@
|
|||||||
<li>{{_i}}The <code>animate</code> option was renamed to <code>animation</code>.{{/i}}</li>
|
<li>{{_i}}The <code>animate</code> option was renamed to <code>animation</code>.{{/i}}</li>
|
||||||
<li>{{_i}}The <code>html</code> option was removed, as the tooltips default to allowing HTML now.{{/i}}</li>
|
<li>{{_i}}The <code>html</code> option was removed, as the tooltips default to allowing HTML now.{{/i}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h3>{{_i}}Tooltips{{/i}}</h3>
|
|
||||||
<ul>
|
|
||||||
<li>{{_i}}Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.){{/i}}</li>
|
|
||||||
</ul>
|
|
||||||
<h3>{{_i}}Popovers{{/i}}</h3>
|
<h3>{{_i}}Popovers{{/i}}</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li>{{_i}}Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.{{/i}}</li>
|
<li>{{_i}}Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.{{/i}}</li>
|
||||||
|
<li>{{_i}}The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.{{/i}}</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h3>{{_i}}New plugins{{/i}}</h3>
|
<h3>{{_i}}New plugins{{/i}}</h3>
|
||||||
<ul>
|
<ul>
|
||||||
|
@ -255,13 +255,10 @@
|
|||||||
<li>The <code>animate</code> option was renamed to <code>animation</code>.</li>
|
<li>The <code>animate</code> option was renamed to <code>animation</code>.</li>
|
||||||
<li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li>
|
<li>The <code>html</code> option was removed, as the tooltips default to allowing HTML now.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h3>Tooltips</h3>
|
|
||||||
<ul>
|
|
||||||
<li>Values for <code>placement</code> option changed from <code>above</code> and <code>below</code> to <code>top</code> and <code>bottom</code>. (Affects popovers, too.)</li>
|
|
||||||
</ul>
|
|
||||||
<h3>Popovers</h3>
|
<h3>Popovers</h3>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li>
|
<li>Child elements now properly namespaced: <code>.title</code> to <code>.popover-title</code>, <code>.inner</code> to <code>.popover-inner</code>, and <code>.content</code> to <code>.popover-content</code>.</li>
|
||||||
|
<li>The <code>placement</code> option value that was <code>below</code> is now <code>bottom</code>, and <code>above</code> is now <code>top</code>.</li>
|
||||||
</ul>
|
</ul>
|
||||||
<h3>New plugins</h3>
|
<h3>New plugins</h3>
|
||||||
<ul>
|
<ul>
|
||||||
|
11
js/bootstrap-alert.js
vendored
11
js/bootstrap-alert.js
vendored
@ -51,11 +51,14 @@
|
|||||||
|
|
||||||
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
|
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
|
||||||
|
|
||||||
$parent.removeClass('in')
|
$parent
|
||||||
|
.trigger('close')
|
||||||
|
.removeClass('in')
|
||||||
|
|
||||||
function removeElement() {
|
function removeElement() {
|
||||||
$parent.remove()
|
$parent
|
||||||
$parent.trigger('closed')
|
.trigger('closed')
|
||||||
|
.remove()
|
||||||
}
|
}
|
||||||
|
|
||||||
$.support.transition && $parent.hasClass('fade') ?
|
$.support.transition && $parent.hasClass('fade') ?
|
||||||
@ -88,4 +91,4 @@
|
|||||||
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
|
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-button.js
vendored
2
js/bootstrap-button.js
vendored
@ -95,4 +95,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
5
js/bootstrap-carousel.js
vendored
5
js/bootstrap-carousel.js
vendored
@ -61,6 +61,7 @@
|
|||||||
|
|
||||||
, pause: function () {
|
, pause: function () {
|
||||||
clearInterval(this.interval)
|
clearInterval(this.interval)
|
||||||
|
this.interval = null
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -82,6 +83,8 @@
|
|||||||
, 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()
|
||||||
@ -151,4 +154,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-collapse.js
vendored
2
js/bootstrap-collapse.js
vendored
@ -133,4 +133,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-dropdown.js
vendored
2
js/bootstrap-dropdown.js
vendored
@ -89,4 +89,4 @@
|
|||||||
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-modal.js
vendored
2
js/bootstrap-modal.js
vendored
@ -207,4 +207,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-popover.js
vendored
2
js/bootstrap-popover.js
vendored
@ -92,4 +92,4 @@
|
|||||||
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
|
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-scrollspy.js
vendored
2
js/bootstrap-scrollspy.js
vendored
@ -122,4 +122,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-tab.js
vendored
2
js/bootstrap-tab.js
vendored
@ -127,4 +127,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-tooltip.js
vendored
2
js/bootstrap-tooltip.js
vendored
@ -267,4 +267,4 @@
|
|||||||
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
|
||||||
}
|
}
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-transition.js
vendored
2
js/bootstrap-transition.js
vendored
@ -48,4 +48,4 @@
|
|||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
2
js/bootstrap-typeahead.js
vendored
2
js/bootstrap-typeahead.js
vendored
@ -268,4 +268,4 @@
|
|||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
}( window.jQuery )
|
}( window.jQuery );
|
@ -92,6 +92,13 @@
|
|||||||
margin-top: -1px;
|
margin-top: -1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Mini
|
||||||
|
.btn-mini {
|
||||||
|
padding: 2px 6px;
|
||||||
|
font-size: @baseFontSize - 2px;
|
||||||
|
line-height: @baseLineHeight - 4px;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// Alternate buttons
|
// Alternate buttons
|
||||||
// --------------------------------------------------
|
// --------------------------------------------------
|
||||||
|
@ -34,6 +34,7 @@ pre {
|
|||||||
white-space: pre;
|
white-space: pre;
|
||||||
white-space: pre-wrap;
|
white-space: pre-wrap;
|
||||||
word-break: break-all;
|
word-break: break-all;
|
||||||
|
word-wrap: break-word;
|
||||||
|
|
||||||
// Make prettyprint styles more spaced out for readability
|
// Make prettyprint styles more spaced out for readability
|
||||||
&.prettyprint {
|
&.prettyprint {
|
||||||
|
@ -42,7 +42,13 @@ input,
|
|||||||
button,
|
button,
|
||||||
select,
|
select,
|
||||||
textarea {
|
textarea {
|
||||||
#font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
|
#font > .shorthand(@baseFontSize,normal,@baseLineHeight); // Set size, weight, line-height here
|
||||||
|
}
|
||||||
|
input,
|
||||||
|
button,
|
||||||
|
select,
|
||||||
|
textarea {
|
||||||
|
#font > #family > .sans-serif(); // And only set font-family here for those that need it (note the missing label element)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Identify controls by their labels
|
// Identify controls by their labels
|
||||||
@ -90,9 +96,12 @@ input[type="radio"] {
|
|||||||
margin: 3px 0;
|
margin: 3px 0;
|
||||||
*margin-top: 0; /* IE7 */
|
*margin-top: 0; /* IE7 */
|
||||||
line-height: normal;
|
line-height: normal;
|
||||||
border: 0;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
.border-radius(0);
|
.border-radius(0);
|
||||||
|
border: 0 \9; /* IE9 and down */
|
||||||
|
}
|
||||||
|
input[type="image"] {
|
||||||
|
border: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset the file input to browser defaults
|
// Reset the file input to browser defaults
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
// Clearfix
|
// Clearfix
|
||||||
// --------
|
// --------
|
||||||
// For clearing floats like a boss h5bp.com/q
|
// For clearing floats like a boss h5bp.com/q
|
||||||
.clearfix() {
|
.clearfix {
|
||||||
*zoom: 1;
|
*zoom: 1;
|
||||||
&:before,
|
&:before,
|
||||||
&:after {
|
&:after {
|
||||||
@ -25,7 +25,7 @@
|
|||||||
// ------------------
|
// ------------------
|
||||||
.tab-focus() {
|
.tab-focus() {
|
||||||
// Default
|
// Default
|
||||||
outline: thin dotted;
|
outline: thin dotted #333;
|
||||||
// Webkit
|
// Webkit
|
||||||
outline: 5px auto -webkit-focus-ring-color;
|
outline: 5px auto -webkit-focus-ring-color;
|
||||||
outline-offset: -2px;
|
outline-offset: -2px;
|
||||||
|
@ -154,7 +154,7 @@
|
|||||||
// PORTRAIT TABLET TO DEFAULT DESKTOP
|
// PORTRAIT TABLET TO DEFAULT DESKTOP
|
||||||
// ----------------------------------
|
// ----------------------------------
|
||||||
|
|
||||||
@media (min-width: 768px) and (max-width: 980px) {
|
@media (min-width: 768px) and (max-width: 979px) {
|
||||||
|
|
||||||
// Fixed grid
|
// Fixed grid
|
||||||
#gridSystem > .generate(12, 42px, 20px);
|
#gridSystem > .generate(12, 42px, 20px);
|
||||||
@ -171,7 +171,7 @@
|
|||||||
|
|
||||||
// TABLETS AND BELOW
|
// TABLETS AND BELOW
|
||||||
// -----------------
|
// -----------------
|
||||||
@media (max-width: 980px) {
|
@media (max-width: 979px) {
|
||||||
|
|
||||||
// UNFIX THE TOPBAR
|
// UNFIX THE TOPBAR
|
||||||
// ----------------
|
// ----------------
|
||||||
|
Loading…
x
Reference in New Issue
Block a user