mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-27 15:19:52 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jacob Thornton
2013-07-24 20:10:51 -07:00
parent eaefed517a 1f40da9676
commit a282dba58f
9 changed files with 80 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
dist/css/bootstrap.css vendored
View File

@@ -2219,7 +2219,7 @@ input[type="button"].btn-block {
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
text-decoration: none;
cursor: default;
cursor: not-allowed;
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
@@ -2540,7 +2540,7 @@ button.close {
.nav > li.disabled > a:focus {
color: #999999;
text-decoration: none;
cursor: default;
cursor: not-allowed;
background-color: transparent;
}
@@ -2605,6 +2605,7 @@ button.close {
}
.nav-tabs.nav-justified {
display: table;
width: 100%;
border-bottom: 0;
}
@@ -2612,7 +2613,7 @@ button.close {
.nav-tabs.nav-justified > li {
display: table-cell;
float: none;
width: 1%;
width: auto;
}
.nav-tabs.nav-justified > li > a {
@@ -2657,19 +2658,33 @@ button.close {
}
.nav-justified {
display: table;
width: 100%;
}
.nav-justified > li {
display: table-cell;
float: none;
width: 1%;
width: auto;
}
.nav-justified > li > a {
text-align: center;
}
.nav-tabs-justified {
border-bottom: 0;
}
.nav-tabs-justified > li > a {
margin-right: 0;
border-bottom: 1px solid #ddd;
}
.nav-tabs-justified > .active > a {
border-bottom-color: #ffffff;
}
.tabbable:before,
.tabbable:after {
display: table;
@@ -3301,7 +3316,7 @@ button.close {
.pagination > .disabled > a:hover,
.pagination > .disabled > a:focus {
color: #999999;
cursor: default;
cursor: not-allowed;
background-color: #ffffff;
}
@@ -3402,7 +3417,7 @@ button.close {
.pager .disabled > a:focus,
.pager .disabled > span {
color: #999999;
cursor: default;
cursor: not-allowed;
background-color: #ffffff;
}
@@ -3444,8 +3459,8 @@ button.close {
.modal-content {
position: relative;
background-color: #fff;
border: 1px solid #999;
background-color: #ffffff;
border: 1px solid #999999;
border: 1px solid rgba(0, 0, 0, 0.2);
border-radius: 6px;
outline: none;
@@ -3461,7 +3476,7 @@ button.close {
bottom: 0;
left: 0;
z-index: 1030;
background-color: #000;
background-color: #000000;
}
.modal-backdrop.fade {

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

File diff suppressed because one or more lines are too long