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

This commit is contained in:
Jacob Thornton
2012-01-28 00:37:12 -08:00
7 changed files with 101 additions and 95 deletions

View File

@@ -3,6 +3,10 @@
visibility: hidden;
}
@media (max-width: 480px) {
.page-header h1 small {
display: block;
line-height: 18px;
}
.form-horizontal .control-group > label {
float: none;
width: auto;

View File

@@ -657,14 +657,13 @@ form.well {
}
/* Change up some type stuff */
h1 small {
display: block;
line-height: 20px;
}
/* More space between sections */
h2 {
margin-top: 27px;
}
h2 small {
display: block;
line-height: 18px;
}
h3 {
margin-top: 18px;
}
@@ -681,6 +680,7 @@ form.well {
}
.jumbotron p {
margin-right: 0;
margin-left: 0;
font-size: 18px;
line-height: 24px;
}
@@ -695,6 +695,10 @@ form.well {
.quick-links {
margin: 40px 0 0;
}
.quick-links li {
margin-top: 5px;
margin-bottom: 5px;
}
/* hide the bullets on mobile since our horizontal space is limited */
.quick-links .divider {
display: none;
@@ -744,10 +748,10 @@ form.well {
.subnav .nav > li {
float: none;
}
.subnav .nav a {
.subnav .nav > li > a {
border: 0;
}
.subnav .nav li + li a {
.subnav .nav > li + li a {
border-top: 1px solid #e5e5e5;
}