From d2a728c1dd0f4b229fe9ec5266c023f95385c218 Mon Sep 17 00:00:00 2001 From: Kevin Ross Date: Mon, 11 Jan 2016 11:29:39 -0600 Subject: [PATCH] Added a credits section to the docs, makes me feel better than just the LICENSE.md, because indeed we stand on the shoulders of giants. --- LICENSE.md | 8 +++++--- docs/_data/nav.yml | 1 + docs/_includes/footer-example.html | 9 ++++++--- docs/about/credits.md | 17 +++++++++++++++++ docs/about/license.md | 2 +- docs/assets/scss/_component-examples.scss | 18 +++++++++--------- 6 files changed, 39 insertions(+), 16 deletions(-) create mode 100644 docs/about/credits.md diff --git a/LICENSE.md b/LICENSE.md index f6192caa..14411236 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -21,10 +21,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Acknowledgements: +## Acknowledgements: -# Some original Bootstrap tooling code and documentation http://getbootstrap.com +### Bootstrap +Some original Bootstrap tooling code and documentation http://getbootstrap.com Copyright (c) 2011-2016 Twitter, Inc -# Some original MDL code http://www.getmdl.io/ +### MDL +Some original MDL code http://www.getmdl.io/ Copyright 2015 Google Inc. All Rights Reserved. diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml index e0f4bcb7..7b56da9c 100644 --- a/docs/_data/nav.yml +++ b/docs/_data/nav.yml @@ -23,6 +23,7 @@ pages: - title: History - title: Team + - title: Credits - title: License # change nav-docs.html if you change this name to insert "Bootstrap Reference Documentation" diff --git a/docs/_includes/footer-example.html b/docs/_includes/footer-example.html index 927a801a..99c164a4 100644 --- a/docs/_includes/footer-example.html +++ b/docs/_includes/footer-example.html @@ -1,10 +1,13 @@ - - - {% if site.data.minified %} + + + {% else %} + + + {% endif %} diff --git a/docs/about/credits.md b/docs/about/credits.md new file mode 100644 index 00000000..aff8c097 --- /dev/null +++ b/docs/about/credits.md @@ -0,0 +1,17 @@ +--- +layout: docs +title: Credits +group: about +--- + +
+

If I have seen further, it is by standing on the shoulders of giants.

+ +
+ + +This project has drawn significant inspiration or outright code (attributed in the LICENSE.md) from other open source projects. We take this opportunity to thank these other communities, companies and individual developers for their hard work, because we would not be here without them: + +- [Bootstrap](http://getbootstrap.com) - thank you for not only for the Bootstrap code itself, but the project setup and documentation sources as well. +- [Google Material Design Specification](https://www.google.com/design/spec/material-design/introduction.html) - thank you for the effort to put forth a deeply researched, functional, and beautiful design standard. +- [Material Design Lite](http://www.getmdl.io/) - thank you for your effort, we have drawn inspiration for certain components and examples directly from your codebase. diff --git a/docs/about/license.md b/docs/about/license.md index b7a4469c..ed2e8a62 100644 --- a/docs/about/license.md +++ b/docs/about/license.md @@ -29,4 +29,4 @@ Boiled down to smaller chunks, it can be described with the following conditions - Include the source of Material Design for Bootstrap itself, or of any modifications you may have made to it, in any redistribution you may assemble that includes it - Submit changes that you make to Material Design for Bootstrap back to the Material Design for Bootstrap project (though such feedback is encouraged) -The full Material Design for Bootstrap license is located [in the project repository]({{ site.repo }}/blob/master/LICENSE) for more information. +The full Material Design for Bootstrap license is located [in the project repository]({{ site.repo }}/blob/master/LICENSE.md) for more information. diff --git a/docs/assets/scss/_component-examples.scss b/docs/assets/scss/_component-examples.scss index 5eea7378..5e745756 100644 --- a/docs/assets/scss/_component-examples.scss +++ b/docs/assets/scss/_component-examples.scss @@ -230,15 +230,15 @@ } // Example dropdowns -.bd-example > .dropdown > .dropdown-toggle { - float: left; -} -.bd-example > .dropdown > .dropdown-menu { - position: static; - display: block; - margin-bottom: .25rem; - clear: left; -} +//.bd-example > .dropdown > .dropdown-toggle { +// float: left; +//} +//.bd-example > .dropdown > .dropdown-menu { +// position: static; +// display: block; +// margin-bottom: .25rem; +// clear: left; +//} // Example tabbable tabs .bd-example-tabs .nav-tabs {