diff options
| -rw-r--r-- | Gruntfile.js | 1 | ||||
| -rw-r--r-- | LICENSE | 1 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | docs/assets/js/ie-emulation-modes-warning.js | 1 | ||||
| -rw-r--r-- | docs/assets/js/ie10-viewport-bug-workaround.js | 1 | ||||
| -rw-r--r-- | docs/assets/js/src/application.js | 1 | ||||
| -rw-r--r-- | docs/assets/scss/docs.scss | 1 | ||||
| -rw-r--r-- | docs/getting-started/browsers-devices.md | 1 | ||||
| -rw-r--r-- | grunt/bs-commonjs-generator.js | 1 | ||||
| -rwxr-xr-x | grunt/change-version.js | 1 | ||||
| -rw-r--r-- | nuget/bootstrap.nuspec | 2 | ||||
| -rw-r--r-- | nuget/bootstrap.sass.nuspec | 2 | ||||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | scss/bootstrap.scss | 1 |
14 files changed, 15 insertions, 4 deletions
diff --git a/Gruntfile.js b/Gruntfile.js index fb7753170f..4b350e264e 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,6 +1,7 @@ /*! * Bootstrap's Gruntfile * http://getbootstrap.com + * Copyright 2013-2016 The Bootstrap Authors * Copyright 2013-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ @@ -1,6 +1,7 @@ The MIT License (MIT) Copyright (c) 2011-2016 Twitter, Inc. +Copyright (c) 2011-2016 The Bootstrap Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -131,4 +131,4 @@ See [the Releases section of our GitHub project](https://github.com/twbs/bootstr ## Copyright and license -Code and documentation copyright 2011-2016 Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). +Code and documentation copyright 2011-2016 the Bootstrap Authors and Twitter, Inc. Code released under [the MIT license](https://github.com/twbs/bootstrap/blob/master/LICENSE). Docs released under [Creative Commons](https://github.com/twbs/bootstrap/blob/master/docs/LICENSE). diff --git a/docs/assets/js/ie-emulation-modes-warning.js b/docs/assets/js/ie-emulation-modes-warning.js index 2016da6d54..452c1268f6 100644 --- a/docs/assets/js/ie-emulation-modes-warning.js +++ b/docs/assets/js/ie-emulation-modes-warning.js @@ -2,6 +2,7 @@ // IT'S JUST JUNK FOR OUR DOCS! // ++++++++++++++++++++++++++++++++++++++++++ /*! + * Copyright 2014-2015 The Bootstrap Authors * Copyright 2014-2015 Twitter, Inc. * * Licensed under the Creative Commons Attribution 3.0 Unported License. For diff --git a/docs/assets/js/ie10-viewport-bug-workaround.js b/docs/assets/js/ie10-viewport-bug-workaround.js index 162dafb9dd..629ad5e56c 100644 --- a/docs/assets/js/ie10-viewport-bug-workaround.js +++ b/docs/assets/js/ie10-viewport-bug-workaround.js @@ -1,5 +1,6 @@ /*! * IE10 viewport hack for Surface/desktop Windows 8 bug + * Copyright 2014-2015 The Bootstrap Authors * Copyright 2014-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/docs/assets/js/src/application.js b/docs/assets/js/src/application.js index 69520e9473..f45add5407 100644 --- a/docs/assets/js/src/application.js +++ b/docs/assets/js/src/application.js @@ -4,6 +4,7 @@ /*! * JavaScript for Bootstrap's docs (http://getbootstrap.com) + * Copyright 2011-2016 The Bootstrap Authors * Copyright 2011-2016 Twitter, Inc. * Licensed under the Creative Commons Attribution 3.0 Unported License. For * details, see https://creativecommons.org/licenses/by/3.0/. diff --git a/docs/assets/scss/docs.scss b/docs/assets/scss/docs.scss index 0362198fd7..17a11cf2db 100644 --- a/docs/assets/scss/docs.scss +++ b/docs/assets/scss/docs.scss @@ -1,5 +1,6 @@ /*! * Bootstrap Docs (http://getbootstrap.com) + * Copyright 2011-2016 The Bootstrap Authors * Copyright 2011-2016 Twitter, Inc. * Licensed under the Creative Commons Attribution 3.0 Unported License. For * details, see https://creativecommons.org/licenses/by/3.0/. diff --git a/docs/getting-started/browsers-devices.md b/docs/getting-started/browsers-devices.md index 4975536104..7bb95ebf35 100644 --- a/docs/getting-started/browsers-devices.md +++ b/docs/getting-started/browsers-devices.md @@ -174,6 +174,7 @@ See [this StackOverflow question](https://stackoverflow.com/questions/6771258/wh Internet Explorer 10 in Windows Phone 8 versions older than [Update 3 (a.k.a. GDR3)](http://blogs.windows.com/windows_phone/b/wpdev/archive/2013/10/14/introducing-windows-phone-preview-for-developers.aspx) doesn't differentiate **device width** from **viewport width** in `@-ms-viewport` at-rules, and thus doesn't properly apply the media queries in Bootstrap's CSS. To address this, you'll need to **include the following JavaScript to work around the bug**. {% highlight js %} +// Copyright 2014-2015 The Bootstrap Authors // Copyright 2014-2015 Twitter, Inc. // Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) if (navigator.userAgent.match(/IEMobile\/10\.0/)) { diff --git a/grunt/bs-commonjs-generator.js b/grunt/bs-commonjs-generator.js index af85f47721..1aac15075b 100644 --- a/grunt/bs-commonjs-generator.js +++ b/grunt/bs-commonjs-generator.js @@ -1,6 +1,7 @@ /*! * Bootstrap Grunt task for the CommonJS module generation * http://getbootstrap.com + * Copyright 2014-2015 The Bootstrap Authors * Copyright 2014-2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/grunt/change-version.js b/grunt/change-version.js index 1016d1d7ef..4ad5825f28 100755 --- a/grunt/change-version.js +++ b/grunt/change-version.js @@ -3,6 +3,7 @@ /*! * Script to update version number references in the project. + * Copyright 2015 The Bootstrap Authors * Copyright 2015 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ diff --git a/nuget/bootstrap.nuspec b/nuget/bootstrap.nuspec index a3e68799c1..59b7b4faa8 100644 --- a/nuget/bootstrap.nuspec +++ b/nuget/bootstrap.nuspec @@ -4,7 +4,7 @@ <id>bootstrap</id> <version>4.0.0-alpha</version> <title>Bootstrap CSS</title> - <authors>Twitter, Inc.</authors> + <authors>The Bootstrap Authors, Twitter Inc.</authors> <owners>bootstrap</owners> <description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description> <releaseNotes>http://blog.getbootstrap.com</releaseNotes> diff --git a/nuget/bootstrap.sass.nuspec b/nuget/bootstrap.sass.nuspec index 6c9875f962..6e57c5470b 100644 --- a/nuget/bootstrap.sass.nuspec +++ b/nuget/bootstrap.sass.nuspec @@ -4,7 +4,7 @@ <id>bootstrap.sass</id> <version>4.0.0-alpha</version> <title>Bootstrap Sass</title> - <authors>Twitter, Inc.</authors> + <authors>The Bootstrap Authors, Twitter Inc.</authors> <owners>bootstrap</owners> <description>The most popular front-end framework for developing responsive, mobile first projects on the web.</description> <releaseNotes>http://blog.getbootstrap.com</releaseNotes> diff --git a/package.json b/package.json index 32c8238217..7b655df8bf 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "web" ], "homepage": "http://getbootstrap.com", - "author": "Twitter, Inc.", + "author": "The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors)", + "contributors": ["Twitter, Inc."], "scripts": { "change-version": "node grunt/change-version.js", "shrinkwrap": "npm shrinkwrap --dev && mv ./npm-shrinkwrap.json ./grunt/npm-shrinkwrap.json", diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index f99a722cad..7697abb18b 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -1,5 +1,6 @@ /*! * Bootstrap v4.0.0-alpha.2 (http://getbootstrap.com) + * Copyright 2011-2016 The Bootstrap Authors * Copyright 2011-2016 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) */ |