diff options
| author | Mark Otto <[email protected]> | 2011-09-02 00:52:22 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-09-02 00:52:22 -0700 |
| commit | 251882892f27fa074d9f801c651060552a970282 (patch) | |
| tree | 32cf528b0b33d8740c25cf3cafb1be4f515f185c /docs | |
| parent | fa94b264fa9b552427a349235e176543af4be6d1 (diff) | |
| parent | 2a5d829c4a09f82aa9ce4ab8db2025aec91c120b (diff) | |
| download | bootstrap-251882892f27fa074d9f801c651060552a970282.tar.xz bootstrap-251882892f27fa074d9f801c651060552a970282.zip | |
resolve conflicts
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/css/docs.css | 2 | ||||
| -rw-r--r-- | docs/index.html | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css index 67a34280b..a4e51967c 100644 --- a/docs/assets/css/docs.css +++ b/docs/assets/css/docs.css @@ -200,7 +200,7 @@ div.topbar-wrapper div.topbar { 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; diff --git a/docs/index.html b/docs/index.html index b23beb321..50a3b5715 100644 --- a/docs/index.html +++ b/docs/index.html @@ -905,7 +905,6 @@ <div class="page-header"> <h1>Navigation</h1> </div> - <h2>Fixed topbar</h2> <div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar"> |