aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-07-31 15:17:33 -0700
committerMark Otto <[email protected]>2015-07-31 15:17:33 -0700
commit8babdf166a3997f4f52198775223bb1e995e3377 (patch)
tree3157b887e8b63c3c5d45507d9b90af57c63a6850
parentdd6280e1c2ce7ada955af74d5f8c01cb7cc9d206 (diff)
parentc9c9c614a90639e36b34ae44cf4001c01ba9146b (diff)
downloadbootstrap-8babdf166a3997f4f52198775223bb1e995e3377.tar.xz
bootstrap-8babdf166a3997f4f52198775223bb1e995e3377.zip
Merge pull request #16921 from twbs/footer
Simpler docs footer
-rw-r--r--docs/_includes/footer.html41
-rw-r--r--docs/_includes/social-buttons.html16
-rw-r--r--docs/assets/css/src/docs.css57
3 files changed, 21 insertions, 93 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html
index e75497c69..5ac992f99 100644
--- a/docs/_includes/footer.html
+++ b/docs/_includes/footer.html
@@ -2,30 +2,18 @@
================================================== -->
<footer class="bs-docs-footer" role="contentinfo">
<div class="container">
- {% include social-buttons.html %}
- <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>.</p>
- <p>Maintained by the <a href="https://github.com/orgs/twbs/people">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 rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, documentation under <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
- <ul class="bs-docs-footer-links text-muted">
- <li>Currently v{{ site.current_version }}</li>
- <li>&middot;</li>
+ <ul class="bs-docs-footer-links">
<li><a href="{{ site.repo }}">GitHub</a></li>
- <li>&middot;</li>
+ <li><a href="https://twitter.com/getbootstrap">Twitter</a></li>
<li><a href="../getting-started/#examples">Examples</a></li>
- <li>&middot;</li>
- <li><a href="../2.3.2/">v2.3.2 docs</a></li>
- <li>&middot;</li>
<li><a href="../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>
- <li>&middot;</li>
- <li><a href="{{ site.repo }}/issues">Issues</a></li>
- <li>&middot;</li>
- <li><a href="{{ site.repo }}/releases">Releases</a></li>
</ul>
+
+ <p>Designed and built with all the love in the world by <a href="https://twitter.com/mdo" target="_blank">@mdo</a> and <a href="https://twitter.com/fat" target="_blank">@fat</a>. Maintained by the <a href="https://github.com/orgs/twbs/people">core team</a> with the help of <a href="https://github.com/twbs/bootstrap/graphs/contributors">our contributors</a>.</p>
+
+ <p>Code licensed <a rel="license" href="https://github.com/twbs/bootstrap/blob/master/LICENSE" target="_blank">MIT</a>, docs <a rel="license" href="https://creativecommons.org/licenses/by/3.0/" target="_blank">CC BY 3.0</a>.</p>
+
</div>
</footer>
@@ -63,21 +51,6 @@
<!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
<script src="../assets/js/ie10-viewport-bug-workaround.js"></script>
-{% comment %}
- Inject Twitter widgets asynchronously. Snippet snipped from Twitter's
- JS interface site: https://dev.twitter.com/docs/tfw-javascript
-
- * "js.async=1;" added to add async attribute to the generated script tag.
-{% endcomment %}
-<script>
- window.twttr = (function (d,s,id) {
- var t, js, fjs = d.getElementsByTagName(s)[0];
- if (d.getElementById(id)) return; js=d.createElement(s); js.id=id; js.async=1;
- js.src="https://platform.twitter.com/widgets.js"; fjs.parentNode.insertBefore(js, fjs);
- return window.twttr || (t = { _e: [], ready: function(f){ t._e.push(f) } });
- }(document, "script", "twitter-wjs"));
-</script>
-
<!-- Analytics
================================================== -->
<script>
diff --git a/docs/_includes/social-buttons.html b/docs/_includes/social-buttons.html
deleted file mode 100644
index bb0261848..000000000
--- a/docs/_includes/social-buttons.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="bs-docs-social">
- <ul class="bs-docs-social-buttons">
- <li>
- <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=watch&amp;count=true" width="100" height="20" title="Star on GitHub"></iframe>
- </li>
- <li>
- <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=twbs&amp;repo=bootstrap&amp;type=fork&amp;count=true" width="102" height="20" title="Fork on GitHub"></iframe>
- </li>
- <li class="follow-btn">
- <a href="https://twitter.com/getbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @getbootstrap</a>
- </li>
- <li class="tweet-btn">
- <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://getbootstrap.com/" data-count="horizontal" data-via="getbootstrap" data-related="mdo:Creator of Bootstrap">Tweet</a>
- </li>
- </ul>
-</div>
diff --git a/docs/assets/css/src/docs.css b/docs/assets/css/src/docs.css
index 622b3e577..c0c2452b0 100644
--- a/docs/assets/css/src/docs.css
+++ b/docs/assets/css/src/docs.css
@@ -166,26 +166,31 @@ h4 code {
*/
.bs-docs-footer {
- padding-top: 40px;
- padding-bottom: 40px;
+ padding-top: 50px;
+ padding-bottom: 50px;
margin-top: 100px;
- color: #767676;
+ color: #99979c;
text-align: center;
- border-top: 1px solid #e5e5e5;
+ background-color: #2a2730;
+}
+.bs-docs-footer a {
+ color: #fff;
}
.bs-docs-footer-links {
padding-left: 0;
- margin-top: 20px;
+ margin-bottom: 20px;
}
.bs-docs-footer-links li {
- display: inline;
- padding: 0 2px;
+ display: inline-block;
}
-.bs-docs-footer-links li:first-child {
- padding-left: 0;
+.bs-docs-footer-links li + li {
+ margin-left: 15px;
}
@media (min-width: 768px) {
+ .bs-docs-footer {
+ text-align: left;
+ }
.bs-docs-footer p {
margin-bottom: 0;
}
@@ -193,40 +198,6 @@ h4 code {
/*
- * Social buttons
- *
- * Twitter and GitHub social action buttons (for homepage and footer).
- */
-
-.bs-docs-social {
- margin-bottom: 20px;
- text-align: center;
-}
-.bs-docs-social-buttons {
- display: inline-block;
- padding-left: 0;
- margin-bottom: 0;
- list-style: none;
-}
-.bs-docs-social-buttons li {
- display: inline-block;
- padding: 5px 8px;
- line-height: 1;
-}
-.bs-docs-social-buttons .twitter-follow-button {
- width: 225px !important;
-}
-.bs-docs-social-buttons .twitter-share-button {
- width: 98px !important;
-}
-/* Style the GitHub buttons via CSS instead of inline attributes */
-.github-btn {
- overflow: hidden;
- border: 0;
-}
-
-
-/*
* Homepage
*
* Tweaks to the custom homepage and the masthead (main jumbotron).