Skip to content

B
bootstrap
Commit 62f76ad3 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' into bs3_remove_icons 

Conflicts:
	docs/components.html
parents f64fe290 cb483b67
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 338 additions and 287 deletions
_config.yml
View file @ 62f76ad3
...@@ -9,4 +9,3 @@ permalink: pretty ...@@ -9,4 +9,3 @@ permalink: pretty
source: ./docs source: ./docs
destination: ./_gh_pages destination: ./_gh_pages
port: 9001 port: 9001
url: http://getbootstrap.dev:9001
docs/_includes/footer.html
View file @ 62f76ad3
...@@ -4,10 +4,6 @@ ...@@ -4,10 +4,6 @@
<script src="/assets/js/jquery.js"></script> <script src="/assets/js/jquery.js"></script>
<script src="/assets/js/bootstrap.js"></script> <script src="/assets/js/bootstrap.js"></script>
<!-- Offcanvas example
================================================== -->
<script src="/assets/js/examples/bootstrap-offcanvas.js"></script>
<script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script>
<script src="/assets/js/holder/holder.js"></script> <script src="/assets/js/holder/holder.js"></script>
......
docs/_includes/nav-javascript.html
View file @ 62f76ad3
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<a href="#js-overview">Overview</a> <a href="#js-overview">Overview</a>
<ul class="nav"> <ul class="nav">
<li><a href="#js-individual-compiled">Individual or compiled</a></li> <li><a href="#js-individual-compiled">Individual or compiled</a></li>
<li><a href="#js-data-attributes">Data attributes</a></li> <li><a href="#js-data-attrs">Data attributes</a></li>
<li><a href="#js-programmatic-api">Programmatic API</a></li> <li><a href="#js-programmatic-api">Programmatic API</a></li>
<li><a href="#js-noconflict">No Conflict</a></li> <li><a href="#js-noconflict">No Conflict</a></li>
<li><a href="#js-events">Events</a></li> <li><a href="#js-events">Events</a></li>
......
docs/assets/css/bootstrap.css
View file @ 62f76ad3
...@@ -353,14 +353,6 @@ small { ...@@ -353,14 +353,6 @@ small {
font-size: 85%; font-size: 85%;
} }
strong {
font-weight: bold;
}
em {
font-style: italic;
}
cite { cite {
font-style: normal; font-style: normal;
} }
...@@ -425,6 +417,7 @@ h6, ...@@ -425,6 +417,7 @@ h6,
.h4, .h4,
.h5, .h5,
.h6 { .h6 {
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
font-weight: 500; font-weight: 500;
line-height: 1.1; line-height: 1.1;
} }
...@@ -818,13 +811,26 @@ pre code { ...@@ -818,13 +811,26 @@ pre code {
.col-lg-11, .col-lg-11,
.col-lg-12 { .col-lg-12 {
position: relative; position: relative;
float: left;
width: 100%;
min-height: 1px; min-height: 1px;
padding-right: 15px; padding-right: 15px;
padding-left: 15px; padding-left: 15px;
} }
.col-1,
.col-2,
.col-3,
.col-4,
.col-5,
.col-6,
.col-7,
.col-8,
.col-9,
.col-10,
.col-11,
.col-12 {
float: left;
}
.col-1 { .col-1 {
width: 8.333333333333332%; width: 8.333333333333332%;
} }
...@@ -877,6 +883,20 @@ pre code { ...@@ -877,6 +883,20 @@ pre code {
.container { .container {
max-width: 728px; max-width: 728px;
} }
.col-sm-1,
.col-sm-2,
.col-sm-3,
.col-sm-4,
.col-sm-5,
.col-sm-6,
.col-sm-7,
.col-sm-8,
.col-sm-9,
.col-sm-10,
.col-sm-11,
.col-sm-12 {
float: left;
}
.col-sm-1 { .col-sm-1 {
width: 8.333333333333332%; width: 8.333333333333332%;
} }
...@@ -913,39 +933,6 @@ pre code { ...@@ -913,39 +933,6 @@ pre code {
.col-sm-12 { .col-sm-12 {
width: 100%; width: 100%;
} }
.col-offset-1 {
margin-left: 8.333333333333332%;
}
.col-offset-2 {
margin-left: 16.666666666666664%;
}
.col-offset-3 {
margin-left: 25%;
}
.col-offset-4 {
margin-left: 33.33333333333333%;
}
.col-offset-5 {
margin-left: 41.66666666666667%;
}
.col-offset-6 {
margin-left: 50%;
}
.col-offset-7 {
margin-left: 58.333333333333336%;
}
.col-offset-8 {
margin-left: 66.66666666666666%;
}
.col-offset-9 {
margin-left: 75%;
}
.col-offset-10 {
margin-left: 83.33333333333334%;
}
.col-offset-11 {
margin-left: 91.66666666666666%;
}
.col-push-1 { .col-push-1 {
left: 8.333333333333332%; left: 8.333333333333332%;
} }
...@@ -1018,6 +1005,20 @@ pre code { ...@@ -1018,6 +1005,20 @@ pre code {
.container { .container {
max-width: 940px; max-width: 940px;
} }
.col-lg-1,
.col-lg-2,
.col-lg-3,
.col-lg-4,
.col-lg-5,
.col-lg-6,
.col-lg-7,
.col-lg-8,
.col-lg-9,
.col-lg-10,
.col-lg-11,
.col-lg-12 {
float: left;
}
.col-lg-1 { .col-lg-1 {
width: 8.333333333333332%; width: 8.333333333333332%;
} }
...@@ -1054,6 +1055,39 @@ pre code { ...@@ -1054,6 +1055,39 @@ pre code {
.col-lg-12 { .col-lg-12 {
width: 100%; width: 100%;
} }
.col-offset-1 {
margin-left: 8.333333333333332%;
}
.col-offset-2 {
margin-left: 16.666666666666664%;
}
.col-offset-3 {
margin-left: 25%;
}
.col-offset-4 {
margin-left: 33.33333333333333%;
}
.col-offset-5 {
margin-left: 41.66666666666667%;
}
.col-offset-6 {
margin-left: 50%;
}
.col-offset-7 {
margin-left: 58.333333333333336%;
}
.col-offset-8 {
margin-left: 66.66666666666666%;
}
.col-offset-9 {
margin-left: 75%;
}
.col-offset-10 {
margin-left: 83.33333333333334%;
}
.col-offset-11 {
margin-left: 91.66666666666666%;
}
} }
@media (min-width: 1200px) { @media (min-width: 1200px) {
...@@ -1200,13 +1234,13 @@ th { ...@@ -1200,13 +1234,13 @@ th {
background-color: #f5f5f5; background-color: #f5f5f5;
} }
table col[class*="col-span-"] { table col[class^="col-"] {
display: table-column; display: table-column;
float: none; float: none;
} }
table td[class*="col-span-"], table td[class^="col-"],
table th[class*="col-span-"] { table th[class^="col-"] {
display: table-cell; display: table-cell;
float: none; float: none;
} }
...@@ -1337,6 +1371,58 @@ input[type="color"]:focus { ...@@ -1337,6 +1371,58 @@ input[type="color"]:focus {
box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6); box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075), 0 0 8px rgba(82, 168, 236, 0.6);
} }
select[disabled],
textarea[disabled],
input[type="text"][disabled],
input[type="password"][disabled],
input[type="datetime"][disabled],
input[type="datetime-local"][disabled],
input[type="date"][disabled],
input[type="month"][disabled],
input[type="time"][disabled],
input[type="week"][disabled],
input[type="number"][disabled],
input[type="email"][disabled],
input[type="url"][disabled],
input[type="search"][disabled],
input[type="tel"][disabled],
input[type="color"][disabled],
select[readonly],
textarea[readonly],
input[type="text"][readonly],
input[type="password"][readonly],
input[type="datetime"][readonly],
input[type="datetime-local"][readonly],
input[type="date"][readonly],
input[type="month"][readonly],
input[type="time"][readonly],
input[type="week"][readonly],
input[type="number"][readonly],
input[type="email"][readonly],
input[type="url"][readonly],
input[type="search"][readonly],
input[type="tel"][readonly],
input[type="color"][readonly],
fieldset[disabled] select,
fieldset[disabled] textarea,
fieldset[disabled] input[type="text"],
fieldset[disabled] input[type="password"],
fieldset[disabled] input[type="datetime"],
fieldset[disabled] input[type="datetime-local"],
fieldset[disabled] input[type="date"],
fieldset[disabled] input[type="month"],
fieldset[disabled] input[type="time"],
fieldset[disabled] input[type="week"],
fieldset[disabled] input[type="number"],
fieldset[disabled] input[type="email"],
fieldset[disabled] input[type="url"],
fieldset[disabled] input[type="search"],
fieldset[disabled] input[type="tel"],
fieldset[disabled] input[type="color"] {
cursor: not-allowed;
background-color: #eeeeee;
}
input, input,
select, select,
textarea { textarea {
...@@ -1490,6 +1576,7 @@ input[type="url"].input-large, ...@@ -1490,6 +1576,7 @@ input[type="url"].input-large,
input[type="search"].input-large, input[type="search"].input-large,
input[type="tel"].input-large, input[type="tel"].input-large,
input[type="color"].input-large { input[type="color"].input-large {
min-height: 56px;
padding: 14px 16px; padding: 14px 16px;
font-size: 18px; font-size: 18px;
border-radius: 6px; border-radius: 6px;
...@@ -1511,34 +1598,12 @@ input[type="url"].input-small, ...@@ -1511,34 +1598,12 @@ input[type="url"].input-small,
input[type="search"].input-small, input[type="search"].input-small,
input[type="tel"].input-small, input[type="tel"].input-small,
input[type="color"].input-small { input[type="color"].input-small {
min-height: 32px; min-height: 30px;
padding: 5px 10px; padding: 5px 10px;
font-size: 12px; font-size: 12px;
border-radius: 3px; border-radius: 3px;
} }
input[disabled],
select[disabled],
textarea[disabled],
input[readonly],
select[readonly],
textarea[readonly],
fieldset[disabled] input,
fieldset[disabled] select,
fieldset[disabled] textarea {
cursor: not-allowed;
background-color: #eeeeee;
}
input[type="radio"][disabled],
input[type="checkbox"][disabled],
input[type="radio"][readonly],
input[type="checkbox"][readonly],
fieldset[disabled] input[type="radio"],
fieldset[disabled] input[type="checkbox"] {
background-color: transparent;
}
.has-warning .control-label { .has-warning .control-label {
color: #c09853; color: #c09853;
} }
...@@ -1608,21 +1673,6 @@ fieldset[disabled] input[type="checkbox"] { ...@@ -1608,21 +1673,6 @@ fieldset[disabled] input[type="checkbox"] {
border-color: #468847; border-color: #468847;
} }
input:focus:invalid,
textarea:focus:invalid,
select:focus:invalid {
color: #b94a48;
border-color: #ee5f5b;
}
input:focus:invalid:focus,
textarea:focus:invalid:focus,
select:focus:invalid:focus {
border-color: #e9322d;
-webkit-box-shadow: 0 0 6px #f8b9b7;
box-shadow: 0 0 6px #f8b9b7;
}
.help-block { .help-block {
display: block; display: block;
margin-top: 5px; margin-top: 5px;
...@@ -1661,6 +1711,7 @@ select:focus:invalid:focus { ...@@ -1661,6 +1711,7 @@ select:focus:invalid:focus {
.input-group-addon, .input-group-addon,
.input-group-btn { .input-group-btn {
width: 1%; width: 1%;
white-space: nowrap;
vertical-align: middle; vertical-align: middle;
} }
...@@ -2939,7 +2990,8 @@ input[type="button"].btn-block { ...@@ -2939,7 +2990,8 @@ input[type="button"].btn-block {
} }
.list-group { .list-group {
margin: 0 0 20px; padding-left: 0;
margin-bottom: 20px;
background-color: #ffffff; background-color: #ffffff;
} }
...@@ -3464,6 +3516,10 @@ button.close { ...@@ -3464,6 +3516,10 @@ button.close {
background-color: transparent; background-color: transparent;
} }
.navbar-nav.pull-right {
width: 100%;
}
.navbar-static-top { .navbar-static-top {
border-radius: 0; border-radius: 0;
} }
...@@ -3677,7 +3733,7 @@ button.close { ...@@ -3677,7 +3733,7 @@ button.close {
.navbar-brand { .navbar-brand {
float: left; float: left;
margin-right: 5px; margin-right: 5px;
margin-left: -5px; margin-left: -15px;
} }
.navbar-nav { .navbar-nav {
float: left; float: left;
...@@ -3692,6 +3748,7 @@ button.close { ...@@ -3692,6 +3748,7 @@ button.close {
} }
.navbar-nav.pull-right { .navbar-nav.pull-right {
float: right; float: right;
width: auto;
} }
.navbar-toggle { .navbar-toggle {
position: relative; position: relative;
...@@ -4375,10 +4432,6 @@ button.close { ...@@ -4375,10 +4432,6 @@ button.close {
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
} }
.popover-title:empty {
display: none;
}
.popover-content { .popover-content {
padding: 9px 14px; padding: 9px 14px;
} }
...@@ -5024,6 +5077,7 @@ a.list-group-item.active > .badge, ...@@ -5024,6 +5077,7 @@ a.list-group-item.active > .badge,
left: 50%; left: 50%;
z-index: 15; z-index: 15;
width: 100px; width: 100px;
padding-left: 0;
margin: 0 0 0 -50px; margin: 0 0 0 -50px;
text-align: center; text-align: center;
list-style: none; list-style: none;
......
docs/assets/css/docs.css
View file @ 62f76ad3
...@@ -81,7 +81,9 @@ body { ...@@ -81,7 +81,9 @@ body {
/* Textual links */ /* Textual links */
.bs-masthead-links { .bs-masthead-links {
margin: 20px 0; margin-top: 20px;
margin-bottom: 20px;
padding-left: 0;
list-style: none; list-style: none;
} }
.bs-masthead-links li { .bs-masthead-links li {
...@@ -711,13 +713,6 @@ input.focused { ...@@ -711,13 +713,6 @@ input.focused {
/* Tablets and up */ /* Tablets and up */
@media screen and (min-width: 768px) { @media screen and (min-width: 768px) {
/* Reaffix the fixed sidebar */
.bs-sidebar.affix {
position: fixed; /* Undo the static from mobile-first approach */
top: 50px;
width: 160px;
}
/* Back to top link */ /* Back to top link */
.bs-top { .bs-top {
display: block; /* Unhide */ display: block; /* Unhide */
...@@ -779,6 +774,8 @@ input.focused { ...@@ -779,6 +774,8 @@ input.focused {
/* Widen the fixed sidebar */ /* Widen the fixed sidebar */
.bs-sidebar.affix { .bs-sidebar.affix {
position: fixed; /* Undo the static from mobile-first approach */
top: 50px;
width: 213px; width: 213px;
} }
......
docs/assets/js/bootstrap.js
View file @ 62f76ad3
...@@ -1420,6 +1420,8 @@ ...@@ -1420,6 +1420,8 @@
$tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
$tip.removeClass('fade top bottom left right in') $tip.removeClass('fade top bottom left right in')
$tip.find('.popover-title:empty').hide()
} }
Popover.prototype.hasContent = function () { Popover.prototype.hasContent = function () {
......
docs/assets/js/bootstrap.min.js
View file @ 62f76ad3
This diff is collapsed.
docs/components.html
View file @ 62f76ad3
...@@ -6,7 +6,6 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na ...@@ -6,7 +6,6 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
--- ---
<!-- Dropdowns <!-- Dropdowns
================================================== --> ================================================== -->
<div class="bs-docs-section" id="dropdowns"> <div class="bs-docs-section" id="dropdowns">
...@@ -168,6 +167,11 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na ...@@ -168,6 +167,11 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</div> </div>
<p class="lead">Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with <a href="./javascript.html#buttons">our buttons plugin</a>.</p> <p class="lead">Group a series of buttons together on a single line with the button group. Add on optional JavaScript radio and checkbox style behavior with <a href="./javascript.html#buttons">our buttons plugin</a>.</p>
<div class="bs-callout">
<h4>Tooltips &amp; popovers in button groups require special setting</h4>
<p>When using tooltips or popovers on elements within a <code>.btn-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p>
</div>
<h3 id="btn-groups-single">Basic button group</h3> <h3 id="btn-groups-single">Basic button group</h3>
<p>Wrap a series of buttons with <code>.btn</code> in <code>.btn-group</code>.</p> <p>Wrap a series of buttons with <code>.btn</code> in <code>.btn-group</code>.</p>
<div class="bs-example"> <div class="bs-example">
...@@ -628,7 +632,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na ...@@ -628,7 +632,7 @@ lead: "Dozens of reusable components built to provide iconography, dropdowns, na
</ul> </ul>
</div> </div>
{% highlight html %} {% highlight html %}
<ul class="nav nav-tabs"> <ul class="nav nav-pills">
... ...
<li class="disabled"><a href="#">Disabled link</a></li> <li class="disabled"><a href="#">Disabled link</a></li>
... ...
......
docs/css.html
View file @ 62f76ad3
...@@ -43,7 +43,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes." ...@@ -43,7 +43,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
</ul> </ul>
<p>These styles can be found within <strong>scaffolding.less</strong>.</p> <p>These styles can be found within <strong>scaffolding.less</strong>.</p>
<h3 id="overview-reset">Normalize reset</h3> <h3 id="overview-normalize">Normalize reset</h3>
<p>For improved cross-browser rendering, we use <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p> <p>For improved cross-browser rendering, we use <a href="http://necolas.github.com/normalize.css/" target="_blank">Normalize</a>, a project by <a href="http://twitter.com/necolas" target="_blank">Nicolas Gallagher</a> and <a href="http://twitter.com/jon_neal" target="_blank">Jonathan Neal</a>.</p>
<h3 id="overview-container">Centering with container</h3> <h3 id="overview-container">Centering with container</h3>
...@@ -247,7 +247,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes." ...@@ -247,7 +247,7 @@ lead: "Fundamental HTML elements styled and enhanced with extensible classes."
<div class="bs-callout"> <div class="bs-callout">
<h4>Need more examples?</h4> <h4>Need more examples?</h4>
<p>We dive into more grid layouts in a separte page, free of chrome and documentation to better show you the power of the grid.</p> <p>We dive into more grid layouts in a separate page, free of chrome and documentation to better show you the power of the grid.</p>
<p><a class="btn btn-danger" target="_blank" href="../examples/grid/">More grid examples</a></p> <p><a class="btn btn-danger" target="_blank" href="../examples/grid/">More grid examples</a></p>
</div> </div>
...@@ -1380,21 +1380,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1380,21 +1380,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
</form> </form>
{% highlight html %} {% highlight html %}
<input id="focusedInput" type="text" value="This is focused..."> <input id="focusedInput" type="text" value="This is focused...">
{% endhighlight %}
<h3 id="forms-invalid-inputs">Invalid inputs</h3>
<p>Style inputs via default browser functionality. Specify a <code>type</code>, add the <code>required</code> attribute if the field is not optional, and (if applicable) specify a <code>pattern</code>.</p>
<div class="bs-callout">
<h4>Cross-browser compatibility</h4>
<p>Invalid inputs are styled via the <code>:invalid</code> CSS selector, which is not supported by Internet Explorer 9 and below.</p>
</div>
<form class="bs-example">
<input type="email" placeholder="test@example.com" required>
</form>
{% highlight html %}
<input type="email" placeholder="test@example.com" required>
{% endhighlight %} {% endhighlight %}
<h3 id="forms-disabled-inputs">Disabled inputs</h3> <h3 id="forms-disabled-inputs">Disabled inputs</h3>
...@@ -1509,12 +1494,16 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1509,12 +1494,16 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<p>Adding on top of existing browser controls, Bootstrap includes other useful form components.</p> <p>Adding on top of existing browser controls, Bootstrap includes other useful form components.</p>
<h3 id="forms-input-groups">Input groups</h3> <h3 id="forms-input-groups">Input groups</h3>
<p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with a <code>.add-on</code> to prepend or append elements to an <code>&lt;input&gt;</code>.</p> <p>Add text or buttons before, after, or on both sides of any text-based input. Use <code>.input-group</code> with an <code>.add-on</code> to prepend or append elements to an <code>&lt;input&gt;</code>.</p>
<div class="bs-callout"> <div class="bs-callout">
<h4>Cross-browser compatibility</h4> <h4>Cross-browser compatibility</h4>
<p>Avoid using <code>&lt;select&gt;</code> elements here as they cannot be fully styled in WebKit browsers.</p> <p>Avoid using <code>&lt;select&gt;</code> elements here as they cannot be fully styled in WebKit browsers.</p>
</div> </div>
<div class="bs-callout">
<h4>Tooltips &amp; popovers in input groups require special setting</h4>
<p>When using tooltips or popovers on elements within an <code>.input-group</code>, you'll have to specify the option <code>container: 'body'</code> to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip or popover is triggered).</p>
</div>
<form class="bs-example bs-example-form"> <form class="bs-example bs-example-form">
<div class="input-group col-lg-9"> <div class="input-group col-lg-9">
...@@ -1757,26 +1746,26 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1757,26 +1746,26 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<form class="bs-example" style="padding-bottom: 15px;"> <form class="bs-example" style="padding-bottom: 15px;">
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<input type="text" placeholder="col-large-2"> <input type="text" placeholder=".col-lg-2">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="text" placeholder="col-large-3"> <input type="text" placeholder=".col-lg-3">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<input type="text" placeholder="col-large-4"> <input type="text" placeholder=".col-lg-4">
</div> </div>
</div> </div>
</form> </form>
{% highlight html %} {% highlight html %}
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<input type="text" placeholder="col-large-2"> <input type="text" placeholder=".col-lg-2">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="text" placeholder="col-large-3"> <input type="text" placeholder=".col-lg-3">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<input type="text" placeholder="col-large-4"> <input type="text" placeholder=".col-lg-4">
</div> </div>
</div> </div>
{% endhighlight %} {% endhighlight %}
......
docs/customize.html
View file @ 62f76ad3
...@@ -357,7 +357,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge ...@@ -357,7 +357,7 @@ lead: Customize Bootstrap's components, LESS variables, and jQuery plugins to ge
</div> </div>
<div class="bs-callout"> <div class="bs-callout">
<h4>Heads up!</h4> <h4>Heads up!</h4>
<p>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> <p>All checked plugins will be compiled into a single file, <code>bootstrap.js</code>. All plugins require the latest version of <a href="http://jquery.com/" target="_blank">jQuery</a> to be included.</p>
</div> </div>
</div> </div>
......
docs/docs.html
View file @ 62f76ad3
...@@ -1942,26 +1942,26 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -1942,26 +1942,26 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<form class="bs-docs-example" style="padding-bottom: 15px;"> <form class="bs-docs-example" style="padding-bottom: 15px;">
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<input type="text" placeholder="col-large-2"> <input type="text" placeholder=".col-lg-2">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="text" placeholder="col-large-3"> <input type="text" placeholder=".col-lg-3">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<input type="text" placeholder="col-large-4"> <input type="text" placeholder=".col-lg-4">
</div> </div>
</div> </div>
</form> </form>
{% highlight html %} {% highlight html %}
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<input type="text" placeholder="col-large-2"> <input type="text" placeholder=".col-lg-2">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type="text" placeholder="col-large-3"> <input type="text" placeholder=".col-lg-3">
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
<input type="text" placeholder="col-large-4"> <input type="text" placeholder=".col-lg-4">
</div> </div>
</div> </div>
{% endhighlight %} {% endhighlight %}
......
docs/getting-started.html
View file @ 62f76ad3
...@@ -48,6 +48,11 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex ...@@ -48,6 +48,11 @@ lead: "An overview of Bootstrap, how to download and use, basic templates and ex
<!-- Latest compiled and minified JavaScript --> <!-- Latest compiled and minified JavaScript -->
<script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script> <script src="//netdna.bootstrapcdn.com/bootstrap/3.0.0/js/bootstrap.min.js"></script>
{% endhighlight %} {% endhighlight %}
<div class="bs-callout" id="callout-less-compilation">
<h4>LESS compilation</h4>
<p>If you download the original files, you need to compile Bootstrap's LESS files into usable CSS. To do that, Bootstrap only officially supports <a href="http://twitter.github.io/recess/">Recess</a>, Twitter's CSS hinter built on top of <a href="http://lesscss.org">less.js</a>.</p>
</div>
</div> </div>
<!-- File structure <!-- File structure
......
docs/javascript.html
View file @ 62f76ad3
This diff is collapsed.
js/popover.js
View file @ 62f76ad3
...@@ -55,6 +55,8 @@ ...@@ -55,6 +55,8 @@
$tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content) $tip.find('.popover-content')[this.options.html ? 'html' : 'text'](content)
$tip.removeClass('fade top bottom left right in') $tip.removeClass('fade top bottom left right in')
$tip.find('.popover-title:empty').hide()
} }
Popover.prototype.hasContent = function () { Popover.prototype.hasContent = function () {
......
less/carousel.less
View file @ 62f76ad3
...@@ -131,6 +131,7 @@ ...@@ -131,6 +131,7 @@
z-index: 15; z-index: 15;
width: 100px; width: 100px;
margin: 0 0 0 -50px; margin: 0 0 0 -50px;
padding-left: 0;
list-style: none; list-style: none;
text-align: center; text-align: center;
......
less/code.less
View file @ 62f76ad3
...@@ -31,8 +31,6 @@ pre { ...@@ -31,8 +31,6 @@ pre {
line-height: @line-height-base; line-height: @line-height-base;
word-break: break-all; word-break: break-all;
word-wrap: break-word; word-wrap: break-word;
white-space: pre;
white-space: pre-wrap;
background-color: #f5f5f5; background-color: #f5f5f5;
border: 1px solid #ccc; // IE8 fallback border: 1px solid #ccc; // IE8 fallback
border: 1px solid rgba(0,0,0,.15); border: 1px solid rgba(0,0,0,.15);
...@@ -47,7 +45,6 @@ pre { ...@@ -47,7 +45,6 @@ pre {
code { code {
padding: 0; padding: 0;
color: inherit; color: inherit;
white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
background-color: transparent; background-color: transparent;
border: 0; border: 0;
......
less/forms.less
View file @ 62f76ad3
...@@ -72,6 +72,17 @@ input[type="color"] { ...@@ -72,6 +72,17 @@ input[type="color"] {
outline: 0; outline: 0;
.box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)"); .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(82,168,236,.6)");
} }
// Disabled and read-only inputs
// Note: HTML5 says that inputs under a fieldset > legend:first-child won't be
// disabled if the fieldset is disabled. Due to implementation difficulty,
// we don't honor that edge case; we style them as disabled anyway.
&[disabled],
&[readonly],
fieldset[disabled] & {
cursor: not-allowed;
background-color: @input-bg-disabled;
}
} }
// Reset appearance properties for textual inputs and textarea // Reset appearance properties for textual inputs and textarea
...@@ -184,7 +195,7 @@ textarea { ...@@ -184,7 +195,7 @@ textarea {
// Move the options list down to align with labels // Move the options list down to align with labels
.controls > .radio:first-child, .controls > .radio:first-child,
.controls > .checkbox:first-child { .controls > .checkbox:first-child {
padding-top: 5px; // has to be padding because margin collaspes padding-top: 5px; // has to be padding because margin collapses
} }
*/ */
...@@ -227,6 +238,7 @@ input[type="search"], ...@@ -227,6 +238,7 @@ input[type="search"],
input[type="tel"], input[type="tel"],
input[type="color"] { input[type="color"] {
&.input-large { &.input-large {
min-height: @input-height-large;
padding: @padding-large-vertical @padding-large-horizontal; padding: @padding-large-vertical @padding-large-horizontal;
font-size: @font-size-large; font-size: @font-size-large;
border-radius: @border-radius-large; border-radius: @border-radius-large;
...@@ -240,35 +252,6 @@ input[type="color"] { ...@@ -240,35 +252,6 @@ input[type="color"] {
} }
// DISABLED STATE
// --------------
// Disabled and read-only inputs
// Note: HTML5 says that inputs under a fieldset > legend:first-child won't be
// disabled if the fieldset is disabled. Due to implementation difficulty,
// we don't honor that edge case; we style them as disabled anyway.
input,
select,
textarea {
&[disabled],
&[readonly],
fieldset[disabled] & {
cursor: not-allowed;
background-color: @input-bg-disabled;
}
}
// Explicitly reset the colors here
input[type="radio"],
input[type="checkbox"] {
&[disabled],
&[readonly],
fieldset[disabled] & {
background-color: transparent;
}
}
// FORM FIELD FEEDBACK STATES // FORM FIELD FEEDBACK STATES
// -------------------------- // --------------------------
...@@ -286,20 +269,6 @@ input[type="checkbox"] { ...@@ -286,20 +269,6 @@ input[type="checkbox"] {
.form-field-validation(@state-success-text, @state-success-text, @state-success-bg); .form-field-validation(@state-success-text, @state-success-text, @state-success-bg);
} }
// HTML5 invalid states
// Shares styles with the .control-group.error above
input:focus:invalid,
textarea:focus:invalid,
select:focus:invalid {
color: #b94a48;
border-color: #ee5f5b;
&:focus {
border-color: darken(#ee5f5b, 10%);
@shadow: 0 0 6px lighten(#ee5f5b, 20%);
.box-shadow(@shadow);
}
}
...@@ -352,6 +321,7 @@ select:focus:invalid { ...@@ -352,6 +321,7 @@ select:focus:invalid {
.input-group-addon, .input-group-addon,
.input-group-btn { .input-group-btn {
width: 1%; width: 1%;
white-space: nowrap;
vertical-align: middle; // Match the inputs vertical-align: middle; // Match the inputs
} }
...@@ -455,7 +425,7 @@ select:focus:invalid { ...@@ -455,7 +425,7 @@ select:focus:invalid {
} }
} }
// Only right aline form labels here when the columns stop stacking // Only right align form labels here when the columns stop stacking
@media (min-width: 768px) { @media (min-width: 768px) {
.form-horizontal .control-label { .form-horizontal .control-label {
text-align: right; text-align: right;
......
less/grid.less
View file @ 62f76ad3
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
// Grid system // Grid system
// -------------------------------------------------- // --------------------------------------------------
// Set the container width, and override it for fixed navbars in media queries // Set the container width, and override it for fixed navbars in media queries
.container { .container {
.container-fixed(); .container-fixed();
...@@ -51,9 +50,6 @@ ...@@ -51,9 +50,6 @@
.col-lg-11, .col-lg-11,
.col-lg-12 { .col-lg-12 {
position: relative; position: relative;
// Float and set width: 100%; for easy stacking on mobile devices
float: left;
width: 100%;
// Prevent columns from collapsing when empty // Prevent columns from collapsing when empty
min-height: 1px; min-height: 1px;
// Inner gutter via padding // Inner gutter via padding
...@@ -68,6 +64,20 @@ ...@@ -68,6 +64,20 @@
// //
// Tiny device columns (smartphones) // Tiny device columns (smartphones)
.col-1,
.col-2,
.col-3,
.col-4,
.col-5,
.col-6,
.col-7,
.col-8,
.col-9,
.col-10,
.col-11,
.col-12 {
float: left;
}
.col-1 { width: percentage((1 / @grid-columns)); } .col-1 { width: percentage((1 / @grid-columns)); }
.col-2 { width: percentage((2 / @grid-columns)); } .col-2 { width: percentage((2 / @grid-columns)); }
.col-3 { width: percentage((3 / @grid-columns)); } .col-3 { width: percentage((3 / @grid-columns)); }
...@@ -87,6 +97,20 @@ ...@@ -87,6 +97,20 @@
max-width: @container-tablet; max-width: @container-tablet;
} }
.col-sm-1,
.col-sm-2,
.col-sm-3,
.col-sm-4,
.col-sm-5,
.col-sm-6,
.col-sm-7,
.col-sm-8,
.col-sm-9,
.col-sm-10,
.col-sm-11,
.col-sm-12 {
float: left;
}
.col-sm-1 { width: percentage((1 / @grid-columns)); } .col-sm-1 { width: percentage((1 / @grid-columns)); }
.col-sm-2 { width: percentage((2 / @grid-columns)); } .col-sm-2 { width: percentage((2 / @grid-columns)); }
.col-sm-3 { width: percentage((3 / @grid-columns)); } .col-sm-3 { width: percentage((3 / @grid-columns)); }
...@@ -100,19 +124,6 @@ ...@@ -100,19 +124,6 @@
.col-sm-11 { width: percentage((11/ @grid-columns)); } .col-sm-11 { width: percentage((11/ @grid-columns)); }
.col-sm-12 { width: 100%; } .col-sm-12 { width: 100%; }
// Offsets
.col-offset-1 { margin-left: percentage((1 / @grid-columns)); }
.col-offset-2 { margin-left: percentage((2 / @grid-columns)); }
.col-offset-3 { margin-left: percentage((3 / @grid-columns)); }
.col-offset-4 { margin-left: percentage((4 / @grid-columns)); }
.col-offset-5 { margin-left: percentage((5 / @grid-columns)); }
.col-offset-6 { margin-left: percentage((6 / @grid-columns)); }
.col-offset-7 { margin-left: percentage((7 / @grid-columns)); }
.col-offset-8 { margin-left: percentage((8 / @grid-columns)); }
.col-offset-9 { margin-left: percentage((9 / @grid-columns)); }
.col-offset-10 { margin-left: percentage((10/ @grid-columns)); }
.col-offset-11 { margin-left: percentage((11/ @grid-columns)); }
// Push and pull columns for source order changes // Push and pull columns for source order changes
.col-push-1 { left: percentage((1 / @grid-columns)); } .col-push-1 { left: percentage((1 / @grid-columns)); }
.col-push-2 { left: percentage((2 / @grid-columns)); } .col-push-2 { left: percentage((2 / @grid-columns)); }
...@@ -144,6 +155,20 @@ ...@@ -144,6 +155,20 @@
.container { .container {
max-width: @container-desktop; max-width: @container-desktop;
} }
.col-lg-1,
.col-lg-2,
.col-lg-3,
.col-lg-4,
.col-lg-5,
.col-lg-6,
.col-lg-7,
.col-lg-8,
.col-lg-9,
.col-lg-10,
.col-lg-11,
.col-lg-12 {
float: left;
}
.col-lg-1 { width: percentage((1 / @grid-columns)); } .col-lg-1 { width: percentage((1 / @grid-columns)); }
.col-lg-2 { width: percentage((2 / @grid-columns)); } .col-lg-2 { width: percentage((2 / @grid-columns)); }
.col-lg-3 { width: percentage((3 / @grid-columns)); } .col-lg-3 { width: percentage((3 / @grid-columns)); }
...@@ -156,6 +181,19 @@ ...@@ -156,6 +181,19 @@
.col-lg-10 { width: percentage((10/ @grid-columns)); } .col-lg-10 { width: percentage((10/ @grid-columns)); }
.col-lg-11 { width: percentage((11/ @grid-columns)); } .col-lg-11 { width: percentage((11/ @grid-columns)); }
.col-lg-12 { width: 100%; } .col-lg-12 { width: 100%; }
// Offsets
.col-offset-1 { margin-left: percentage((1 / @grid-columns)); }
.col-offset-2 { margin-left: percentage((2 / @grid-columns)); }
.col-offset-3 { margin-left: percentage((3 / @grid-columns)); }
.col-offset-4 { margin-left: percentage((4 / @grid-columns)); }
.col-offset-5 { margin-left: percentage((5 / @grid-columns)); }
.col-offset-6 { margin-left: percentage((6 / @grid-columns)); }
.col-offset-7 { margin-left: percentage((7 / @grid-columns)); }
.col-offset-8 { margin-left: percentage((8 / @grid-columns)); }
.col-offset-9 { margin-left: percentage((9 / @grid-columns)); }
.col-offset-10 { margin-left: percentage((10/ @grid-columns)); }
.col-offset-11 { margin-left: percentage((11/ @grid-columns)); }
} }
// Large desktops and up // Large desktops and up
......
less/list-group.less
View file @ 62f76ad3
...@@ -7,7 +7,8 @@ ...@@ -7,7 +7,8 @@
// Easily usable on <ul>, <ol>, or <div>. // Easily usable on <ul>, <ol>, or <div>.
.list-group { .list-group {
// No need to set list-style: none; since .list-group-item is block level // No need to set list-style: none; since .list-group-item is block level
margin: 0 0 20px; // reset all margins because ul and ol margin-bottom: 20px;
padding-left: 0; // reset padding because ul and ol
background-color: @list-group-bg; background-color: @list-group-bg;
} }
......
less/mixins.less
View file @ 62f76ad3
...@@ -400,6 +400,16 @@ ...@@ -400,6 +400,16 @@
margin-bottom: ((@navbar-height - @element-height) / 2); margin-bottom: ((@navbar-height - @element-height) / 2);
} }
// Responsive utilities
// -------------------------
// More easily include all the states for responsive-utilities.less.
.responsive-visibility() {
display: block !important;
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
}
// Grid System // Grid System
...@@ -491,5 +501,5 @@ ...@@ -491,5 +501,5 @@
color: @text-color; color: @text-color;
border-color: @border-color; border-color: @border-color;
background-color: @background-color; background-color: @background-color;
} }
} }
less/navbar.less
View file @ 62f76ad3
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
.navbar { .navbar {
position: relative; position: relative;
margin-bottom: 20px; margin-bottom: 20px;
padding-left: 15px; padding-left: @navbar-padding;
padding-right: 15px; padding-right: @navbar-padding;
background-color: @navbar-bg; background-color: @navbar-bg;
border-radius: @border-radius-base; border-radius: @border-radius-base;
...@@ -48,6 +48,12 @@ ...@@ -48,6 +48,12 @@
color: @navbar-link-disabled-color; color: @navbar-link-disabled-color;
background-color: @navbar-link-disabled-bg; background-color: @navbar-link-disabled-bg;
} }
// Right aligned contents
// Make them full width first so that they align properly on mobile
&.pull-right {
width: 100%;
}
} }
...@@ -90,7 +96,7 @@ ...@@ -90,7 +96,7 @@
max-width: 200px; max-width: 200px;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
padding: 15px; padding: @navbar-padding;
font-size: @font-size-large; font-size: @font-size-large;
font-weight: 500; font-weight: 500;
line-height: @line-height-computed; line-height: @line-height-computed;
...@@ -278,7 +284,7 @@ ...@@ -278,7 +284,7 @@
.navbar-brand { .navbar-brand {
float: left; float: left;
margin-left: -5px; margin-left: -(@navbar-padding);
margin-right: 5px; margin-right: 5px;
} }
.navbar-nav { .navbar-nav {
...@@ -296,6 +302,7 @@ ...@@ -296,6 +302,7 @@
&.pull-right { &.pull-right {
float: right; float: right;
width: auto;
} }
} }
......
less/navs.less
View file @ 62f76ad3
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
} }
} }
// Redeclare pull classes because of specifity // Redeclare pull classes because of specificity
// Todo: consider making these utilities !important to avoid this bullshit // Todo: consider making these utilities !important to avoid this bullshit
> .pull-right { > .pull-right {
float: right; float: right;
......
less/popovers.less
View file @ 62f76ad3
...@@ -40,10 +40,6 @@ ...@@ -40,10 +40,6 @@
background-color: @popover-title-bg; background-color: @popover-title-bg;
border-bottom: 1px solid darken(@popover-title-bg, 5%); border-bottom: 1px solid darken(@popover-title-bg, 5%);
border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0;
&:empty {
display: none;
}
} }
.popover-content { .popover-content {
......
less/responsive-utilities.less
View file @ 62f76ad3
...@@ -29,34 +29,25 @@ ...@@ -29,34 +29,25 @@
// Hide from screenreaders and browsers // Hide from screenreaders and browsers
// Credit: HTML5 Boilerplate // Credit: HTML5 Boilerplate
.hidden { .hidden {
display: none; display: none !important;
visibility: hidden; visibility: hidden !important;
} }
// Visibility utilities // Visibility utilities
// For Phones // For Phones
.visible-sm { .visible-sm {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.visible-md { display: none !important; } .visible-md { display: none !important; }
.visible-lg { display: none !important; } .visible-lg { display: none !important; }
.hidden-sm { display: none !important; } .hidden-sm { display: none !important; }
.hidden-md { .hidden-md {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.hidden-lg { .hidden-lg {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
...@@ -64,25 +55,16 @@ ...@@ -64,25 +55,16 @@
@media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) { @media (min-width: @screen-tablet) and (max-width: @screen-tablet-max) {
.visible-sm { display: none !important; } .visible-sm { display: none !important; }
.visible-md { .visible-md {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.visible-lg { display: none !important; } .visible-lg { display: none !important; }
.hidden-sm { .hidden-sm {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.hidden-md { display: none !important; } .hidden-md { display: none !important; }
.hidden-lg { .hidden-lg {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
} }
...@@ -91,23 +73,14 @@ ...@@ -91,23 +73,14 @@
.visible-sm { display: none !important; } .visible-sm { display: none !important; }
.visible-md { display: none !important; } .visible-md { display: none !important; }
.visible-lg { .visible-lg {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.hidden-sm { .hidden-sm {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.hidden-md { .hidden-md {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.hidden-lg { display: none !important; } .hidden-lg { display: none !important; }
} }
...@@ -118,10 +91,7 @@ ...@@ -118,10 +91,7 @@
@media print { @media print {
.visible-print { .visible-print {
display: block !important; .responsive-visibility();
tr& { display: table-row !important; }
th&,
td& { display: table-cell !important; }
} }
.hidden-print { display: none !important; } .hidden-print { display: none !important; }
} }
less/scaffolding.less
View file @ 62f76ad3
...@@ -27,7 +27,7 @@ body { ...@@ -27,7 +27,7 @@ body {
background-color: @body-bg; background-color: @body-bg;
} }
// Reset fonts for revelant elements // Reset fonts for relevant elements
input, input,
button, button,
select, select,
...@@ -60,7 +60,7 @@ a:focus { ...@@ -60,7 +60,7 @@ a:focus {
img { img {
// Responsive images (ensure images don't scale beyond their parents) // Responsive images (ensure images don't scale beyond their parents)
max-width: 100%; // Part 1: Set a maxium relative to the parent max-width: 100%; // Part 1: Set a maximum relative to the parent
height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching height: auto; // Part 2: Scale the height according to the width, otherwise you get stretching
// Match vertical alignment with other comment elements // Match vertical alignment with other comment elements
......
less/tables.less
View file @ 62f76ad3
...@@ -184,16 +184,18 @@ th { ...@@ -184,16 +184,18 @@ th {
// ----------------- // -----------------
// Reset default table behavior // Reset default table behavior
table col[class*="col-span-"] { table col[class^="col-"] {
float: none; float: none;
display: table-column; display: table-column;
} }
table td[class*="col-span-"], table td[class^="col-"],
table th[class*="col-span-"] { table th[class^="col-"] {
float: none; float: none;
display: table-cell; display: table-cell;
} }
// TABLE BACKGROUNDS // TABLE BACKGROUNDS
// ----------------- // -----------------
// Exact selectors below required to override .table-striped // Exact selectors below required to override .table-striped
......
less/type.less
View file @ 62f76ad3
...@@ -23,8 +23,6 @@ p { ...@@ -23,8 +23,6 @@ p {
// Ex: 14px base font * 85% = about 12px // Ex: 14px base font * 85% = about 12px
small { font-size: 85%; } small { font-size: 85%; }
strong { font-weight: bold; }
em { font-style: italic; }
cite { font-style: normal; } cite { font-style: normal; }
// Utility classes // Utility classes
...@@ -54,6 +52,7 @@ a.text-success:focus { color: darken(@state-success-text, 10%); } ...@@ -54,6 +52,7 @@ a.text-success:focus { color: darken(@state-success-text, 10%); }
h1, h2, h3, h4, h5, h6, h1, h2, h3, h4, h5, h6,
.h1, .h2, .h3, .h4, .h5, .h6 { .h1, .h2, .h3, .h4, .h5, .h6 {
font-family: @headings-font-family;
font-weight: @headings-font-weight; font-weight: @headings-font-weight;
line-height: @headings-line-height; line-height: @headings-line-height;
small { small {
......
less/variables.less
View file @ 62f76ad3
...@@ -53,6 +53,7 @@ ...@@ -53,6 +53,7 @@
@line-height-base: 1.428571429; // 20/14 @line-height-base: 1.428571429; // 20/14
@line-height-computed: floor(@font-size-base * @line-height-base); // ~20px @line-height-computed: floor(@font-size-base * @line-height-base); // ~20px
@headings-font-family: @font-family-base;
@headings-font-weight: 500; @headings-font-weight: 500;
@headings-line-height: 1.1; @headings-line-height: 1.1;
...@@ -128,8 +129,8 @@ ...@@ -128,8 +129,8 @@
@input-color-placeholder: @gray-light; @input-color-placeholder: @gray-light;
@input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2); @input-height-base: (@line-height-computed + (@padding-base-vertical * 2) + 2);
@input-height-large: (@line-height-computed + (@padding-large-vertical * 2) + 2); @input-height-large: (ceil(@font-size-large * @line-height-base) + (@padding-large-vertical * 2) + 2);
@input-height-small: (@line-height-computed + (@padding-small-vertical * 2) + 2); @input-height-small: (ceil(@font-size-small * @line-height-base) + (@padding-small-vertical * 2) + 2);
// Dropdowns // Dropdowns
...@@ -172,6 +173,7 @@ ...@@ -172,6 +173,7 @@
@navbar-height: 50px; @navbar-height: 50px;
@navbar-color: #777; @navbar-color: #777;
@navbar-bg: #eee; @navbar-bg: #eee;
@navbar-padding: floor(@grid-gutter-width / 2); // ~15px
// Navbar links // Navbar links
@navbar-link-color: #777; @navbar-link-color: #777;
......
Markdown is supported
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