1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-06 13:46:42 +02:00

fix left and right tab-content alignment with width: auto;

This commit is contained in:
Mark Otto
2012-03-22 23:38:50 -07:00
parent 7ea34ae0ef
commit c4fb703269
3 changed files with 9 additions and 7 deletions

Binary file not shown.

View File

@@ -2735,6 +2735,10 @@ input[type="submit"].btn.btn-mini {
.tabs-below .nav-tabs .active > a:hover { .tabs-below .nav-tabs .active > a:hover {
border-color: transparent #ddd #ddd #ddd; border-color: transparent #ddd #ddd #ddd;
} }
.tabs-left .tab-content,
.tabs-right .tab-content {
width: auto;
}
.tabs-left .nav-tabs > li, .tabs-left .nav-tabs > li,
.tabs-right .nav-tabs > li { .tabs-right .nav-tabs > li {
float: none; float: none;
@@ -3039,12 +3043,6 @@ input[type="submit"].btn.btn-mini {
margin-left: 10px; margin-left: 10px;
margin-right: 0; margin-right: 0;
} }
.navbar .dropdown-menu {
margin-top: 1px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}
.navbar .dropdown-menu:before { .navbar .dropdown-menu:before {
content: ''; content: '';
display: inline-block; display: inline-block;
@@ -3080,7 +3078,7 @@ input[type="submit"].btn.btn-mini {
top: auto; top: auto;
} }
.navbar .nav .dropdown-toggle .caret, .navbar .nav .dropdown-toggle .caret,
.navbar .nav .open.dropdown .caret { .navbar .nav .open .caret {
border-top-color: #ffffff; border-top-color: #ffffff;
border-bottom-color: #ffffff; border-bottom-color: #ffffff;
} }

View File

@@ -309,6 +309,10 @@
// ------------ // ------------
// Common styles // Common styles
.tabs-left .tab-content,
.tabs-right .tab-content {
width: auto;
}
.tabs-left .nav-tabs > li, .tabs-left .nav-tabs > li,
.tabs-right .nav-tabs > li { .tabs-right .nav-tabs > li {
float: none; float: none;