0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-02 14:24:19 +01:00

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

This commit is contained in:
Jacob Thornton 2012-01-24 14:08:27 -08:00
commit 8db0cc6fda
10 changed files with 12 additions and 12 deletions

View File

@ -1,5 +1,5 @@
/* ============================================================ /* ============================================================
* bootstrap-buttons.js v2.0.0 * bootstrap-button.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#buttons * http://twitter.github.com/bootstrap/javascript.html#buttons
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

View File

@ -1,6 +1,6 @@
/* ========================================================== /* ==========================================================
* bootstrap-carousel.js v2.0.0 * bootstrap-carousel.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://twitter.github.com/bootstrap/javascript.html#carousel
* ========================================================== * ==========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *

View File

@ -1,6 +1,6 @@
/* ============================================================= /* =============================================================
* bootstrap-collapsible.js v2.0.0 * bootstrap-collapse.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapsible * http://twitter.github.com/bootstrap/javascript.html#collapse
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *

View File

@ -1,6 +1,6 @@
/* ============================================================ /* ============================================================
* bootstrap-dropdown.js v2.0.0 * bootstrap-dropdown.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#dropdown * http://twitter.github.com/bootstrap/javascript.html#dropdowns
* ============================================================ * ============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *

View File

@ -1,6 +1,6 @@
/* ========================================================= /* =========================================================
* bootstrap-modal.js v2.0.0 * bootstrap-modal.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#modal * http://twitter.github.com/bootstrap/javascript.html#modals
* ========================================================= * =========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *

View File

@ -1,6 +1,6 @@
/* =========================================================== /* ===========================================================
* bootstrap-popover.js v2.0.0 * bootstrap-popover.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#popover * http://twitter.github.com/bootstrap/javascript.html#popovers
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *

2
js/bootstrap-tab.js vendored
View File

@ -1,5 +1,5 @@
/* ======================================================== /* ========================================================
* bootstrap-tabs.js v2.0.0 * bootstrap-tab.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

View File

@ -1,6 +1,6 @@
/* =========================================================== /* ===========================================================
* bootstrap-tooltip.js v2.0.0 * bootstrap-tooltip.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#tooltip * 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
* =========================================================== * ===========================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.

View File

@ -1,6 +1,6 @@
/* =================================================== /* ===================================================
* bootstrap-transitions.js v2.0.0 * bootstrap-transition.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html * http://twitter.github.com/bootstrap/javascript.html#transitions
* =================================================== * ===================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *

View File

@ -1,6 +1,6 @@
/* ============================================================= /* =============================================================
* bootstrap-typeahead.js v2.0.0 * bootstrap-typeahead.js v2.0.0
* http://twitter.github.com/bootstrap/javascript.html#collapsible * http://twitter.github.com/bootstrap/javascript.html#typeahead
* ============================================================= * =============================================================
* Copyright 2012 Twitter, Inc. * Copyright 2012 Twitter, Inc.
* *