rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2011-09-12 13:32:58 -07:00
commit 8f5f35e6db
8 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/javascript.html
View File

@ -606,9 +606,13 @@ Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seita
<a href="#" class="btn danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">hover for popover</a> <a href="#" class="btn danger" rel="popover" title="A Title" data-content="And here's some amazing content. It's very engaging. right?">hover for popover</a>
<script> <script>
$(function () { $(function () {
$("a[rel=popover]").popover({ $("a[rel=popover]")
offset: 10 .popover({
}) offset: 10
})
.click(function(e) {
e.preventDefault()
})
}) })
</script> </script>
</div> </div>

2
js/bootstrap-alerts.js vendored
View File

@ -1,5 +1,5 @@
/* ========================================================== /* ==========================================================
* bootstrap-alerts.js * bootstrap-alerts.js v1.3.0
* http://twitter.github.com/bootstrap/javascript.html#alerts * http://twitter.github.com/bootstrap/javascript.html#alerts
* ========================================================== * ==========================================================
* Copyright 2011 Twitter, Inc. * Copyright 2011 Twitter, Inc.

2
js/bootstrap-dropdown.js vendored
View File

@ -1,5 +1,5 @@
/* ============================================================ /* ============================================================
* bootstrap-dropdown.js * bootstrap-dropdown.js v1.3.0
* http://twitter.github.com/bootstrap/javascript.html#dropdown * http://twitter.github.com/bootstrap/javascript.html#dropdown
* ============================================================ * ============================================================
* Copyright 2011 Twitter, Inc. * Copyright 2011 Twitter, Inc.

2
js/bootstrap-modal.js vendored
View File

@ -1,5 +1,5 @@
/* ========================================================= /* =========================================================
* bootstrap-modal.js * bootstrap-modal.js v1.3.0
* http://twitter.github.com/bootstrap/javascript.html#modal * http://twitter.github.com/bootstrap/javascript.html#modal
* ========================================================= * =========================================================
* Copyright 2011 Twitter, Inc. * Copyright 2011 Twitter, Inc.

2
js/bootstrap-popover.js vendored
View File

@ -1,5 +1,5 @@
/* =========================================================== /* ===========================================================
* bootstrap-popover.js * bootstrap-popover.js v1.3.0
* http://twitter.github.com/bootstrap/javascript.html#popover * http://twitter.github.com/bootstrap/javascript.html#popover
* =========================================================== * ===========================================================
* Copyright 2011 Twitter, Inc. * Copyright 2011 Twitter, Inc.

2
js/bootstrap-scrollspy.js vendored
View File

@ -1,5 +1,5 @@
/* ============================================================= /* =============================================================
* bootstrap-scrollspy.js * bootstrap-scrollspy.js v1.3.0
* http://twitter.github.com/bootstrap/javascript.html#scrollspy * http://twitter.github.com/bootstrap/javascript.html#scrollspy
* ============================================================= * =============================================================
* Copyright 2011 Twitter, Inc. * Copyright 2011 Twitter, Inc.

2
js/bootstrap-tabs.js vendored
View File

@ -1,5 +1,5 @@
/* ======================================================== /* ========================================================
* bootstrap-tabs.js * bootstrap-tabs.js v1.3.0
* http://twitter.github.com/bootstrap/javascript.html#tabs * http://twitter.github.com/bootstrap/javascript.html#tabs
* ======================================================== * ========================================================
* Copyright 2011 Twitter, Inc. * Copyright 2011 Twitter, Inc.

2
js/bootstrap-twipsy.js vendored
View File

@ -1,5 +1,5 @@
/* ========================================================== /* ==========================================================
* bootstrap-twipsy.js * bootstrap-twipsy.js v1.3.0
* http://twitter.github.com/bootstrap/javascript.html#twipsy * http://twitter.github.com/bootstrap/javascript.html#twipsy
* Adapted from the original jQuery.tipsy by Jason Frame * Adapted from the original jQuery.tipsy by Jason Frame
* ========================================================== * ==========================================================