diff options
author | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2012-10-30 09:01:58 +0400 |
commit | b5af762ef59e1fa97f4386f5feadb67aa5183fef (patch) | |
tree | 3bcd0841e6938379e8c8ae7259ee16f27a49ea41 /docs/templates/layout.mustache | |
parent | 7426ced0fb288a9e86f18da1849ad74f652d219a (diff) | |
parent | 68cfedb34af198f178128f8c9bc8ea164e44304a (diff) |
Merge branch '2.1.2-wip'v2.2.0
Conflicts:
js/bootstrap-dropdown.js
Diffstat (limited to 'docs/templates/layout.mustache')
-rw-r--r-- | docs/templates/layout.mustache | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index d463f441e8..deaec189ad 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -70,7 +70,7 @@ <a href="./components.html">{{_i}}Components{{/i}}</a> </li> <li class="{{javascript}}"> - <a href="./javascript.html">{{_i}}Javascript{{/i}}</a> + <a href="./javascript.html">{{_i}}JavaScript{{/i}}</a> </li> <li class="{{customize}}"> <a href="./customize.html">{{_i}}Customize{{/i}}</a> @@ -90,12 +90,14 @@ <footer class="footer"> <div class="container"> <p class="pull-right"><a href="#">{{_i}}Back to top{{/i}}</a></p> - <p>{{_i}}Designed and built with all the love in the world <a href="http://twitter.com/twitter" target="_blank">@twitter</a> by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.{{/i}}</p> - <p>{{_i}}Code licensed under the <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>. Documentation licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p> - <p>{{_i}}Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p> + <p>{{_i}}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>.{{/i}}</p> + <p>{{_i}}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>.{{/i}}</p> + <p>{{_i}}<a href="http://glyphicons.com">Glyphicons Free</a> licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.{{/i}}</p> <ul class="footer-links"> - <li><a href="http://blog.getbootstrap.com">{{_i}}Read the blog{{/i}}</a></li> - <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Submit issues{{/i}}</a></li> + <li><a href="http://blog.getbootstrap.com">{{_i}}Blog{{/i}}</a></li> + <li class="muted">·</li> + <li><a href="https://github.com/twitter/bootstrap/issues?state=open">{{_i}}Issues{{/i}}</a></li> + <li class="muted">·</li> <li><a href="https://github.com/twitter/bootstrap/wiki">{{_i}}Roadmap and changelog{{/i}}</a></li> </ul> </div> |