mirror of
https://github.com/tenrok/bootstrap.git
synced 2026-06-14 18:42:30 +03:00
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
This commit is contained in:
Vendored
+10
-6
@@ -362,11 +362,17 @@ p {
|
||||
|
||||
.lead {
|
||||
margin-bottom: 20px;
|
||||
font-size: 21px;
|
||||
font-size: 16.099999999999998px;
|
||||
font-weight: 200;
|
||||
line-height: 1.4;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
.lead {
|
||||
font-size: 21px;
|
||||
}
|
||||
}
|
||||
|
||||
small {
|
||||
font-size: 85%;
|
||||
}
|
||||
@@ -2513,7 +2519,6 @@ button.close {
|
||||
}
|
||||
|
||||
.nav-tabs.nav-justified {
|
||||
display: table;
|
||||
width: 100%;
|
||||
border-bottom: 0;
|
||||
}
|
||||
@@ -2521,7 +2526,7 @@ button.close {
|
||||
.nav-tabs.nav-justified > li {
|
||||
display: table-cell;
|
||||
float: none;
|
||||
width: auto;
|
||||
width: 1%;
|
||||
}
|
||||
|
||||
.nav-tabs.nav-justified > li > a {
|
||||
@@ -2545,7 +2550,7 @@ button.close {
|
||||
border-radius: 5px;
|
||||
}
|
||||
|
||||
.nav-pills > li + li > a {
|
||||
.nav-pills > li + li {
|
||||
margin-left: 2px;
|
||||
}
|
||||
|
||||
@@ -2566,14 +2571,13 @@ button.close {
|
||||
}
|
||||
|
||||
.nav-justified {
|
||||
display: table;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.nav-justified > li {
|
||||
display: table-cell;
|
||||
float: none;
|
||||
width: auto;
|
||||
width: 1%;
|
||||
}
|
||||
|
||||
.nav-justified > li > a {
|
||||
|
||||
Vendored
+1
-1
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user