Commit 8f5f35e6 authored by Mark Otto's avatar Mark Otto
Browse files

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

parents 7af4a4cf ad87e11f
Showing with 14 additions and 10 deletions
+14 -10
...@@ -606,9 +606,13 @@ Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seita ...@@ -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>
......
/* ========================================================== /* ==========================================================
* 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.
......
/* ============================================================ /* ============================================================
* 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.
......
/* ========================================================= /* =========================================================
* 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.
......
/* =========================================================== /* ===========================================================
* 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.
......
/* ============================================================= /* =============================================================
* 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.
......
/* ======================================================== /* ========================================================
* 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.
......
/* ========================================================== /* ==========================================================
* 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
* ========================================================== * ==========================================================
......
Supports Markdown
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