rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

Browse Source 
Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
fat 2013-08-17 13:43:58 -07:00
commit 728a5e17d6
5 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/css/bootstrap.css vendored
View File

@ -2473,6 +2473,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
vertical-align: middle;
border-top: 4px solid #000000;
border-right: 4px solid transparent;
border-bottom: 0 dotted;
border-left: 4px solid transparent;
content: "";
}
@ -2591,7 +2592,7 @@ textarea.input-group-sm > .input-group-btn > .btn {
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-top: 0 dotted;
border-bottom: 4px solid #000000;
content: "";
}
@ -2726,7 +2727,7 @@ a.list-group-item:focus {
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: 17.5px;
font-size: 16px;
}
.panel-title > a {
@ -4207,12 +4208,12 @@ button.close {
}
.modal-backdrop {
position: absolute;
position: fixed;
top: 0;
right: 0;
bottom: 0;
left: 0;
z-index: 1030;
height: 100%;
background-color: #000000;
}

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

24
javascript.html
View File

@ -1415,11 +1415,11 @@ $('.nav-tabs').button()
<div class="panel-group" id="accordion">
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
Collapsible Group Item #1
</a>
</h3>
</h4>
</div>
<div id="collapseOne" class="panel-collapse collapse in">
<div class="panel-body">
@ -1429,11 +1429,11 @@ $('.nav-tabs').button()
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
Collapsible Group Item #2
</a>
</h3>
</h4>
</div>
<div id="collapseTwo" class="panel-collapse collapse">
<div class="panel-body">
@ -1443,11 +1443,11 @@ $('.nav-tabs').button()
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
Collapsible Group Item #3
</a>
</h3>
</h4>
</div>
<div id="collapseThree" class="panel-collapse collapse">
<div class="panel-body">
@ -1461,11 +1461,11 @@ $('.nav-tabs').button()
<div class="panel-group" id="accordion">
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseOne">
Collapsible Group Item #1
</a>
</h3>
</h4>
</div>
<div id="collapseOne" class="panel-collapse collapse in">
<div class="panel-body">
@ -1475,11 +1475,11 @@ $('.nav-tabs').button()
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseTwo">
Collapsible Group Item #2
</a>
</h3>
</h4>
</div>
<div id="collapseTwo" class="panel-collapse collapse">
<div class="panel-body">
@ -1489,11 +1489,11 @@ $('.nav-tabs').button()
</div>
<div class="panel">
<div class="panel-heading">
<h3 class="panel-title">
<h4 class="panel-title">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion" href="#collapseThree">
Collapsible Group Item #3
</a>
</h3>
</h4>
</div>
<div id="collapseThree" class="panel-collapse collapse">
<div class="panel-body">

7
less/dropdowns.less
View File

@ -13,6 +13,9 @@
border-top: @caret-width-base solid @dropdown-caret-color;
border-right: @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: "";
}
@ -161,7 +164,9 @@
.navbar-fixed-bottom .dropdown {
// Reverse the 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;
content: "";
}

2
less/panels.less
View File

@ -59,7 +59,7 @@
.panel-title {
margin-top: 0;
margin-bottom: 0;
font-size: (@font-size-base * 1.25);
font-size: ceil((@font-size-base * 1.125));
> a {
color: inherit;
}