]> git.ipfire.org Git - thirdparty/bootstrap.git/commitdiff
Merge branch 'master' into docs_derp
authorMark Otto <otto@github.com>
Mon, 6 Jan 2014 07:23:55 +0000 (23:23 -0800)
committerMark Otto <otto@github.com>
Mon, 6 Jan 2014 07:23:55 +0000 (23:23 -0800)
Conflicts:
docs/_layouts/default.html
docs/_layouts/home.html

1  2 
docs/_includes/footer.html

index a975a00a929a8d0072bd6330c1164557b5f934ad,3f11d53d1dcd0ad9896383c0f37d56ff83c55eca..404f3454a1f020306926985a0b604beb8997a5cc
@@@ -1,28 -1,3 +1,30 @@@
-       <li>&middot;</li>
-       <li><a href="{{ site.repo }}">GitHub</a></li>
 +<!-- Footer
 +================================================== -->
 +<footer class="bs-footer" role="contentinfo">
 +  <div class="container">
 +    {% include social-buttons.html %}
 +
 +    <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>Maintained by the <a href="https://github.com/twbs?tab=members">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
 +    <p>Code licensed under <a href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
 +    <ul class="footer-links muted">
 +      <li>Currently v{{ site.current_version }}</li>
 +      <li>&middot;</li>
++      <li><a href="{{ site.repo }}">GitHub</a></li>
++      <li>&middot;</li>
++      <li><a href="{{ site.baseurl }}getting-started/#examples">Examples</a></li>
++      <li>&middot;</li>
 +      <li><a href="{{ page.base_url }}2.3.2/">v2.3.2 docs</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ page.base_url }}about/">About</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.expo }}">Expo</a></li>
 +      <li>&middot;</li>
 +      <li><a href="{{ site.blog }}">Blog</a></li>
 +    </ul>
 +  </div>
 +</footer>
 +
  <!-- Bootstrap core JavaScript
  ================================================== -->
  <!-- Placed at the end of the document so the pages load faster -->