2
0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-11 18:02:28 +03:00

Merge branch '2.0.3-wip' of https://github.com/twitter/bootstrap into 2.0.3-wip

This commit is contained in:
Jacob Thornton
2012-04-16 15:09:26 -07:00
14 changed files with 1854 additions and 9 deletions
+2
View File
@@ -969,6 +969,8 @@ select:focus:required:invalid:focus {
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.025);
cursor: not-allowed;
overflow: hidden;
white-space: nowrap;
}
:-moz-placeholder {
color: #999999;
+2 -2
View File
@@ -27,7 +27,7 @@
* ====================== */
var dismiss = '[data-dismiss="alert"]'
, Alert = function ( el ) {
, Alert = function (el) {
$(el).on('click', dismiss, this.close)
}
@@ -68,7 +68,7 @@
/* ALERT PLUGIN DEFINITION
* ======================= */
$.fn.alert = function ( option ) {
$.fn.alert = function (option) {
return this.each(function () {
var $this = $(this)
, data = $this.data('alert')
+1
View File
@@ -60,6 +60,7 @@
if (actives && actives.length) {
hasData = actives.data('collapse')
if (hasData && hasData.transitioning) return
actives.collapse('hide')
hasData || actives.data('collapse', null)
}
+1813
View File
File diff suppressed because it is too large Load Diff
File diff suppressed because one or more lines are too long