Skip to content

Commit 2a1e491

Browse files
fatfat
committed
bootstrap v2.2.1
1 parent a87da66 commit 2a1e491

20 files changed

+42
-39
lines changed

‎assets/bootstrap.zip

-10 Bytes
Binary file not shown.

‎assets/css/bootstrap-responsive.css

Lines changed: 5 additions & 2 deletions
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
@@ -1018,7 +1018,7 @@
10181018
position: static;
10191019
top: auto;
10201020
left: auto;
1021-
display: block;
1021+
display: none;
10221022
float: none;
10231023
max-width: none;
10241024
padding: 0;
@@ -1032,6 +1032,9 @@
10321032
-moz-box-shadow: none;
10331033
box-shadow: none;
10341034
}
1035+
.nav-collapse .open > .dropdown-menu {
1036+
display: block;
1037+
}
10351038
.nav-collapse .dropdown-menu:before,
10361039
.nav-collapse .dropdown-menu:after {
10371040
display: none;

‎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

‎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.

‎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.

‎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.

‎assets/js/bootstrap-carousel.js

Lines changed: 2 additions & 2 deletions
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.
@@ -168,7 +168,7 @@
168168
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
169169
var $this = $(this), href
170170
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
171-
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
171+
, options = $.extend({}, $target.data(), $this.data())
172172
$target.carousel(options)
173173
e.preventDefault()
174174
})

‎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.

‎assets/js/bootstrap-dropdown.js

Lines changed: 2 additions & 2 deletions
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.
@@ -101,7 +101,7 @@
101101

102102
function clearMenus() {
103103
$(toggle).each(function () {
104-
getParent($(this)).removeClass("open")
104+
getParent($(this)).removeClass('open')
105105
})
106106
}
107107

‎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.

‎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.

‎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.

‎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.

‎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
* ===========================================================

‎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.

‎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.

‎assets/js/bootstrap.js

Lines changed: 15 additions & 15 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.
@@ -407,13 +407,13 @@
407407
$(document).on('click.carousel.data-api', '[data-slide]', function (e) {
408408
var $this = $(this), href
409409
, $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
410-
, options = !$target.data('carousel') && $.extend({}, $target.data(), $this.data())
410+
, options = $.extend({}, $target.data(), $this.data())
411411
$target.carousel(options)
412412
e.preventDefault()
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.
@@ -670,7 +670,7 @@
670670

671671
function clearMenus() {
672672
$(toggle).each(function () {
673-
getParent($(this)).removeClass("open")
673+
getParent($(this)).removeClass('open')
674674
})
675675
}
676676

@@ -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.

‎assets/js/bootstrap.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<h1>Bootstrap</h1>
8585
<p>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</p>
8686
<p>
87-
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.0']);">Download Bootstrap</a>
87+
<a href="assets/bootstrap.zip" class="btn btn-primary btn-large" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Download', 'Download 2.2.1']);">Download Bootstrap</a>
8888
</p>
8989
<ul class="masthead-links">
9090
<li>
@@ -97,7 +97,7 @@ <h1>Bootstrap</h1>
9797
<a href="./extend.html" onclick="_gaq.push(['_trackEvent', 'Jumbotron actions', 'Jumbotron links', 'Extend']);">Extend</a>
9898
</li>
9999
<li>
100-
Version 2.2.0
100+
Version 2.2.1
101101
</li>
102102
</ul>
103103
</div>

‎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>

0 commit comments

Comments
 (0)