diff options
| author | Jacob Thornton <[email protected]> | 2011-09-02 00:32:09 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-02 00:32:09 -0700 |
| commit | ec82b613d3d19b47416924cde3e583da1e0d95c5 (patch) | |
| tree | df2e7817715cbf70c5128e1774fe8d288c8a8e61 /docs | |
| parent | 462287e25e0c2295884ad0d2cab31b0cd0b90b26 (diff) | |
| parent | 5ef4519ca8ddf035a19d8f6dfff8745fdb380e32 (diff) | |
| download | bootstrap-ec82b613d3d19b47416924cde3e583da1e0d95c5.tar.xz bootstrap-ec82b613d3d19b47416924cde3e583da1e0d95c5.zip | |
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
bootstrap-1.2.0.css
bootstrap-1.2.0.min.css
lib/patterns.less
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/index.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/index.html b/docs/index.html index f7ccb7d14..e9686b90d 100644 --- a/docs/index.html +++ b/docs/index.html @@ -34,7 +34,7 @@ <!-- Topbar ================================================== --> <div class="topbar"> - <div class="fill"> + <div class="topbar-inner"> <div class="container"> <h3><a href="#">Bootstrap</a></h3> <ul class="nav"> @@ -908,7 +908,7 @@ <h2>Fixed topbar</h2> <div class="topbar-wrapper" style="z-index: 5;"> <div class="topbar"> - <div class="fill"> + <div class="topbar-inner"> <div class="container"> <h3><a href="#">Project Name</a></h3> <ul class="nav"> @@ -941,7 +941,7 @@ </li> </ul> </div> - </div><!-- /fill --> + </div><!-- /topbar-inner --> </div><!-- /topbar --> </div><!-- /topbar-wrapper --> |