diff options
| author | Jacob Thornton <[email protected]> | 2011-09-02 11:49:03 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-02 11:49:03 -0700 |
| commit | 3f242bc70cde589d41dd7574e273e29511c317d2 (patch) | |
| tree | 921fda6c892fe47ddb3f19f6b3d823cbe011798e /lib | |
| parent | 251882892f27fa074d9f801c651060552a970282 (diff) | |
| parent | f29c8abcbbebefa1bb27324cdfb1c22a63e1519e (diff) | |
| download | bootstrap-3f242bc70cde589d41dd7574e273e29511c317d2.tar.xz bootstrap-3f242bc70cde589d41dd7574e273e29511c317d2.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
bootstrap-1.2.0.css
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/preboot.less | 1 | ||||
| -rw-r--r-- | lib/scaffolding.less | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/lib/preboot.less b/lib/preboot.less index f5d5a48d1..9a1d88b2c 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -240,6 +240,7 @@ background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 background-image: linear-gradient(top, @startColor, @endColor); // The standard + filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",@startColor,@endColor)); // IE6 & IE7 } .directional (@startColor: #555, @endColor: #333, @deg: 45deg) { background-color: @endColor; diff --git a/lib/scaffolding.less b/lib/scaffolding.less index b84b43721..ed2b6512b 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -81,11 +81,11 @@ body { .container-fluid { padding: 0 20px; .clearfix(); - .sidebar { + > .sidebar { float: left; width: 220px; } - .content { + > .content { min-width: 700px; max-width: 1180px; margin-left: 240px; @@ -106,4 +106,4 @@ a { color: @linkColorHover; text-decoration: underline; } -}
\ No newline at end of file +} |