mirror of
https://github.com/twbs/bootstrap.git
synced 2022-11-09 12:25:43 -05:00
Merge branch '2.2.2-wip' into exploratory
Conflicts: docs/assets/css/bootstrap.css docs/scaffolding.html docs/templates/pages/scaffolding.mustache
This commit is contained in:
Mark Otto
commit
a249d1c8ee
16 changed files with 164 additions and 18 deletions
58
docs/assets/css/bootstrap.css
vendored
58
docs/assets/css/bootstrap.css
vendored
|
|
@ -128,6 +128,58 @@ textarea {
|
|||
vertical-align: top;
|
||||
}
|
||||
|
||||
@media print {
|
||||
* {
|
||||
color: #000 !important;
|
||||
text-shadow: none !important;
|
||||
background: transparent !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
a,
|
||||
a:visited {
|
||||
text-decoration: underline;
|
||||
}
|
||||
a[href]:after {
|
||||
content: " (" attr(href) ")";
|
||||
}
|
||||
abbr[title]:after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
.ir a:after,
|
||||
a[href^="javascript:"]:after,
|
||||
a[href^="#"]:after {
|
||||
content: "";
|
||||
}
|
||||
pre,
|
||||
blockquote {
|
||||
border: 1px solid #999;
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
thead {
|
||||
display: table-header-group;
|
||||
}
|
||||
tr,
|
||||
img {
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
img {
|
||||
max-width: 100% !important;
|
||||
}
|
||||
@page {
|
||||
margin: 0.5cm;
|
||||
}
|
||||
p,
|
||||
h2,
|
||||
h3 {
|
||||
orphans: 3;
|
||||
widows: 3;
|
||||
}
|
||||
h2,
|
||||
h3 {
|
||||
page-break-after: avoid;
|
||||
}
|
||||
}
|
||||
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
|
||||
|
|
@ -4561,6 +4613,7 @@ input[type="button"].btn-block {
|
|||
display: none;
|
||||
width: 236px;
|
||||
padding: 1px;
|
||||
white-space: normal;
|
||||
background-color: #ffffff;
|
||||
border: 1px solid #ccc;
|
||||
border: 1px solid rgba(0, 0, 0, 0.2);
|
||||
|
|
@ -4776,6 +4829,11 @@ a.thumbnail:hover {
|
|||
border-radius: 9px;
|
||||
}
|
||||
|
||||
.label:empty,
|
||||
.badge:empty {
|
||||
display: none;
|
||||
}
|
||||
|
||||
a.label:hover,
|
||||
a.badge:hover {
|
||||
color: #ffffff;
|
||||
|
|
|
|||
|
|
@ -328,8 +328,14 @@ hr.soften {
|
|||
margin-bottom: 0;
|
||||
}
|
||||
.show-grid .show-grid [class*="span"] {
|
||||
margin-top: 5px;
|
||||
}
|
||||
.show-grid [class*="span"] [class*="span"] {
|
||||
background-color: #ccc;
|
||||
}
|
||||
.show-grid [class*="span"] [class*="span"] [class*="span"] {
|
||||
background-color: #999;
|
||||
}
|
||||
|
||||
.show-grid [class*="span"]:nth-child(even) {
|
||||
background-color: #ddd;
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ To target a specific plugin, just include the plugins name as a namespace along
|
|||
|
||||
---
|
||||
|
||||
### PROGRAMATIC API
|
||||
### PROGRAMMATIC API
|
||||
|
||||
We also believe you should be able to use all plugins provided by Bootstrap purely through the JS API.
|
||||
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@
|
|||
|
||||
|
||||
<h2 id="abbreviations">Abbreviations</h2>
|
||||
<p>Stylized implemenation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p>
|
||||
<p>Stylized implementation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.</p>
|
||||
|
||||
<h3><code><abbr></code></h3>
|
||||
<p>For expanded text on long hover of an abbreviation, include the <code>title</code> attribute.</p>
|
||||
|
|
@ -224,7 +224,7 @@
|
|||
</address>
|
||||
<address>
|
||||
<strong>Full Name</strong><br>
|
||||
<a href="mailto:#">first.last@gmail.com</a>
|
||||
<a href="mailto:#">first.last@example.com</a>
|
||||
</address>
|
||||
</div>
|
||||
<pre class="prettyprint linenums">
|
||||
|
|
@ -237,7 +237,7 @@
|
|||
|
||||
<address>
|
||||
<strong>Full Name</strong><br>
|
||||
<a href="mailto:#">first.last@gmail.com</a>
|
||||
<a href="mailto:#">first.last@example.com</a>
|
||||
</address>
|
||||
</pre>
|
||||
|
||||
|
|
|
|||
|
|
@ -1644,6 +1644,9 @@
|
|||
</tbody>
|
||||
</table>
|
||||
|
||||
<h3>Easily collapsible</h3>
|
||||
<p>For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.</p>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -142,7 +142,6 @@
|
|||
</div><!-- /span -->
|
||||
<div class="span3">
|
||||
<h3>Miscellaneous</h3>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> Media object</label>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> Wells</label>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> Close icon</label>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> Utilities</label>
|
||||
|
|
|
|||
|
|
@ -134,7 +134,7 @@ $("#myModal").modal('show') // initializes and invokes show immed
|
|||
|
||||
<h3>Events</h3>
|
||||
<p>Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p>
|
||||
<p>All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.</p>
|
||||
<p>All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myModal').on('show', function (e) {
|
||||
if (!data) return e.preventDefault() // stops modal from being shown
|
||||
|
|
@ -505,7 +505,7 @@ $('#myModal').on('hidden', function () {
|
|||
|
||||
<h3>Methods</h3>
|
||||
<h4>$().dropdown('toggle')</h4>
|
||||
<p>A programatic api for toggling menus for a given navbar or tabbed navigation.</p>
|
||||
<p>A programmatic api for toggling menus for a given navbar or tabbed navigation.</p>
|
||||
</section>
|
||||
|
||||
|
||||
|
|
@ -634,7 +634,7 @@ $('[data-spy="scroll"]').each(function () {
|
|||
|
||||
|
||||
<h2>Example tabs</h2>
|
||||
<p>Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.</p>
|
||||
<p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p>
|
||||
<div class="bs-docs-example">
|
||||
<ul id="myTab" class="nav nav-tabs">
|
||||
<li class="active"><a href="#home" data-toggle="tab">Home</a></li>
|
||||
|
|
|
|||
|
|
@ -228,7 +228,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
<!-- Layouts (Default and fluid)
|
||||
================================================== -->
|
||||
<section id="layouts">
|
||||
|
|
|
|||
6
docs/templates/pages/base-css.mustache
vendored
6
docs/templates/pages/base-css.mustache
vendored
|
|
@ -127,7 +127,7 @@
|
|||
|
||||
{{! Abbreviations }}
|
||||
<h2 id="abbreviations">{{_i}}Abbreviations{{/i}}</h2>
|
||||
<p>{{_i}}Stylized implemenation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p>
|
||||
<p>{{_i}}Stylized implementation of HTML's <code><abbr></code> element for abbreviations and acronyms to show the expanded version on hover. Abbreviations with a <code>title</code> attribute have a light dotted bottom border and a help cursor on hover, providing additional context on hover.{{/i}}</p>
|
||||
|
||||
<h3><code><abbr></code></h3>
|
||||
<p>{{_i}}For expanded text on long hover of an abbreviation, include the <code>title</code> attribute.{{/i}}</p>
|
||||
|
|
@ -162,7 +162,7 @@
|
|||
</address>
|
||||
<address>
|
||||
<strong>{{_i}}Full Name{{/i}}</strong><br>
|
||||
<a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a>
|
||||
<a href="mailto:#">{{_i}}first.last@example.com{{/i}}</a>
|
||||
</address>
|
||||
</div>
|
||||
<pre class="prettyprint linenums">
|
||||
|
|
@ -175,7 +175,7 @@
|
|||
|
||||
<address>
|
||||
<strong>{{_i}}Full Name{{/i}}</strong><br>
|
||||
<a href="mailto:#">{{_i}}first.last@gmail.com{{/i}}</a>
|
||||
<a href="mailto:#">{{_i}}first.last@example.com{{/i}}</a>
|
||||
</address>
|
||||
</pre>
|
||||
|
||||
|
|
|
|||
3
docs/templates/pages/components.mustache
vendored
3
docs/templates/pages/components.mustache
vendored
|
|
@ -1575,6 +1575,9 @@
|
|||
</tbody>
|
||||
</table>
|
||||
|
||||
<h3>{{_i}}Easily collapsible{{/i}}</h3>
|
||||
<p>{{_i}}For easy implementation, labels and badges will simply collapse (via CSS's <code>:empty</code> selector) when no content exists within.{{/i}}</p>
|
||||
|
||||
</section>
|
||||
|
||||
|
||||
|
|
|
|||
1
docs/templates/pages/customize.mustache
vendored
1
docs/templates/pages/customize.mustache
vendored
|
|
@ -73,7 +73,6 @@
|
|||
</div><!-- /span -->
|
||||
<div class="span3">
|
||||
<h3>{{_i}}Miscellaneous{{/i}}</h3>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="media.less"> {{_i}}Media object{{/i}}</label>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="wells.less"> {{_i}}Wells{{/i}}</label>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="close.less"> {{_i}}Close icon{{/i}}</label>
|
||||
<label class="checkbox"><input checked="checked" type="checkbox" value="utilities.less"> {{_i}}Utilities{{/i}}</label>
|
||||
|
|
|
|||
6
docs/templates/pages/javascript.mustache
vendored
6
docs/templates/pages/javascript.mustache
vendored
|
|
@ -65,7 +65,7 @@ $("#myModal").modal('show') // initializes and invokes show immed
|
|||
|
||||
<h3>{{_i}}Events{{/i}}</h3>
|
||||
<p>{{_i}}Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.{{/i}}</p>
|
||||
<p>{{_i}}All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.{{/i}}</p>
|
||||
<p>{{_i}}All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.{{/i}}</p>
|
||||
<pre class="prettyprint linenums">
|
||||
$('#myModal').on('show', function (e) {
|
||||
if (!data) return e.preventDefault() // stops modal from being shown
|
||||
|
|
@ -437,7 +437,7 @@ $('#myModal').on('hidden', function () {
|
|||
|
||||
<h3>{{_i}}Methods{{/i}}</h3>
|
||||
<h4>$().dropdown('toggle')</h4>
|
||||
<p>{{_i}}A programatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}</p>
|
||||
<p>{{_i}}A programmatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}</p>
|
||||
</section>
|
||||
|
||||
|
||||
|
|
@ -566,7 +566,7 @@ $('[data-spy="scroll"]').each(function () {
|
|||
|
||||
|
||||
<h2>{{_i}}Example tabs{{/i}}</h2>
|
||||
<p>{{_i}}Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.{{/i}}</p>
|
||||
<p>{{_i}}Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.{{/i}}</p>
|
||||
<div class="bs-docs-example">
|
||||
<ul id="myTab" class="nav nav-tabs">
|
||||
<li class="active"><a href="#home" data-toggle="tab">{{_i}}Home{{/i}}</a></li>
|
||||
|
|
|
|||
1
docs/templates/pages/scaffolding.mustache
vendored
1
docs/templates/pages/scaffolding.mustache
vendored
|
|
@ -159,7 +159,6 @@
|
|||
|
||||
|
||||
|
||||
|
||||
<!-- Layouts (Default and fluid)
|
||||
================================================== -->
|
||||
<section id="layouts">
|
||||
|
|
|
|||
|
|
@ -27,6 +27,14 @@
|
|||
border-radius: 9px;
|
||||
}
|
||||
|
||||
// Empty labels/badges collapse
|
||||
.label,
|
||||
.badge {
|
||||
&:empty {
|
||||
display: none;
|
||||
}
|
||||
}
|
||||
|
||||
// Hover state, but only for links
|
||||
a {
|
||||
&.label:hover,
|
||||
|
|
|
|||
|
|
@ -20,12 +20,14 @@
|
|||
border-radius: 6px;
|
||||
.box-shadow(0 5px 10px rgba(0,0,0,.2));
|
||||
|
||||
// Overrides for proper insertion
|
||||
white-space: normal;
|
||||
|
||||
// Offset the popover to account for the popover arrow
|
||||
&.top { margin-top: -10px; }
|
||||
&.right { margin-left: 10px; }
|
||||
&.bottom { margin-top: 10px; }
|
||||
&.left { margin-left: -10px; }
|
||||
|
||||
}
|
||||
|
||||
.popover-title {
|
||||
|
|
|
|||
|
|
@ -133,3 +133,73 @@ textarea {
|
|||
overflow: auto; // Remove vertical scrollbar in IE6-9
|
||||
vertical-align: top; // Readability and alignment cross-browser
|
||||
}
|
||||
|
||||
|
||||
// Printing
|
||||
// -------------------------
|
||||
// Source: https://github.com/h5bp/html5-boilerplate/blob/master/css/main.css
|
||||
|
||||
@media print {
|
||||
|
||||
* {
|
||||
text-shadow: none !important;
|
||||
color: #000 !important; // Black prints faster: h5bp.com/s
|
||||
background: transparent !important;
|
||||
box-shadow: none !important;
|
||||
}
|
||||
|
||||
a,
|
||||
a:visited {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
a[href]:after {
|
||||
content: " (" attr(href) ")";
|
||||
}
|
||||
|
||||
abbr[title]:after {
|
||||
content: " (" attr(title) ")";
|
||||
}
|
||||
|
||||
// Don't show links for images, or javascript/internal links
|
||||
.ir a:after,
|
||||
a[href^="javascript:"]:after,
|
||||
a[href^="#"]:after {
|
||||
content: "";
|
||||
}
|
||||
|
||||
pre,
|
||||
blockquote {
|
||||
border: 1px solid #999;
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
|
||||
thead {
|
||||
display: table-header-group; // h5bp.com/t
|
||||
}
|
||||
|
||||
tr,
|
||||
img {
|
||||
page-break-inside: avoid;
|
||||
}
|
||||
|
||||
img {
|
||||
max-width: 100% !important;
|
||||
}
|
||||
|
||||
@page {
|
||||
margin: 0.5cm;
|
||||
}
|
||||
|
||||
p,
|
||||
h2,
|
||||
h3 {
|
||||
orphans: 3;
|
||||
widows: 3;
|
||||
}
|
||||
|
||||
h2,
|
||||
h3 {
|
||||
page-break-after: avoid;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue