conflict

bootstrap-1.3.0.css

 /*!
- * Bootstrap v1.2.0
+ * Bootstrap v1.3.0
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Sat Sep 10 12:59:54 PDT 2011
+ * Date: Sat Sep 10 13:04:12 PDT 2011
  */
 /* Reset.less
  * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@ -91,10 +91,6 @@ html {
   -webkit-text-size-adjust: 100%;
   -ms-text-size-adjust: 100%;
 }
-a:active {
-  outline: none;
-  -moz-outline-style: none;
-}
 a:focus {
   outline: thin dotted;
 }

bootstrap-1.3.0.min.css

@@ -4,7 +4,6 @@ table{border-collapse:collapse;border-spacing:0;}
 ol,ul{list-style:none;}
 q:before,q:after,blockquote:before,blockquote:after{content:"";}
 html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-a:active{outline:none;-moz-outline-style:none;}
 a:focus{outline:thin dotted;}
 article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
 audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}

docs/assets/js/application.js

@@ -3,7 +3,7 @@ $(document).ready(function(){
   // Dropdown example for topbar nav
   // ===============================
 
-  $(".topbar").dropdown() // catch any dropdowns on the page
+  $('body').dropdown() // catch any dropdowns on the page
 
 
   // table sort example

docs/index.html

@@ -82,7 +82,7 @@
             <h6>Hotlink the CSS</h6>
             <p>For the quickest and easiest start, just copy this snippet into your webpage.</p>
             <form>
-              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.2.0.min.css"></textarea>
+              <textarea class="copy-code" rows="1">&lt;link rel="stylesheet" href="http://twitter.github.com/bootstrap/assets/css/bootstrap-1.3.0.min.css"></textarea>
             </form>
           </div>
           <div class="span5">
@@ -1620,4 +1620,4 @@ Lorem ipsum dolar sit amet illo error <a href="#" title="below">ipsum</a> verita
     </div>
 
   </body>
-</html>
\ No newline at end of file
+</html>

docs/assets/js/bootstrap-modal.js → js/bootstrap-modal.js

@@ -32,15 +32,19 @@
  /* MODAL PUBLIC CLASS DEFINITION
   * ============================= */
 
-  var Modal = function ( options ) {
+  var Modal = function ( content, options ) {
     this.settings = $.extend({}, $.fn.modal.defaults)
 
-    if ( typeof options == 'string' ) {
-      this.settings.content = options
-    } else if ( options ) {
+    if ( options ) {
       $.extend( this.settings, options )
     }
 
+    this.$element = $(content)
+      .bind('modal:open', $.proxy(this.open, this))
+      .bind('modal:close', $.proxy(this.close, this))
+      .bind('modal:toggle', $.proxy(this.toggle, this))
+      .delegate('.close', 'click', $.proxy(this.close, this))
+
     return this
   }
 
@@ -54,13 +58,10 @@
       var that = this
       this.isOpen = true
 
-      this.$element = $(this.settings.content)
-
       _.escape.call(this)
       _.backdrop.call(this)
 
       this.$element
-        .delegate('.close', 'click', function (e) { e.preventDefault(); that.close() })
         .appendTo(document.body)
         .show()
 
@@ -72,7 +73,9 @@
       return this
     }
 
-  , close: function () {
+  , close: function (e) {
+      e && e.preventDefault()
+
       var that = this
 
       this.isOpen = false
@@ -83,8 +86,8 @@
       this.$element.removeClass('in')
 
       function removeElement () {
-        that.$element.remove()
-        that.$element = null
+        that.$element.unbind(transitionEnd)
+        that.$element.detach()
       }
 
       $.support.transition && this.$element.hasClass('fade') ?
@@ -144,14 +147,16 @@
 
   $.fn.modal = function ( options ) {
     options = options || {}
-    options.content = this
-    return new Modal(options)
+    return this.each(function () {
+      return new Modal(this, options)
+    })
   }
 
+  $.fn.modal.Modal = Modal
+
   $.fn.modal.defaults = {
     backdrop: false
   , closeOnEscape: false
-  , content: false
   }
 
 })( jQuery || ender )
\ No newline at end of file

js/tests/index.html

+<!DOCTYPE HTML>
+<html>
+<head>
+  <title>Bootstrap Plugin Test Suite</title>
+
+  <!-- jquery -->
+  <script src="http://code.jquery.com/jquery-1.5.2.min.js"></script>
+
+  <!-- qunit -->
+  <link rel="stylesheet" href="vendor/qunit.css" type="text/css" media="screen" />
+  <script src="vendor/qunit.js"></script>
+
+  <!-- plugin sources -->
+  <script src="../../js/bootstrap-alerts.js"></script>
+  <script src="../../js/bootstrap-dropdown.js"></script>
+  <script src="../../js/bootstrap-modal.js"></script>
+  <script src="../../js/bootstrap-tabs.js"></script>
+  <script src="../../js/bootstrap-twipsy.js"></script>
+  <script src="../../js/bootstrap-popover.js"></script>
+
+  <!-- unit tests -->
+  <script src="unit/bootstrap-alerts.js"></script>
+  <script src="unit/bootstrap-dropdown.js"></script>
+  <script src="unit/bootstrap-modal.js"></script>
+  <script src="unit/bootstrap-popover.js"></script>
+  <script src="unit/bootstrap-tabs.js"></script>
+  <script src="unit/bootstrap-twipsy.js"></script>
+
+<body>
+  <div>
+    <h1 id="qunit-header">Bootstrap Plugin Test Suite</h1>
+    <h2 id="qunit-banner"></h2>
+    <h2 id="qunit-userAgent"></h2>
+    <ol id="qunit-tests"></ol>
+    <div id="qunit-runoff"></div>
+  </div>
+</body>
+</html>
\ No newline at end of file

js/tests/unit/bootstrap-alerts.js

+$(function () {
+
+    module("bootstrap-alerts")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).alert, 'alert method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).alert()[0] == document.body, 'document.body returned')
+      })
+
+      test("should fade element out on clicking .close", function () {
+        var alertHTML = '<div class="alert-message warning fade in">'
+          + '<a class="close" href="#">×</a>'
+          + '<p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>'
+          + '</div>'
+          , alert = $(alertHTML).alert()
+
+        alert.find('.close').click()
+
+        ok(!alert.hasClass('in'), 'remove .in class on .close click')
+      })
+
+      test("should remove element when clicking .close", function () {
+        $.support.transition = false
+
+        var alertHTML = '<div class="alert-message warning fade in">'
+          + '<a class="close" href="#">×</a>'
+          + '<p><strong>Holy guacamole!</strong> Best check yo self, you’re not looking too good.</p>'
+          + '</div>'
+          , alert = $(alertHTML).appendTo('#qunit-runoff').alert()
+
+        ok($('#qunit-runoff').find('.alert-message').length, 'element added to dom')
+
+        alert.find('.close').click()
+
+        ok(!$('#qunit-runoff').find('.alert-message').length, 'element removed from dom')
+      })
+
+})
\ No newline at end of file

js/tests/unit/bootstrap-dropdown.js

+$(function () {
+
+    module("bootstrap-dropdowns")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).dropdown, 'dropdown method is defined')
+      })
+
+      test("should return element", function () {
+        ok($(document.body).dropdown()[0] == document.body, 'document.body returned')
+      })
+
+      test("should add class open to menu if clicked", function () {
+        var dropdownHTML = '<ul class="tabs">'
+          + '<li class="dropdown">'
+          + '<a href="#" class="dropdown-toggle">Dropdown</a>'
+          + '<ul class="dropdown-menu">'
+          + '<li><a href="#">Secondary link</a></li>'
+          + '<li><a href="#">Something else here</a></li>'
+          + '<li class="divider"></li>'
+          + '<li><a href="#">Another link</a></li>'
+          + '</ul>'
+          + '</li>'
+          + '</ul>'
+          , dropdown = $(dropdownHTML).dropdown()
+
+        dropdown.find('.dropdown-toggle').click()
+        ok(dropdown.find('.dropdown').hasClass('open'), 'open class added on click')
+      })
+
+      test("should remove open class if body clicked", function () {
+        var dropdownHTML = '<ul class="tabs">'
+          + '<li class="dropdown">'
+          + '<a href="#" class="dropdown-toggle">Dropdown</a>'
+          + '<ul class="dropdown-menu">'
+          + '<li><a href="#">Secondary link</a></li>'
+          + '<li><a href="#">Something else here</a></li>'
+          + '<li class="divider"></li>'
+          + '<li><a href="#">Another link</a></li>'
+          + '</ul>'
+          + '</li>'
+          + '</ul>'
+          , dropdown = $(dropdownHTML).dropdown().appendTo('#qunit-runoff')
+
+        dropdown.find('.dropdown-toggle').click()
+        ok(dropdown.find('.dropdown').hasClass('open'), 'open class added on click')
+        $('body').click()
+        ok(!dropdown.find('.dropdown').hasClass('open'), 'open class removed')
+        dropdown.remove()
+      })
+
+})
\ No newline at end of file

js/tests/unit/bootstrap-modal.js

+$(function () {
+
+    module("bootstrap-modal")
+
+      test("should be defined on jquery object", function () {
+        ok($(document.body).modal, 'modal method is defined')
+      })
+
+      test("should not return element", function () {
+        ok(!$(document.body).modal()[0], 'document.body not returned')
+      })
+
+      test("should return instance of modal class", function () {
+        ok($(document.body).modal() instanceof $.fn.modal.Modal, 'document.body returned')
+      })
+
+      test("should expose defaults var for settings", {
+        ok(!!$.fn.modal.default, 'default object exposed')
+      })
+
+      test("should insert into dom when open is called", function () {
+        var div = $("<div></div>")
+        div.modal().open()
+      })
+
+      test("should remove from dom when close is called", function () {
+        $.support.transition = false
+        re
+      })
+
+      test("should remove from dom when click .close")
+})
\ No newline at end of file

js/tests/vendor/qunit.css

+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ *
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699a4;
+	background-color: #0d3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: normal;
+
+	border-radius: 15px 15px 0 0;
+	-moz-border-radius: 15px 15px 0 0;
+	-webkit-border-top-right-radius: 15px;
+	-webkit-border-top-left-radius: 15px;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #c2ccd1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #fff;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 0 0.5em 2em;
+	color: #5E740B;
+	background-color: #eee;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 0 0.5em 2.5em;
+	background-color: #2b81af;
+	color: #fff;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 0.5em 0.4em 2.5em;
+	border-bottom: 1px solid #fff;
+	list-style-position: inside;
+}
+
+#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
+	display: none;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #c2ccd1;
+	text-decoration: none;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests ol {
+	margin-top: 0.5em;
+	padding: 0.5em;
+
+	background-color: #fff;
+
+	border-radius: 15px;
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: .2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 .5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	background-color: #e0f2be;
+	color: #374e0c;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	background-color: #ffcaca;
+	color: #500;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: black; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	margin: 0.5em;
+	padding: 0.4em 0.5em 0.4em 0.5em;
+	background-color: #fff;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #5E740B;
+	background-color: #fff;
+	border-left: 26px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #fff;
+	border-left: 26px solid #EE5757;
+	white-space: pre;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 15px 15px;
+	-moz-border-radius: 0 0 15px 15px;
+	-webkit-border-bottom-right-radius: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+}
+
+#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: green;   }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/** Result */
+
+#qunit-testresult {
+	padding: 0.5em 0.5em 0.5em 2.5em;
+
+	color: #2b81af;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid white;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+}
+
+/** Runoff */
+
+#qunit-runoff {
+  display:none;
+}
\ No newline at end of file

lib/bootstrap.less

 /*!
- * Bootstrap v1.2.0
+ * Bootstrap v1.3.0
  *
  * Copyright 2011 Twitter, Inc
  * Licensed under the Apache License v2.0

lib/reset.less

@@ -26,11 +26,6 @@ html {
   -webkit-text-size-adjust: 100%;
       -ms-text-size-adjust: 100%;
 }
-// Active links get no outline
-a:active {
-  outline: none;
-  -moz-outline-style: none;
-}
 // Focus states
 a:focus {
   outline: thin dotted;