diff options
| author | Mark Otto <[email protected]> | 2011-08-21 20:47:24 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-08-21 20:47:24 -0700 |
| commit | a98d2cccb8076b106e08e7ca76e59af013ab2851 (patch) | |
| tree | 2ccfcdd3f3adf195ba49a80fe9a832bfaa2320a8 /docs/assets/css | |
| parent | 5cc933ccccfdc56b3cc0e440ea0022e43a1c3f84 (diff) | |
| download | bootstrap-a98d2cccb8076b106e08e7ca76e59af013ab2851.tar.xz bootstrap-a98d2cccb8076b106e08e7ca76e59af013ab2851.zip | |
merge in master, resolve conflicts
Diffstat (limited to 'docs/assets/css')
| -rw-r--r-- | docs/assets/css/docs.css | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 2d17370c2..4fbfac9d3 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -195,6 +195,9 @@ div.topbar-wrapper { div.topbar-wrapper div.topbar { position: absolute; margin: 0 -20px; +} + +div.topbar-wrapper div.topbar .fill { padding-left: 20px; padding-right: 20px; -webkit-border-radius: 4px; |