diff options
| author | Mark Otto <[email protected]> | 2011-08-20 20:19:03 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-20 20:19:03 -0700 |
| commit | 2fcb67777a238581cd9c649c5455ca78c8370926 (patch) | |
| tree | 89261f23a5f7f4572eefe3ad8d065e83bb63a816 /lib | |
| parent | a3caafb97e1da20ad07cb83206353fcf344bc373 (diff) | |
| parent | 72899a4ee8f9c3b75ba5e015d6c88f5154705c62 (diff) | |
| download | bootstrap-2fcb67777a238581cd9c649c5455ca78c8370926.tar.xz bootstrap-2fcb67777a238581cd9c649c5455ca78c8370926.zip | |
merging in misc fixes to docs and css from other branch
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/patterns.less | 48 | ||||
| -rw-r--r-- | lib/scaffolding.less | 4 | ||||
| -rw-r--r-- | lib/type.less | 7 |
3 files changed, 39 insertions, 20 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index db6f42bb4..69d747463 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -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 @@ -244,6 +239,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 +// ------------ + div.page-header { margin-bottom: @baseline - 1; border-bottom: 1px solid #ddd; @@ -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)); } diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 427dab2b8..5b41b64a4 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -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; diff --git a/lib/type.less b/lib/type.less index 2e330f9a1..1091d149b 100644 --- a/lib/type.less +++ b/lib/type.less @@ -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; |
