Skip to content

Y
Yii Bootstrap 3
Commit 6afa6964 by niskac
Options

merged heads

parents a5aeadbc 3b494fd1
Showing with 97 additions and 48 deletions
assets/css/bootstrap.min.css
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/js/bootstrap-alert.js
...@@ -88,4 +88,4 @@ ...@@ -88,4 +88,4 @@
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close) $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-button.js
...@@ -95,4 +95,4 @@ ...@@ -95,4 +95,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-carousel.js
...@@ -151,4 +151,4 @@ ...@@ -151,4 +151,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-collapse.js
...@@ -133,4 +133,4 @@ ...@@ -133,4 +133,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-dropdown.js
...@@ -89,4 +89,4 @@ ...@@ -89,4 +89,4 @@
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-modal.js
...@@ -207,4 +207,4 @@ ...@@ -207,4 +207,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-popover.js
...@@ -92,4 +92,4 @@ ...@@ -92,4 +92,4 @@
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>' , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-scrollspy.js
...@@ -122,4 +122,4 @@ ...@@ -122,4 +122,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-tab.js
...@@ -127,4 +127,4 @@ ...@@ -127,4 +127,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-tooltip.js
...@@ -267,4 +267,4 @@ ...@@ -267,4 +267,4 @@
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
} }
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-transition.js
...@@ -47,5 +47,5 @@ ...@@ -47,5 +47,5 @@
})() })()
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
assets/js/bootstrap-typeahead.js
...@@ -268,4 +268,4 @@ ...@@ -268,4 +268,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/README.md
...@@ -48,6 +48,14 @@ twitter-bootstrap@googlegroups.com ...@@ -48,6 +48,14 @@ twitter-bootstrap@googlegroups.com
http://groups.google.com/group/twitter-bootstrap http://groups.google.com/group/twitter-bootstrap
IRC
---
Server: irc.freenode.net
Channel: ##twitter-bootstrap (the double ## is not a typo)
Developers Developers
---------- ----------
......
lib/bootstrap/js/bootstrap-alert.js
/* ========================================================== /* ==========================================================
* bootstrap-alert.js v2.0.0 * bootstrap-alert.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://twitter.github.com/bootstrap/javascript.html#alerts
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -51,11 +51,14 @@ ...@@ -51,11 +51,14 @@
$parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent()) $parent.length || ($parent = $this.hasClass('alert') ? $this : $this.parent())
$parent.removeClass('in') $parent
.trigger('close')
.removeClass('in')
function removeElement() { function removeElement() {
$parent.remove() $parent
$parent.trigger('closed') .trigger('closed')
.remove()
} }
$.support.transition && $parent.hasClass('fade') ? $.support.transition && $parent.hasClass('fade') ?
...@@ -88,4 +91,4 @@ ...@@ -88,4 +91,4 @@
$('body').on('click.alert.data-api', dismiss, Alert.prototype.close) $('body').on('click.alert.data-api', dismiss, Alert.prototype.close)
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-button.js
/* ============================================================ /* ============================================================
* bootstrap-button.js v2.0.0 * bootstrap-button.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -95,4 +95,4 @@ ...@@ -95,4 +95,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-carousel.js
/* ========================================================== /* ==========================================================
* bootstrap-carousel.js v2.0.0 * bootstrap-carousel.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#carousel * http://twitter.github.com/bootstrap/javascript.html#carousel
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
, pause: function () { , pause: function () {
clearInterval(this.interval) clearInterval(this.interval)
this.interval = null
return this return this
} }
...@@ -82,6 +83,8 @@ ...@@ -82,6 +83,8 @@
, fallback = type == 'next' ? 'first' : 'last' , fallback = type == 'next' ? 'first' : 'last'
, that = this , that = this
if (!$next.length) return
this.sliding = true this.sliding = true
isCycling && this.pause() isCycling && this.pause()
...@@ -151,4 +154,4 @@ ...@@ -151,4 +154,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-collapse.js
/* ============================================================= /* =============================================================
* bootstrap-collapse.js v2.0.0 * bootstrap-collapse.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#collapse * http://twitter.github.com/bootstrap/javascript.html#collapse
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -133,4 +133,4 @@ ...@@ -133,4 +133,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-dropdown.js
/* ============================================================ /* ============================================================
* bootstrap-dropdown.js v2.0.0 * bootstrap-dropdown.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#dropdowns * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -89,4 +89,4 @@ ...@@ -89,4 +89,4 @@
$('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle) $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-modal.js
/* ========================================================= /* =========================================================
* bootstrap-modal.js v2.0.0 * bootstrap-modal.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#modals * http://twitter.github.com/bootstrap/javascript.html#modals
* ========================================================= * =========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -207,4 +207,4 @@ ...@@ -207,4 +207,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-popover.js
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.0.0 * bootstrap-popover.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#popovers * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -92,4 +92,4 @@ ...@@ -92,4 +92,4 @@
, template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>' , template: '<div class="popover"><div class="arrow"></div><div class="popover-inner"><h3 class="popover-title"></h3><div class="popover-content"><p></p></div></div></div>'
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-scrollspy.js
/* ============================================================= /* =============================================================
* bootstrap-scrollspy.js v2.0.0 * bootstrap-scrollspy.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#scrollspy * http://twitter.github.com/bootstrap/javascript.html#scrollspy
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -122,4 +122,4 @@ ...@@ -122,4 +122,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-tab.js
/* ======================================================== /* ========================================================
* bootstrap-tab.js v2.0.0 * bootstrap-tab.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -127,4 +127,4 @@ ...@@ -127,4 +127,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-tooltip.js
/* =========================================================== /* ===========================================================
* bootstrap-tooltip.js v2.0.0 * bootstrap-tooltip.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#tooltips * http://twitter.github.com/bootstrap/javascript.html#tooltips
* Inspired by the original jQuery.tipsy by Jason Frame * Inspired by the original jQuery.tipsy by Jason Frame
* =========================================================== * ===========================================================
...@@ -267,4 +267,4 @@ ...@@ -267,4 +267,4 @@
, template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>' , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
} }
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-transition.js
/* =================================================== /* ===================================================
* bootstrap-transition.js v2.0.0 * bootstrap-transition.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#transitions * http://twitter.github.com/bootstrap/javascript.html#transitions
* =================================================== * ===================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -47,5 +47,5 @@ ...@@ -47,5 +47,5 @@
})() })()
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/js/bootstrap-typeahead.js
/* ============================================================= /* =============================================================
* bootstrap-typeahead.js v2.0.0 * bootstrap-typeahead.js v2.0.1
* http://twitter.github.com/bootstrap/javascript.html#typeahead * http://twitter.github.com/bootstrap/javascript.html#typeahead
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
...@@ -268,4 +268,4 @@ ...@@ -268,4 +268,4 @@
}) })
}) })
}( window.jQuery ) }( window.jQuery );
\ No newline at end of file
lib/bootstrap/less/bootstrap.less
/*! /*!
* Bootstrap v2.0.0 * Bootstrap v2.0.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
......
lib/bootstrap/less/buttons.less
...@@ -92,6 +92,13 @@ ...@@ -92,6 +92,13 @@
margin-top: -1px; margin-top: -1px;
} }
// Mini
.btn-mini {
padding: 2px 6px;
font-size: @baseFontSize - 2px;
line-height: @baseLineHeight - 4px;
}
// Alternate buttons // Alternate buttons
// -------------------------------------------------- // --------------------------------------------------
......
lib/bootstrap/less/code.less
...@@ -34,6 +34,7 @@ pre { ...@@ -34,6 +34,7 @@ pre {
white-space: pre; white-space: pre;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
word-wrap: break-word;
// Make prettyprint styles more spaced out for readability // Make prettyprint styles more spaced out for readability
&.prettyprint { &.prettyprint {
......
lib/bootstrap/less/forms.less
...@@ -96,9 +96,12 @@ input[type="radio"] { ...@@ -96,9 +96,12 @@ input[type="radio"] {
margin: 3px 0; margin: 3px 0;
*margin-top: 0; /* IE7 */ *margin-top: 0; /* IE7 */
line-height: normal; line-height: normal;
border: 0;
cursor: pointer; cursor: pointer;
.border-radius(0); .border-radius(0);
border: 0 \9; /* IE9 and down */
}
input[type="image"] {
border: 0;
} }
// Reset the file input to browser defaults // Reset the file input to browser defaults
......
lib/bootstrap/less/mixins.less
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
// Clearfix // Clearfix
// -------- // --------
// For clearing floats like a boss h5bp.com/q // For clearing floats like a boss h5bp.com/q
.clearfix() { .clearfix {
*zoom: 1; *zoom: 1;
&:before, &:before,
&:after { &:after {
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
// ------------------ // ------------------
.tab-focus() { .tab-focus() {
// Default // Default
outline: thin dotted; outline: thin dotted #333;
// Webkit // Webkit
outline: 5px auto -webkit-focus-ring-color; outline: 5px auto -webkit-focus-ring-color;
outline-offset: -2px; outline-offset: -2px;
......
lib/bootstrap/less/responsive.less
/*! /*!
* Bootstrap Responsive v2.0.0 * Bootstrap Responsive v2.0.1
* *
* Copyright 2012 Twitter, Inc * Copyright 2012 Twitter, Inc
* Licensed under the Apache License v2.0 * Licensed under the Apache License v2.0
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
// PORTRAIT TABLET TO DEFAULT DESKTOP // PORTRAIT TABLET TO DEFAULT DESKTOP
// ---------------------------------- // ----------------------------------
@media (min-width: 768px) and (max-width: 980px) { @media (min-width: 768px) and (max-width: 979px) {
// Fixed grid // Fixed grid
#gridSystem > .generate(12, 42px, 20px); #gridSystem > .generate(12, 42px, 20px);
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
// TABLETS AND BELOW // TABLETS AND BELOW
// ----------------- // -----------------
@media (max-width: 980px) { @media (max-width: 979px) {
// UNFIX THE TOPBAR // UNFIX THE TOPBAR
// ---------------- // ----------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment