mirror of
https://github.com/twbs/bootstrap.git
synced 2025-03-02 02:29:24 +01:00
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts: dist/css/bootstrap.min.css
This commit is contained in:
commit
728a5e17d6
9
dist/css/bootstrap.css
vendored
9
dist/css/bootstrap.css
vendored
@ -2473,6 +2473,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
|||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
border-top: 4px solid #000000;
|
border-top: 4px solid #000000;
|
||||||
border-right: 4px solid transparent;
|
border-right: 4px solid transparent;
|
||||||
|
border-bottom: 0 dotted;
|
||||||
border-left: 4px solid transparent;
|
border-left: 4px solid transparent;
|
||||||
content: "";
|
content: "";
|
||||||
}
|
}
|
||||||
@ -2591,7 +2592,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
|
|||||||
|
|
||||||
.dropup .caret,
|
.dropup .caret,
|
||||||
.navbar-fixed-bottom .dropdown .caret {
|
.navbar-fixed-bottom .dropdown .caret {
|
||||||
border-top: 0;
|
border-top: 0 dotted;
|
||||||
border-bottom: 4px solid #000000;
|
border-bottom: 4px solid #000000;
|
||||||
content: "";
|
content: "";
|
||||||
}
|
}
|
||||||
@ -2726,7 +2727,7 @@ a.list-group-item:focus {
|
|||||||
.panel-title {
|
.panel-title {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
font-size: 17.5px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel-title > a {
|
.panel-title > a {
|
||||||
@ -4207,12 +4208,12 @@ button.close {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.modal-backdrop {
|
.modal-backdrop {
|
||||||
position: absolute;
|
position: fixed;
|
||||||
top: 0;
|
top: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
|
bottom: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
z-index: 1030;
|
z-index: 1030;
|
||||||
height: 100%;
|
|
||||||
background-color: #000000;
|
background-color: #000000;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
2
dist/css/bootstrap.min.css
vendored
2
dist/css/bootstrap.min.css
vendored
File diff suppressed because one or more lines are too long
@ -1415,11 +1415,11 @@ $('.nav-tabs').button()
|
|||||||
<div class="panel-group" id="accordion">
|
<div class="panel-group" id="accordion">
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">
|
<h4 class="panel-title">
|
||||||
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
|
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
|
||||||
Collapsible Group Item #1
|
Collapsible Group Item #1
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h4>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapseOne" class="panel-collapse collapse in">
|
<div id="collapseOne" class="panel-collapse collapse in">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
@ -1429,11 +1429,11 @@ $('.nav-tabs').button()
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">
|
<h4 class="panel-title">
|
||||||
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
|
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
|
||||||
Collapsible Group Item #2
|
Collapsible Group Item #2
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h4>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapseTwo" class="panel-collapse collapse">
|
<div id="collapseTwo" class="panel-collapse collapse">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
@ -1443,11 +1443,11 @@ $('.nav-tabs').button()
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">
|
<h4 class="panel-title">
|
||||||
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
|
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
|
||||||
Collapsible Group Item #3
|
Collapsible Group Item #3
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h4>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapseThree" class="panel-collapse collapse">
|
<div id="collapseThree" class="panel-collapse collapse">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
@ -1461,11 +1461,11 @@ $('.nav-tabs').button()
|
|||||||
<div class="panel-group" id="accordion">
|
<div class="panel-group" id="accordion">
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">
|
<h4 class="panel-title">
|
||||||
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
|
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
|
||||||
Collapsible Group Item #1
|
Collapsible Group Item #1
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h4>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapseOne" class="panel-collapse collapse in">
|
<div id="collapseOne" class="panel-collapse collapse in">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
@ -1475,11 +1475,11 @@ $('.nav-tabs').button()
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">
|
<h4 class="panel-title">
|
||||||
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
|
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
|
||||||
Collapsible Group Item #2
|
Collapsible Group Item #2
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h4>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapseTwo" class="panel-collapse collapse">
|
<div id="collapseTwo" class="panel-collapse collapse">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
@ -1489,11 +1489,11 @@ $('.nav-tabs').button()
|
|||||||
</div>
|
</div>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<div class="panel-heading">
|
<div class="panel-heading">
|
||||||
<h3 class="panel-title">
|
<h4 class="panel-title">
|
||||||
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
|
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
|
||||||
Collapsible Group Item #3
|
Collapsible Group Item #3
|
||||||
</a>
|
</a>
|
||||||
</h3>
|
</h4>
|
||||||
</div>
|
</div>
|
||||||
<div id="collapseThree" class="panel-collapse collapse">
|
<div id="collapseThree" class="panel-collapse collapse">
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
|
@ -13,6 +13,9 @@
|
|||||||
border-top: @caret-width-base solid @dropdown-caret-color;
|
border-top: @caret-width-base solid @dropdown-caret-color;
|
||||||
border-right: @caret-width-base solid transparent;
|
border-right: @caret-width-base solid transparent;
|
||||||
border-left: @caret-width-base solid transparent;
|
border-left: @caret-width-base solid transparent;
|
||||||
|
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed,
|
||||||
|
// we can just straight up remove this.
|
||||||
|
border-bottom: 0 dotted;
|
||||||
content: "";
|
content: "";
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -161,7 +164,9 @@
|
|||||||
.navbar-fixed-bottom .dropdown {
|
.navbar-fixed-bottom .dropdown {
|
||||||
// Reverse the caret
|
// Reverse the caret
|
||||||
.caret {
|
.caret {
|
||||||
border-top: 0;
|
// Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this
|
||||||
|
// gets fixed, restore `border-top: 0;`.
|
||||||
|
border-top: 0 dotted;
|
||||||
border-bottom: 4px solid @dropdown-caret-color;
|
border-bottom: 4px solid @dropdown-caret-color;
|
||||||
content: "";
|
content: "";
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@
|
|||||||
.panel-title {
|
.panel-title {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
margin-bottom: 0;
|
margin-bottom: 0;
|
||||||
font-size: (@font-size-base * 1.25);
|
font-size: ceil((@font-size-base * 1.125));
|
||||||
> a {
|
> a {
|
||||||
color: inherit;
|
color: inherit;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user