diff options
| author | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
|---|---|---|
| committer | Ivan Khalopik <[email protected]> | 2013-05-27 11:06:31 +0300 |
| commit | 3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc (patch) | |
| tree | 5fa0a3d3556a83cd96147da46e90ae9f361d8efc /docs/_includes/colophon.html | |
| parent | 3c7a43a1f373d0c534476578b96a75ae2e63c985 (diff) | |
| parent | 7cbb1c0452a1d9904f7655aea78644def85b7f2e (diff) | |
| download | bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.tar.xz bootstrap-3285f4c3062f4a56eaed2461a3128a2e6a3ba9cc.zip | |
Merge remote-tracking branch 'bootstrap/3.0.0-wip' into 3.0.0-wip
Conflicts:
js/bootstrap-collapse.js
Diffstat (limited to 'docs/_includes/colophon.html')
| -rw-r--r-- | docs/_includes/colophon.html | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/docs/_includes/colophon.html b/docs/_includes/colophon.html index 5018113b4..fa7958ef8 100644 --- a/docs/_includes/colophon.html +++ b/docs/_includes/colophon.html @@ -1,35 +1,16 @@ <!-- Footer ================================================== --> -<footer class="bs-docs-footer"> - <div class="bs-docs-container"> +<footer class="bs-footer"> + {% include social-buttons.html %} - <div class="bs-docs-social"> - <ul class="bs-docs-social-buttons"> - <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="100px" height="20px"></iframe> - </li> - <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twitter&repo=bootstrap&type=fork&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="102px" height="20px"></iframe> - </li> - <li class="follow-btn"> - <a href="https://twitter.com/twbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @twbootstrap</a> - </li> - <li class="tweet-btn"> - <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://twitter.github.com/bootstrap/" data-count="horizontal" data-via="twbootstrap" data-related="mdo:Creator of Twitter Bootstrap">Tweet</a> - </li> - </ul> - </div> - - - <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> - <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> - <ul class="footer-links"> - <li><a href="http://blog.getbootstrap.com">Blog</a></li> - <li class="muted">·</li> - <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li> - <li class="muted">·</li> - <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li> - </ul> - </div> + <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> + <p><a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> + <ul class="footer-links"> + <li><a href="http://blog.getbootstrap.com">Blog</a></li> + <li class="muted">·</li> + <li><a href="https://github.com/twitter/bootstrap/issues?state=open">Issues</a></li> + <li class="muted">·</li> + <li><a href="https://github.com/twitter/bootstrap/blob/master/CHANGELOG.md">Changelog</a></li> + </ul> </footer> |