diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fcd95bf7a..96b7732b0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,12 +33,13 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso - Double quotes only, never single quotes - Always use proper indentation - Use tags and elements appropriate for an HTML5 doctype (e.g., self-closing tags) +- Use CDNs and HTTPS for third-party JS when possible. We don't use protocol-relative URLs in this case because they break when viewing the page locally via `file://`. ### CSS - Adhere to the [RECESS CSS property order](http://markdotto.com/2011/11/29/css-property-order/) - Multiple-line approach (one property and value per line) -- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`) +- Always a space after a property's colon (e.g., `display: block;` and not `display:block;`) - End all lines with a semi-colon - For multiple, comma-separated selectors, place each selector on its own line - Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks). @@ -55,4 +56,6 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ## License -By contributing your code, you agree to license your contribution under the terms of the APLv2: https://github.com/twbs/bootstrap/blob/master/LICENSE +With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). We're in the process of collecting permissions from all Bootstrap contributors with code still part of the project to make this happen. For details, please see [#2054](https://github.com/twbs/bootstrap/issues/2054). + +By contributing your code, you agree to dual-license your contribution under the [Apache 2](https://github.com/twbs/bootstrap/blob/master/LICENSE) and [MIT](https://github.com/twbs/bootstrap/blob/master/MIT) licenses. diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 000000000..9a683e374 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2013 Twitter, Inc + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/README.md b/README.md index aae3e87d3..2b768520c 100644 --- a/README.md +++ b/README.md @@ -113,6 +113,7 @@ More over, if your pull request contains JavaScript patches or features, you mus Editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at [http://editorconfig.org](http://editorconfig.org). +With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap code (not the docs). Please see the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md) for more information. ## Community diff --git a/_includes/header.html b/_includes/header.html index e70f6a8b6..1885b58eb 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -21,7 +21,7 @@ diff --git a/about.html b/about.html index 66d72edd1..f64ea8ca7 100644 --- a/about.html +++ b/about.html @@ -86,8 +86,8 @@ base_url: "../"

Community members have translated Bootstrap's documentation into various langauges. None are officially supported and may not always be up to date.

Have another language to add, or perhaps a different or better translation? Let us know by opening an issue.

diff --git a/components.html b/components.html index 59b3f4cee..dbe981c2a 100644 --- a/components.html +++ b/components.html @@ -17,206 +17,806 @@ base_url: "../"

Available glyphs

Includes 200 glyphs in font format from the Glyphicon Halflings set. Glyphicons Halflings are normally not available for free, but their creator has made them available for Bootstrap free of cost. As a thank you, we only ask that you to include a link back to Glyphicons whenever possible.

@@ -2115,25 +2715,30 @@ body { padding-bottom: 70px; }

Jumbotron

-

A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site. To make the jumbotron full width, don't include it within a .container. Placing it within a container will keep it at the width of the rest of your content and provide rounded corners.

+

A lightweight, flexible component that can optionally extend the entire viewport to showcase key content on your site.

-
-

Hello, world!

-

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

-

Learn more

-
+

Hello, world!

+

This is a simple hero unit, a simple jumbotron-style component for calling extra attention to featured content or information.

+

Learn more

{% highlight html %} +
+

Hello, world!

+

...

+

Learn more

+
+{% endhighlight %} +

To make the jumbotron full width, and without rounded corners, place it outside all .containers and instead add a .container within.

+{% highlight html %}
-

Hello, world!

-

...

-

Learn more

+ ...
{% endhighlight %} + diff --git a/docs-assets/css/docs.css b/docs-assets/css/docs.css index 80784d97e..7abf6ed09 100644 --- a/docs-assets/css/docs.css +++ b/docs-assets/css/docs.css @@ -1,3 +1,11 @@ +/*! + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Creative Commons Attribution 3.0 Unported License. For + * details, see http://creativecommons.org/licenses/by/3.0/. + */ + + /* * Bootstrap Documentation * Special styles for presenting Bootstrap's documentation and code examples. @@ -553,20 +561,10 @@ h1[id] { /* Common styles for all types */ .bs-callout { - /*position: relative;*/ margin: 20px 0; padding: 20px; border-left: 3px solid #eee; - /*border-width: 1px 1px 1px 10px;*/ } -/*.bs-callout:before { - position: absolute; - top: 0; - left: -20px; - color: #fff; - width: 20px; - height: 20px; -}*/ .bs-callout h4 { margin-top: 0; margin-bottom: 5px; @@ -574,10 +572,6 @@ h1[id] { .bs-callout p:last-child { margin-bottom: 0; } -.bs-callout code, -.bs-callout .highlight { - /*background-color: #fff;*/ -} /* Variations */ .bs-callout-danger { @@ -1061,10 +1055,14 @@ h1[id] { border: 1px solid #ddd; } .bs-glyphicons .glyphicon { - display: block; - margin: 5px auto 10px; + margin-top: 5px; + margin-bottom: 10px; font-size: 24px; } +.bs-glyphicons .glyphicon-class { + display: block; + text-align: center; +} .bs-glyphicons li:hover { background-color: rgba(86,61,124,.1); } diff --git a/docs-assets/js/application.js b/docs-assets/js/application.js index 44b2e12ad..72d4cd16b 100644 --- a/docs-assets/js/application.js +++ b/docs-assets/js/application.js @@ -2,6 +2,14 @@ // IT'S ALL JUST JUNK FOR OUR DOCS! // ++++++++++++++++++++++++++++++++++++++++++ +/*! + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Creative Commons Attribution 3.0 Unported License. For + * details, see http://creativecommons.org/licenses/by/3.0/. + */ + + !function ($) { $(function(){ diff --git a/docs-assets/js/customizer.js b/docs-assets/js/customizer.js index 799707784..1b358b914 100644 --- a/docs-assets/js/customizer.js +++ b/docs-assets/js/customizer.js @@ -1,3 +1,11 @@ +/*! + * Copyright 2013 Twitter, Inc. + * + * Licensed under the Creative Commons Attribution 3.0 Unported License. For + * details, see http://creativecommons.org/licenses/by/3.0/. + */ + + window.onload = function () { // wait for load in a dumb way because B-0 var cw = '/*!\n * Bootstrap v3.0.0\n *\n * Copyright 2013 Twitter, Inc\n * Licensed under the Apache License v2.0\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Designed and built with all the love in the world @twitter by @mdo and @fat.\n */\n\n' diff --git a/examples/carousel/index.html b/examples/carousel/index.html index 84c7aa5e6..8764b2015 100644 --- a/examples/carousel/index.html +++ b/examples/carousel/index.html @@ -15,7 +15,7 @@ diff --git a/examples/grid/index.html b/examples/grid/index.html index 3d34e75ed..b058ac173 100644 --- a/examples/grid/index.html +++ b/examples/grid/index.html @@ -18,7 +18,7 @@ diff --git a/examples/jumbotron-narrow/index.html b/examples/jumbotron-narrow/index.html index 07764ed57..a393a1934 100644 --- a/examples/jumbotron-narrow/index.html +++ b/examples/jumbotron-narrow/index.html @@ -18,7 +18,7 @@ diff --git a/examples/jumbotron/index.html b/examples/jumbotron/index.html index f4a0a667c..afa88bcac 100644 --- a/examples/jumbotron/index.html +++ b/examples/jumbotron/index.html @@ -18,7 +18,7 @@ diff --git a/examples/justified-nav/index.html b/examples/justified-nav/index.html index dce853a0d..884422f19 100644 --- a/examples/justified-nav/index.html +++ b/examples/justified-nav/index.html @@ -18,7 +18,7 @@ diff --git a/examples/navbar-fixed-top/index.html b/examples/navbar-fixed-top/index.html index a79bcee9e..c6481ee16 100644 --- a/examples/navbar-fixed-top/index.html +++ b/examples/navbar-fixed-top/index.html @@ -18,7 +18,7 @@ diff --git a/examples/navbar-static-top/index.html b/examples/navbar-static-top/index.html index 162214897..6f4ac141c 100644 --- a/examples/navbar-static-top/index.html +++ b/examples/navbar-static-top/index.html @@ -18,7 +18,7 @@ diff --git a/examples/navbar/index.html b/examples/navbar/index.html index c3df945a2..fc689f8e7 100644 --- a/examples/navbar/index.html +++ b/examples/navbar/index.html @@ -18,7 +18,7 @@ diff --git a/examples/non-responsive/index.html b/examples/non-responsive/index.html index f09646243..cdb0db210 100644 --- a/examples/non-responsive/index.html +++ b/examples/non-responsive/index.html @@ -20,7 +20,7 @@ diff --git a/examples/offcanvas/index.html b/examples/offcanvas/index.html index b077bf168..a2d973505 100644 --- a/examples/offcanvas/index.html +++ b/examples/offcanvas/index.html @@ -18,7 +18,7 @@ diff --git a/examples/signin/index.html b/examples/signin/index.html index e5067b0d4..b0f3e6454 100644 --- a/examples/signin/index.html +++ b/examples/signin/index.html @@ -18,7 +18,7 @@ diff --git a/examples/starter-template/index.html b/examples/starter-template/index.html index 5fd1d0052..9b6ee4635 100644 --- a/examples/starter-template/index.html +++ b/examples/starter-template/index.html @@ -18,7 +18,7 @@ diff --git a/examples/sticky-footer-navbar/index.html b/examples/sticky-footer-navbar/index.html index 69fad0604..cc2dd59fb 100644 --- a/examples/sticky-footer-navbar/index.html +++ b/examples/sticky-footer-navbar/index.html @@ -18,7 +18,7 @@ diff --git a/examples/sticky-footer/index.html b/examples/sticky-footer/index.html index ab462cece..a1e58723b 100644 --- a/examples/sticky-footer/index.html +++ b/examples/sticky-footer/index.html @@ -18,7 +18,7 @@ diff --git a/examples/theme/index.html b/examples/theme/index.html index b036cb751..9dcf424c5 100644 --- a/examples/theme/index.html +++ b/examples/theme/index.html @@ -20,7 +20,7 @@ diff --git a/getting-started.html b/getting-started.html index 1c358edb4..ec3462f0e 100644 --- a/getting-started.html +++ b/getting-started.html @@ -113,7 +113,7 @@ bootstrap/ @@ -668,7 +668,8 @@ bootstrap/

Additional notes

Other changes in v3.0 are not immediately apparent. Base classes, key styles, and behaviors have been adjusted for flexibility and our mobile first approach. Here's a partial list: