diff options
| author | Jacob Thornton <[email protected]> | 2011-09-10 16:51:03 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-10 16:51:03 -0700 |
| commit | 57a8672b77a219b99215b781740cc9cf5f7fc1a5 (patch) | |
| tree | 751350066ffce2704e7f1bd8d379ad17e83fe84b /lib | |
| parent | 23d2fed905c33e1e18c1e8a04bfccbdfe7029cf3 (diff) | |
| parent | 091402760903ed0f2393c09c315fd91e8b6579fe (diff) | |
| download | bootstrap-57a8672b77a219b99215b781740cc9cf5f7fc1a5.tar.xz bootstrap-57a8672b77a219b99215b781740cc9cf5f7fc1a5.zip | |
Merge branch '1.3-wip' of github.com:twitter/bootstrap into 1.3-wip
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/patterns.less | 20 | ||||
| -rw-r--r-- | lib/preboot.less | 5 | ||||
| -rw-r--r-- | lib/scaffolding.less | 2 | ||||
| -rw-r--r-- | lib/type.less | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/lib/patterns.less b/lib/patterns.less index 3e0f56209..53ad3f991 100644 --- a/lib/patterns.less +++ b/lib/patterns.less @@ -900,7 +900,7 @@ input[type=submit].btn { } -// Pattern Animations +// PATTERN ANIMATIONS // ------------------ .fade { @@ -909,4 +909,22 @@ input[type=submit].btn { &.in { opacity: 1; } +} + + +// LABELS +// ------ + +.label { + padding: 1px 3px 2px; + background-color: @grayLight; + font-size: @basefont * .75; + font-weight: bold; + color: @white; + text-transform: uppercase; + .border-radius(3px); + &.important { background-color: #c43c35; } + &.warning { background-color: @orange; } + &.success { background-color: @green; } + &.notice { background-color: lighten(@blue, 25%); } }
\ No newline at end of file diff --git a/lib/preboot.less b/lib/preboot.less index dffeb64bf..1ac8ca91c 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -58,9 +58,12 @@ // Clearfix for clearing floats like a boss h5bp.com/q .clearfix { zoom: 1; - &:before, &:after { + &:before, + &:after { display: table; content: ""; + zoom: 1; + *display: inline; } &:after { clear: both; diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 88f1139ef..fb50cb221 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -86,6 +86,7 @@ body { // Fluid layouts (left aligned, with sidebar, min- & max-width content) .container-fluid { + position: relative; padding-left: 20px; padding-right: 20px; .clearfix(); @@ -98,6 +99,7 @@ body { min-width: 700px; max-width: 1180px; margin-left: 240px; + .clearfix(); } } diff --git a/lib/type.less b/lib/type.less index c0c706462..55ff80937 100644 --- a/lib/type.less +++ b/lib/type.less @@ -173,7 +173,7 @@ code { pre { background-color: #f5f5f5; display: block; - padding: @baseline - 1; + padding: (@baseline - 1) / 2; margin: 0 0 @baseline; line-height: @baseline; font-size: 12px; |