Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

README.md

@@ -10,7 +10,7 @@ To get started, check out [http://getbootstrap.com](http://getbootstrap.com)!
 
 Three quick start options are available:
 
-* [Download the latest release](https://github.com/twbs/bootstrap/zipball/master).
+* [Download the latest release](https://github.com/twbs/bootstrap/zipball/3.0.0-wip).
 * Clone the repo: `git clone git://github.com/twbs/bootstrap.git`.
 * Install with [Bower](http://bower.io): `bower install bootstrap`.
 

_includes/header.html

@@ -20,8 +20,8 @@
 
 <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
 <!--[if lt IE 9]>
-  <script src="/assets/js/html5shiv.js"></script>
+  <script src="{{ page.base_url }}assets/js/html5shiv.js"></script>
-  <script src="/assets/js/respond.min.js"></script>
+  <script src="{{ page.base_url }}assets/js/respond.min.js"></script>
 <![endif]-->
 
 <!-- Favicons -->

assets/js/application.js

@@ -7,10 +7,11 @@
   $(function(){
 
     var $window = $(window)
+    var $body   = $(document.body)
 
     var navHeight = $('.navbar').outerHeight(true) + 10
 
-    $(document.body).scrollspy({
+    $body.scrollspy({
       target: '.bs-sidebar',
       offset: navHeight
     })
@@ -19,14 +20,12 @@
       e.preventDefault()
     })
 
-    $(document.body).on('click', '.bs-sidenav [href^=#]', function (e) {
+    $body.on('click', '.bs-sidenav [href^=#]', function (e) {
       var $target = $(this.getAttribute('href'))
 
-      // e.preventDefault() // prevent browser scroll
+      e.preventDefault() // prevent browser scroll
 
-      document.body.scrollTop =
+      $window.scrollTop($target.offset().top - navHeight + 5)
-        $target.offset().top -
-        navHeight + 5 // offset scroll by nav
     })
 
     // back to top

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "bootstrap",
   "version": "3.0.0",
-  "main": ["./docs/assets/js/bootstrap.js", "./docs/assets/css/bootstrap.css"],
+  "main": ["./dist/js/bootstrap.min.js", "./dist/js/bootstrap.js", "./dist/css/bootstrap.min.css", "./dist/css/bootstrap.css"],
   "ignore": [
       "**/.*"
   ],

composer.json

@@ -1,5 +1,5 @@
 {
-    "name": "twitter/bootstrap"
+    "name": "twbs/bootstrap"
   , "description": "Sleek, intuitive, and powerful front-end framework for faster and easier web development."
   , "keywords": ["bootstrap", "css"]
   , "homepage": "http://getbootstrap.com"

css.html

@@ -206,7 +206,7 @@ base_url: "../"
   <div class="col-lg-1">1</div>
   <div class="col-lg-1">1</div>
 </div>
-<div class="row show-grid">
+<div class="row">
   <div class="col-lg-8">8</div>
   <div class="col-lg-4">4</div>
 </div>
@@ -362,7 +362,7 @@ base_url: "../"
     </div>
 
 {% highlight html %}
-<div class="row show-grid">
+<div class="row">
   <div class="col-lg-9 col-push-3">9</div>
   <div class="col-lg-3 col-pull-9">3</div>
 </div>
@@ -1425,7 +1425,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 {% endhighlight %}
 
     <h3>Selects</h3>
-    <p>Use the default option or specify a <code>multiple="multiple"</code> to show multiple options at once.</p>
+    <p>Use the default option, or add <code>multiple</code> to show multiple options at once.</p>
     <form class="bs-example">
       <select class="form-control">
         <option>1</option>
@@ -1435,7 +1435,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
         <option>5</option>
       </select>
       <br>
-      <select multiple="multiple" class="form-control">
+      <select multiple class="form-control">
         <option>1</option>
         <option>2</option>
         <option>3</option>
@@ -1452,7 +1452,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
   <option>5</option>
 </select>
 
-<select multiple="multiple" class="form-control">
+<select multiple class="form-control">
   <option>1</option>
   <option>2</option>
   <option>3</option>
@@ -1562,9 +1562,9 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
 
 
     <h2 id="forms-control-sizes">Control sizing</h2>
-    <p>Use relative sizing classes like <code>.input-large</code> or match your inputs to the grid column sizes using <code>.col-lg-*</code> classes.</p>
+    <p>Set heights using classes like <code>.input-large</code>, and set widths using grid column classes like <code>.col-lg-*</code>.</p>
 
-    <h3>Relative sizing</h3>
+    <h3>Height sizing</h3>
     <p>Create larger or smaller form controls that match button sizes.</p>
     <form class="bs-example bs-example-control-sizing">
       <div class="controls docs-input-sizes">

dist/css/bootstrap.css

@@ -1554,6 +1554,11 @@ select.input-small {
   cursor: pointer;
   border: 1px solid transparent;
   border-radius: 4px;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+       -o-user-select: none;
+          user-select: none;
 }
 
 .btn:focus {

dist/js/bootstrap.js

@@ -50,8 +50,8 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
   // http://blog.alexmaccaw.com/css-transitions
   $.fn.emulateTransitionEnd = function (duration) {
     var called = false, $el    = this
-    $(this).one('webkitTransitionEnd', function () { called = true })
+    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
     setTimeout(callback, duration)
     return this
   }

javascript.html

@@ -963,17 +963,17 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
     <h4>Four directions</h4>
     <div class="bs-example tooltip-demo">
       <div class="bs-example-tooltips">
+        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
+          Popover on left
+        </button>
         <button type="button" class="btn btn-default" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
           Popover on top
         </button>
-        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
-          Popover on right
-        </button>
         <button type="button" class="btn btn-default" data-toggle="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
           Popover on bottom
         </button>
-        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
+        <button type="button" class="btn btn-default" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
-          Popover on left
+          Popover on right
         </button>
       </div>
     </div><!-- /example -->
@@ -1218,7 +1218,7 @@ $('#my-alert').bind('closed.bs.alert', function () {
       </button>
     </div><!-- /example -->
 {% highlight html %}
-<button type="button" id="fat-btn" data-loading-text="Loading..." class="btn btn-primary">
+<button type="button" data-loading-text="Loading..." class="btn btn-primary">
   Loading state
 </button>
 {% endhighlight %}

js/transition.js

@@ -43,8 +43,8 @@
   // http://blog.alexmaccaw.com/css-transitions
   $.fn.emulateTransitionEnd = function (duration) {
     var called = false, $el    = this
-    $(this).one('webkitTransitionEnd', function () { called = true })
+    $(this).one($.support.transition.end, function () { called = true })
-    var callback = function () { if (!called) $($el).trigger('webkitTransitionEnd') }
+    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
     setTimeout(callback, duration)
     return this
   }

less/buttons.less

@@ -20,6 +20,7 @@
   border: 1px solid transparent;
   border-radius: @border-radius-base;
   white-space: nowrap;
+  .user-select(none);
 
   &:focus {
     .tab-focus();