Skip to content

Commit

Permalink
Merge pull request #11222 from ZDroid/patch-1
Browse files Browse the repository at this point in the history
Add another newline to improve final code readability
  • Loading branch information
mdo committed Oct 26, 2013
2 parents f47510b + 20cba84 commit 4fac7b6
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function(grunt) {
' * Licensed under <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
' *\n' +
' * Designed and built with all the love in the world by @mdo and @fat.\n' +
' */\n',
' */\n\n',
jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n',

// Task configuration.
Expand Down
1 change: 1 addition & 0 deletions dist/css/bootstrap-theme.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* Designed and built with all the love in the world by @mdo and @fat.
*/

.btn-default,
.btn-primary,
.btn-success,
Expand Down
1 change: 1 addition & 0 deletions dist/css/bootstrap-theme.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/css/bootstrap.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* Designed and built with all the love in the world by @mdo and @fat.
*/

/*! normalize.css v2.1.3 | MIT License | git.io/normalize */

article,
Expand Down
1 change: 1 addition & 0 deletions dist/css/bootstrap.min.css

Large diffs are not rendered by default.

19 changes: 10 additions & 9 deletions dist/js/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
*
* Designed and built with all the love in the world by @mdo and @fat.
*/

if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }

/* ========================================================================
Expand Down Expand Up @@ -277,7 +278,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: carousel.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#carousel
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -495,7 +496,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: collapse.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#collapse
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -675,7 +676,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: dropdown.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#dropdowns
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -830,7 +831,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: modal.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#modals
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1078,7 +1079,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* http://twbs.github.com/bootstrap/javascript.html#tooltip
* Inspired by the original jQuery.tipsy by Jason Frame
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1464,7 +1465,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: popover.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#popovers
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1582,7 +1583,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: scrollspy.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#scrollspy
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1741,7 +1742,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: tab.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#tabs
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -1877,7 +1878,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
* Bootstrap: affix.js v3.0.0
* http://twbs.github.com/bootstrap/javascript.html#affix
* ========================================================================
* Copyright 2012 Twitter, Inc.
* Copyright 2013 Twitter, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
1 change: 1 addition & 0 deletions dist/js/bootstrap.min.js

Large diffs are not rendered by default.

0 comments on commit 4fac7b6

Please sign in to comment.