mirror of
https://github.com/jasny/bootstrap.git
synced 2026-02-03 10:34:57 -05:00
merging in misc fixes to docs and css from other branch
This commit is contained in:
@@ -25,30 +25,25 @@ div.topbar {
|
||||
text-shadow: 0 -1px 0 rgba(0,0,0,.25);
|
||||
}
|
||||
|
||||
// Hover and active states for links
|
||||
ul li a:hover,
|
||||
ul li.active a,
|
||||
a.logo:hover {
|
||||
// Hover and active states
|
||||
a:hover,
|
||||
ul li.active a {
|
||||
background-color: #333;
|
||||
background-color: rgba(255,255,255,.15);
|
||||
background-color: rgba(255,255,255,.05);
|
||||
color: @white;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
// Logo
|
||||
a.logo {
|
||||
// Website name
|
||||
h3 a {
|
||||
float: left;
|
||||
display: block;
|
||||
padding: 8px 20px 12px;
|
||||
margin-left: -20px;
|
||||
margin-left: -20px; // negative indent to left-align the text down the page
|
||||
color: @white;
|
||||
font-size: 20px;
|
||||
font-weight: 200;
|
||||
line-height: 1;
|
||||
img {
|
||||
float: left;
|
||||
margin-right: 6px;
|
||||
}
|
||||
}
|
||||
|
||||
// Search Form
|
||||
@@ -241,6 +236,28 @@ div.topbar {
|
||||
}
|
||||
|
||||
|
||||
// PAGE HEADERS
|
||||
// ------------
|
||||
|
||||
.hero-unit {
|
||||
background-color: #f5f5f5;
|
||||
margin-bottom: 30px;
|
||||
padding: 60px;
|
||||
.border-radius(6px);
|
||||
h1 {
|
||||
margin-bottom: 0;
|
||||
font-size: 60px;
|
||||
line-height: 1;
|
||||
letter-spacing: -1px;
|
||||
}
|
||||
p {
|
||||
font-size: 18px;
|
||||
font-weight: 200;
|
||||
line-height: @baseline * 1.5;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// PAGE HEADERS
|
||||
// ------------
|
||||
|
||||
@@ -458,12 +475,13 @@ div.pagination {
|
||||
// WELLS
|
||||
// -----
|
||||
|
||||
div.well {
|
||||
background: #f5f5f5;
|
||||
.well {
|
||||
background-color: #f5f5f5;
|
||||
margin-bottom: 20px;
|
||||
padding: 19px;
|
||||
min-height: 20px;
|
||||
border: 1px solid #ddd;
|
||||
border: 1px solid #eee;
|
||||
border: 1px solid rgba(0,0,0,.05);
|
||||
.border-radius(4px);
|
||||
.box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@ html, body {
|
||||
background-color: #fff;
|
||||
}
|
||||
body {
|
||||
margin: 0;
|
||||
margin: 60px 0 0; // Add margin to the top of the page for the topbar
|
||||
#font > .sans-serif(normal,@basefont,@baseline);
|
||||
color: @gray;
|
||||
text-rendering: optimizeLegibility;
|
||||
@@ -65,7 +65,7 @@ div.container {
|
||||
|
||||
// Fluid layouts (left aligned, with sidebar, min- & max-width content)
|
||||
div.container-fluid {
|
||||
padding: 20px;
|
||||
padding: 0 20px;
|
||||
.clearfix();
|
||||
div.sidebar {
|
||||
float: left;
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
|
||||
p {
|
||||
#font > .shorthand(normal,@basefont,@baseline);
|
||||
margin-bottom: @baseline;
|
||||
margin-bottom: @baseline / 2;
|
||||
small {
|
||||
font-size: 11px;
|
||||
font-size: @basefont - 2;
|
||||
color: @grayLight;
|
||||
}
|
||||
}
|
||||
@@ -142,7 +142,7 @@ blockquote {
|
||||
#font > .shorthand(300,14px,@baseline);
|
||||
margin-bottom: 0;
|
||||
}
|
||||
small, cite {
|
||||
small {
|
||||
display: block;
|
||||
#font > .shorthand(300,12px,@baseline);
|
||||
color: @grayLight;
|
||||
@@ -178,6 +178,7 @@ pre {
|
||||
margin: 0 0 @baseline;
|
||||
line-height: @baseline;
|
||||
font-size: 12px;
|
||||
border: 1px solid #ccc;
|
||||
border: 1px solid rgba(0,0,0,.15);
|
||||
.border-radius(3px);
|
||||
white-space: pre-wrap;
|
||||
|
||||
Reference in New Issue
Block a user