diff options
| author | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-02 21:04:25 -0700 |
| commit | 0e13f8dca10ff19397d577b0916a72129183bfeb (patch) | |
| tree | 94840c00948c1b9844be7db18b8c1623100639bd /docs/assets/css | |
| parent | b4a84e1e7de1e5448cf9adc61a1a02badec80439 (diff) | |
| parent | 2589c0ac4ecc86feed81cfc5df344e0eb78cda64 (diff) | |
| download | bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.tar.xz bootstrap-0e13f8dca10ff19397d577b0916a72129183bfeb.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into js-examples
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
lib/scaffolding.less
Diffstat (limited to 'docs/assets/css')
| -rw-r--r-- | docs/assets/css/docs.css | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 11c3969d8..f72cd3953 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -24,8 +24,7 @@ section > .row { background-image: -moz-linear-gradient(#004D9F, #049cd9); background-image: -o-linear-gradient(top, #004D9F, #049cd9); background-image: -khtml-gradient(linear, left top, left bottom, from(#004D9F), to(#049cd9)); - filter: progid:DXImageTransform.Microsoft.Gradient(StartColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0); - -ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorStr='#004D9F', EndColorStr='#049cd9', GradientType=0))"; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#004D9F', endColorstr='#049cd9', GradientType=0); /* IE8 and down */ } #masthead div.inner, #footer div.inner { background: transparent url(../img/grid-18px.png) top center; @@ -200,8 +199,7 @@ div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; } - -div.topbar-wrapper div.topbar .fill { +div.topbar-wrapper div.topbar .topbar-inner { padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; |