diff options
| author | Mark Otto <[email protected]> | 2013-08-23 22:56:23 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-23 22:56:23 -0700 |
| commit | b86cd3bc3d866838127e7af15f665c70e7f50847 (patch) | |
| tree | 0044cbd39cc9927c8a48ca178b019c049520e2ca /_layouts | |
| parent | 22ce6499102c2ab87bbd8a303b5d26531c6e7df2 (diff) | |
| parent | d5a27855459325290ace93538f5ceafb22dee27a (diff) | |
| download | bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.tar.xz bootstrap-b86cd3bc3d866838127e7af15f665c70e7f50847.zip | |
Merge branch 'master' into deprecate-screen-device-vars
Conflicts:
less/variables.less
Diffstat (limited to '_layouts')
| -rw-r--r-- | _layouts/default.html | 2 | ||||
| -rw-r--r-- | _layouts/home.html | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/_layouts/default.html b/_layouts/default.html index 00b6175fb..3f1276e4e 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -58,6 +58,8 @@ <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <ul class="footer-links"> + <li>Currently v{{ site.current_version }}</li> + <li class="muted">·</li> <li><a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a></li> <li class="muted">·</li> <li><a href="{{ site.blog }}">Blog</a></li> diff --git a/_layouts/home.html b/_layouts/home.html index cc6e2681f..cc5026cf8 100644 --- a/_layouts/home.html +++ b/_layouts/home.html @@ -19,7 +19,7 @@ <ul class="bs-masthead-links"> <li class="current-version"> - Currently v3.0.0 + Currently v{{ site.current_version }} </li> <li> <a href="{{ page.base_url }}2.3.2/">Bootstrap 2.3.2 docs</a> @@ -36,6 +36,9 @@ <li> <a href="{{ site.expo }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Expo']);">Expo</a> </li> + <li> + <a href="{{ site.blog }}" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Blog']);">Blog</a> + </li> </ul> </footer> |