diff options
| author | fat <[email protected]> | 2013-07-25 23:30:29 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-07-25 23:30:29 -0700 |
| commit | f58827f24d6593bc36ff48b4c58a0fd954427326 (patch) | |
| tree | 2770668c3b1fe4a6eab4d5cca7a6f713f752c800 /_includes | |
| parent | f5f04ae4a0cd57c59c782a45cca28220d5dbb3ea (diff) | |
| parent | 8a7553aeda0a99598c54637bc22954ca890cb697 (diff) | |
| download | bootstrap-f58827f24d6593bc36ff48b4c58a0fd954427326.tar.xz bootstrap-f58827f24d6593bc36ff48b4c58a0fd954427326.zip | |
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Diffstat (limited to '_includes')
| -rw-r--r-- | _includes/nav-main.html | 9 | ||||
| -rw-r--r-- | _includes/old-bs-docs.html | 8 |
2 files changed, 9 insertions, 8 deletions
diff --git a/_includes/nav-main.html b/_includes/nav-main.html index 40244d3a2..28c1e05a5 100644 --- a/_includes/nav-main.html +++ b/_includes/nav-main.html @@ -1,6 +1,6 @@ <div class="navbar navbar-inverse navbar-fixed-top bs-docs-nav"> <div class="container"> - <a href="/" class="navbar-brand">Bootstrap</a> + <a href="/" class="navbar-brand">Bootstrap 3 RC1</a> <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse"> <span class="icon-bar"></span> <span class="icon-bar"></span> @@ -24,13 +24,6 @@ <a href="/customize">Customize</a> </li> </ul> - {% if page.layout == "default" %} - <ul class="nav navbar-nav pull-right"> - <li> - <a href="http://getbootstrap.com/2.3.2/">Looking for Bootstrap 2.3.2?</a> - </li> - </ul> - {% endif %} </div> </div> </div> diff --git a/_includes/old-bs-docs.html b/_includes/old-bs-docs.html new file mode 100644 index 000000000..7b7065459 --- /dev/null +++ b/_includes/old-bs-docs.html @@ -0,0 +1,8 @@ +<div class="bs-old-docs"> + <div class="container"> + <strong> + <a href="/2.3.3/">Looking for Bootstrap 2.3.3 docs?</a> + </strong> + We've moved it to a new home while we push forward with Bootstrap 3. <a href="http://blog.getbootstrap.com/">Read the blog</a> for details. + </div> +</div> |