Skip to content

Commit 778ecbb

Browse files
fatfat
committed
2.1.1 - hotfix for carousel
1 parent 404e4d9 commit 778ecbb

37 files changed

+50
-50
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ build:
2828
@echo "Compiling documentation... ${CHECK} Done"
2929
@cat js/bootstrap-transition.js js/bootstrap-alert.js js/bootstrap-button.js js/bootstrap-carousel.js js/bootstrap-collapse.js js/bootstrap-dropdown.js js/bootstrap-modal.js js/bootstrap-tooltip.js js/bootstrap-popover.js js/bootstrap-scrollspy.js js/bootstrap-tab.js js/bootstrap-typeahead.js js/bootstrap-affix.js > docs/assets/js/bootstrap.js
3030
@uglifyjs -nc docs/assets/js/bootstrap.js > docs/assets/js/bootstrap.min.tmp.js
31-
@echo "/**\n* Bootstrap.js v2.2.0 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
31+
@echo "/**\n* Bootstrap.js v2.2.1 by @fat & @mdo\n* Copyright 2012 Twitter, Inc.\n* http://www.apache.org/licenses/LICENSE-2.0.txt\n*/" > docs/assets/js/copyright.js
3232
@cat docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js > docs/assets/js/bootstrap.min.js
3333
@rm docs/assets/js/copyright.js docs/assets/js/bootstrap.min.tmp.js
3434
@echo "Compiling and minifying javascript... ${CHECK} Done"

‎component.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "bootstrap",
3-
"version": "2.2.0",
3+
"version": "2.2.1",
44
"main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
55
"dependencies": {
66
"jquery": "~1.8.0"

‎docs/assets/css/bootstrap-responsive.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap Responsive v2.2.0
2+
* Bootstrap Responsive v2.2.1
33
*
44
* Copyright 2012 Twitter, Inc
55
* Licensed under the Apache License v2.0

‎docs/assets/css/bootstrap.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v2.2.0
2+
* Bootstrap v2.2.1
33
*
44
* Copyright 2012 Twitter, Inc
55
* Licensed under the Apache License v2.0

‎docs/assets/js/bootstrap-affix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-affix.js v2.2.0
2+
* bootstrap-affix.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#affix
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-alert.js v2.2.0
2+
* bootstrap-alert.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#alerts
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-button.js v2.2.0
2+
* bootstrap-button.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#buttons
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-carousel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-carousel.js v2.2.0
2+
* bootstrap-carousel.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#carousel
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-collapse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-collapse.js v2.2.0
2+
* bootstrap-collapse.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#collapse
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-dropdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-dropdown.js v2.2.0
2+
* bootstrap-dropdown.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =========================================================
2-
* bootstrap-modal.js v2.2.0
2+
* bootstrap-modal.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#modals
44
* =========================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-popover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-popover.js v2.2.0
2+
* bootstrap-popover.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#popovers
44
* ===========================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-scrollspy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-scrollspy.js v2.2.0
2+
* bootstrap-scrollspy.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================
2-
* bootstrap-tab.js v2.2.0
2+
* bootstrap-tab.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#tabs
44
* ========================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-tooltip.js v2.2.0
2+
* bootstrap-tooltip.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#tooltips
44
* Inspired by the original jQuery.tipsy by Jason Frame
55
* ===========================================================

‎docs/assets/js/bootstrap-transition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===================================================
2-
* bootstrap-transition.js v2.2.0
2+
* bootstrap-transition.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#transitions
44
* ===================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap-typeahead.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-typeahead.js v2.2.0
2+
* bootstrap-typeahead.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#typeahead
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===================================================
2-
* bootstrap-transition.js v2.2.0
2+
* bootstrap-transition.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#transitions
44
* ===================================================
55
* Copyright 2012 Twitter, Inc.
@@ -58,7 +58,7 @@
5858
})
5959

6060
}(window.jQuery);/* ==========================================================
61-
* bootstrap-alert.js v2.2.0
61+
* bootstrap-alert.js v2.2.1
6262
* http://twitter.github.com/bootstrap/javascript.html#alerts
6363
* ==========================================================
6464
* Copyright 2012 Twitter, Inc.
@@ -145,7 +145,7 @@
145145
$(document).on('click.alert.data-api', dismiss, Alert.prototype.close)
146146

147147
}(window.jQuery);/* ============================================================
148-
* bootstrap-button.js v2.2.0
148+
* bootstrap-button.js v2.2.1
149149
* http://twitter.github.com/bootstrap/javascript.html#buttons
150150
* ============================================================
151151
* Copyright 2012 Twitter, Inc.
@@ -238,7 +238,7 @@
238238
})
239239

240240
}(window.jQuery);/* ==========================================================
241-
* bootstrap-carousel.js v2.2.0
241+
* bootstrap-carousel.js v2.2.1
242242
* http://twitter.github.com/bootstrap/javascript.html#carousel
243243
* ==========================================================
244244
* Copyright 2012 Twitter, Inc.
@@ -413,7 +413,7 @@
413413
})
414414

415415
}(window.jQuery);/* =============================================================
416-
* bootstrap-collapse.js v2.2.0
416+
* bootstrap-collapse.js v2.2.1
417417
* http://twitter.github.com/bootstrap/javascript.html#collapse
418418
* =============================================================
419419
* Copyright 2012 Twitter, Inc.
@@ -568,7 +568,7 @@
568568
})
569569

570570
}(window.jQuery);/* ============================================================
571-
* bootstrap-dropdown.js v2.2.0
571+
* bootstrap-dropdown.js v2.2.1
572572
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
573573
* ============================================================
574574
* Copyright 2012 Twitter, Inc.
@@ -715,7 +715,7 @@
715715
.on('keydown.dropdown.data-api touchstart.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
716716

717717
}(window.jQuery);/* =========================================================
718-
* bootstrap-modal.js v2.2.0
718+
* bootstrap-modal.js v2.2.1
719719
* http://twitter.github.com/bootstrap/javascript.html#modals
720720
* =========================================================
721721
* Copyright 2012 Twitter, Inc.
@@ -949,7 +949,7 @@
949949

950950
}(window.jQuery);
951951
/* ===========================================================
952-
* bootstrap-tooltip.js v2.2.0
952+
* bootstrap-tooltip.js v2.2.1
953953
* http://twitter.github.com/bootstrap/javascript.html#tooltips
954954
* Inspired by the original jQuery.tipsy by Jason Frame
955955
* ===========================================================
@@ -1224,7 +1224,7 @@
12241224
}
12251225

12261226
}(window.jQuery);/* ===========================================================
1227-
* bootstrap-popover.js v2.2.0
1227+
* bootstrap-popover.js v2.2.1
12281228
* http://twitter.github.com/bootstrap/javascript.html#popovers
12291229
* ===========================================================
12301230
* Copyright 2012 Twitter, Inc.
@@ -1326,7 +1326,7 @@
13261326
})
13271327

13281328
}(window.jQuery);/* =============================================================
1329-
* bootstrap-scrollspy.js v2.2.0
1329+
* bootstrap-scrollspy.js v2.2.1
13301330
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
13311331
* =============================================================
13321332
* Copyright 2012 Twitter, Inc.
@@ -1476,7 +1476,7 @@
14761476
})
14771477

14781478
}(window.jQuery);/* ========================================================
1479-
* bootstrap-tab.js v2.2.0
1479+
* bootstrap-tab.js v2.2.1
14801480
* http://twitter.github.com/bootstrap/javascript.html#tabs
14811481
* ========================================================
14821482
* Copyright 2012 Twitter, Inc.
@@ -1608,7 +1608,7 @@
16081608
})
16091609

16101610
}(window.jQuery);/* =============================================================
1611-
* bootstrap-typeahead.js v2.2.0
1611+
* bootstrap-typeahead.js v2.2.1
16121612
* http://twitter.github.com/bootstrap/javascript.html#typeahead
16131613
* =============================================================
16141614
* Copyright 2012 Twitter, Inc.
@@ -1918,7 +1918,7 @@
19181918

19191919
}(window.jQuery);
19201920
/* ==========================================================
1921-
* bootstrap-affix.js v2.2.0
1921+
* bootstrap-affix.js v2.2.1
19221922
* http://twitter.github.com/bootstrap/javascript.html#affix
19231923
* ==========================================================
19241924
* Copyright 2012 Twitter, Inc.

‎docs/assets/js/bootstrap.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ <h1>Bootstrap</h1>
8787
<a href="./extend.html" >Extend</a>
8888
</li>
8989
<li>
90-
Version 2.2.0
90+
Version 2.2.1
9191
</li>
9292
</ul>
9393
</div>

‎docs/templates/pages/index.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<h1>{{_i}}Bootstrap{{/i}}</h1>
44
<p>{{_i}}Sleek, intuitive, and powerful front-end framework for faster and easier web development.{{/i}}</p>
55
<p>
6-
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.0']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
6+
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.1']);"{{/production}}>{{_i}}Download Bootstrap{{/i}}</a>
77
</p>
88
<ul class="masthead-links">
99
<li>
@@ -16,7 +16,7 @@
1616
<a href="./extend.html" {{#production}}onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);"{{/production}}>{{_i}}Extend{{/i}}</a>
1717
</li>
1818
<li>
19-
{{_i}}Version 2.2.0{{/i}}
19+
{{_i}}Version 2.2.1{{/i}}
2020
</li>
2121
</ul>
2222
</div>

‎js/bootstrap-affix.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-affix.js v2.2.0
2+
* bootstrap-affix.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#affix
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-alert.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-alert.js v2.2.0
2+
* bootstrap-alert.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#alerts
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-button.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-button.js v2.2.0
2+
* bootstrap-button.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#buttons
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-carousel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ==========================================================
2-
* bootstrap-carousel.js v2.2.0
2+
* bootstrap-carousel.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#carousel
44
* ==========================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-collapse.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-collapse.js v2.2.0
2+
* bootstrap-collapse.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#collapse
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-dropdown.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ============================================================
2-
* bootstrap-dropdown.js v2.2.0
2+
* bootstrap-dropdown.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#dropdowns
44
* ============================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-modal.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =========================================================
2-
* bootstrap-modal.js v2.2.0
2+
* bootstrap-modal.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#modals
44
* =========================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-popover.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-popover.js v2.2.0
2+
* bootstrap-popover.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#popovers
44
* ===========================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-scrollspy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-scrollspy.js v2.2.0
2+
* bootstrap-scrollspy.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#scrollspy
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-tab.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ========================================================
2-
* bootstrap-tab.js v2.2.0
2+
* bootstrap-tab.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#tabs
44
* ========================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-tooltip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===========================================================
2-
* bootstrap-tooltip.js v2.2.0
2+
* bootstrap-tooltip.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#tooltips
44
* Inspired by the original jQuery.tipsy by Jason Frame
55
* ===========================================================

‎js/bootstrap-transition.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* ===================================================
2-
* bootstrap-transition.js v2.2.0
2+
* bootstrap-transition.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#transitions
44
* ===================================================
55
* Copyright 2012 Twitter, Inc.

‎js/bootstrap-typeahead.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/* =============================================================
2-
* bootstrap-typeahead.js v2.2.0
2+
* bootstrap-typeahead.js v2.2.1
33
* http://twitter.github.com/bootstrap/javascript.html#typeahead
44
* =============================================================
55
* Copyright 2012 Twitter, Inc.

‎less/bootstrap.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap v2.2.0
2+
* Bootstrap v2.2.1
33
*
44
* Copyright 2012 Twitter, Inc
55
* Licensed under the Apache License v2.0

‎less/responsive.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Bootstrap Responsive v2.2.0
2+
* Bootstrap Responsive v2.2.1
33
*
44
* Copyright 2012 Twitter, Inc
55
* Licensed under the Apache License v2.0

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "bootstrap"
33
, "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
4-
, "version": "2.2.0"
4+
, "version": "2.2.1"
55
, "keywords": ["bootstrap", "css"]
66
, "homepage": "http://twitter.github.com/bootstrap/"
77
, "author": "Twitter Inc."

0 commit comments

Comments
 (0)