diff options
| author | Jacob Thornton <[email protected]> | 2012-01-27 14:44:58 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-27 14:44:58 -0800 |
| commit | 065ed01b1f78a1e5d358b78304ef211d7b96f362 (patch) | |
| tree | d12c8081e5e7159945db03de7a831f788663ef9d /examples | |
| parent | 748696a5532100f7a45cbb0d6a138fae6afac5cb (diff) | |
| parent | 003da1e089edf06c528667009fb59189b5f0e4cc (diff) | |
| download | bootstrap-065ed01b1f78a1e5d358b78304ef211d7b96f362.tar.xz bootstrap-065ed01b1f78a1e5d358b78304ef211d7b96f362.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/container-app.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/container-app.html b/examples/container-app.html index 9bf651753..df0e8dba4 100644 --- a/examples/container-app.html +++ b/examples/container-app.html @@ -12,7 +12,7 @@ <![endif]--> <!-- Le styles --> - <link href="../bootstrap.css" rel="stylesheet"> + <link href="../docs/assets/css/bootstrap.css" rel="stylesheet"> <style type="text/css"> /* Override some defaults */ html, body { @@ -70,7 +70,7 @@ <body> - <div class="navbar navbar-fixed"> + <div class="navbar navbar-fixed-top"> <div class="navbar-inner"> <div class="container"> <a class="brand" href="#">Project name</a> |