Merge pull request #11928 from twbs/we_have_to_go_back_kate

Follow up to reverted commits

README.md

@@ -11,9 +11,9 @@ To get started, check out <http://getbootstrap.com>!
 
 Three quick start options are available:
 
-* [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip).
+- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip).
-* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
+- Clone the repo: `git clone https://github.com/twbs/bootstrap.git`.
-* Install with [Bower](http://bower.io): `bower install bootstrap`.
+- Install with [Bower](http://bower.io): `bower install bootstrap`.
 
 Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more.
 
@@ -122,16 +122,16 @@ With v3.1, we're moving from the Apache 2 to the MIT license for the Bootstrap c
 
 Keep track of development and community news.
 
-* Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
+- Follow [@twbootstrap on Twitter](http://twitter.com/twbootstrap).
-* Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
+- Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com).
-* Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
+- Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##twitter-bootstrap` channel.
 
 
 
 
 ## Versioning
 
-For transparency and insight into our release cycle, and for striving to maintain backwards compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
+For transparency into our release cycle and in striving to maintain backward compatibility, Bootstrap is maintained under the Semantic Versioning guidelines. Sometimes we screw up, but we'll adhere to these rules whenever possible.
 
 Releases will be numbered with the following format:
 
@@ -139,9 +139,9 @@ Releases will be numbered with the following format:
 
 And constructed with the following guidelines:
 
-* Breaking backwards compatibility bumps the major
+- Breaking backward compatibility **bumps the major** while resetting minor and patch
-* New additions without breaking backwards compatibility bumps the minor
+- New additions without breaking backward compatibility **bumps the minor** while resetting the patch
-* Bug fixes and misc changes bump the patch
+- Bug fixes and misc changes **bumps only the patch**
 
 For more information on SemVer, please visit <http://semver.org/>.
 
@@ -151,13 +151,13 @@ For more information on SemVer, please visit <http://semver.org/>.
 
 **Mark Otto**
 
-+ <http://twitter.com/mdo>
+- <http://twitter.com/mdo>
-+ <http://github.com/mdo>
+- <http://github.com/mdo>
 
 **Jacob Thornton**
 
-+ <http://twitter.com/fat>
+- <http://twitter.com/fat>
-+ <http://github.com/fat>
+- <http://github.com/fat>
 
 
 

dist/js/bootstrap.js

@@ -35,10 +35,10 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     var el = document.createElement('bootstrap')
 
     var transEndEventNames = {
-      'WebkitTransition' : 'webkitTransitionEnd'
+      'WebkitTransition' : 'webkitTransitionEnd',
-    , 'MozTransition'    : 'transitionend'
+      'MozTransition'    : 'transitionend',
-    , 'OTransition'      : 'oTransitionEnd otransitionend'
+      'OTransition'      : 'oTransitionEnd otransitionend',
-    , 'transition'       : 'transitionend'
+      'transition'       : 'transitionend'
     }
 
     for (var name in transEndEventNames) {
@@ -319,9 +319,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Carousel.DEFAULTS = {
-    interval: 5000
+    interval: 5000,
-  , pause: 'hover'
+    pause: 'hover',
-  , wrap: true
+    wrap: true
   }
 
   Carousel.prototype.cycle =  function (e) {
@@ -826,8 +826,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   $(document)
     .on('click.bs.dropdown.data-api', clearMenus)
     .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
-    .on('click.bs.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
-    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+    .on('keydown.bs.dropdown.data-api', toggle + ', [role=menu]', Dropdown.prototype.keydown)
 
 }(jQuery);
 
@@ -866,9 +866,9 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Modal.DEFAULTS = {
-      backdrop: true
+    backdrop: true,
-    , keyboard: true
+    keyboard: true,
-    , show: true
+    show: true
   }
 
   Modal.prototype.toggle = function (_relatedTarget) {
@@ -1115,15 +1115,15 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   }
 
   Tooltip.DEFAULTS = {
-    animation: true
+    animation: true,
-  , placement: 'top'
+    placement: 'top',
-  , selector: false
+    selector: false,
-  , template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>'
+    template: '<div class="tooltip"><div class="tooltip-arrow"></div><div class="tooltip-inner"></div></div>',
-  , trigger: 'hover focus'
+    trigger: 'hover focus',
-  , title: ''
+    title: '',
-  , delay: 0
+    delay: 0,
-  , html: false
+    html: false,
-  , container: false
+    container: false
   }
 
   Tooltip.prototype.init = function (type, element, options) {
@@ -1162,8 +1162,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
     if (options.delay && typeof options.delay == 'number') {
       options.delay = {
-        show: options.delay
+        show: options.delay,
-      , hide: options.delay
+        hide: options.delay
       }
     }
 
@@ -1374,8 +1374,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
   Tooltip.prototype.getPosition = function () {
     var el = this.$element[0]
     return $.extend({}, (typeof el.getBoundingClientRect == 'function') ? el.getBoundingClientRect() : {
-      width: el.offsetWidth
+      width: el.offsetWidth,
-    , height: el.offsetHeight
+      height: el.offsetHeight
     }, this.$element.offset())
   }
 
@@ -1495,11 +1495,11 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
 
   if (!$.fn.tooltip) throw new Error('Popover requires tooltip.js')
 
-  Popover.DEFAULTS = $.extend({} , $.fn.tooltip.Constructor.DEFAULTS, {
+  Popover.DEFAULTS = $.extend({}, $.fn.tooltip.Constructor.DEFAULTS, {
-    placement: 'right'
+    placement: 'right',
-  , trigger: 'click'
+    trigger: 'click',
-  , content: ''
+    content: '',
-  , template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
+    template: '<div class="popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>'
   })
 
 
@@ -1796,8 +1796,8 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
     this.activate($this.parent('li'), $ul)
     this.activate($target, $target.parent(), function () {
       $this.trigger({
-        type: 'shown.bs.tab'
+        type: 'shown.bs.tab',
-      , relatedTarget: previous
+        relatedTarget: previous
       })
     })
   }

less/breadcrumbs.less

@@ -9,14 +9,17 @@
   list-style: none;
   background-color: @breadcrumb-bg;
   border-radius: @border-radius-base;
+
   > li {
-    display: inline;
+    display: inline-block;
+
     + li:before {
       content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
       color: @breadcrumb-color;
     }
   }
+
   > .active {
     color: @breadcrumb-active-color;
   }

less/buttons.less

@@ -18,32 +18,32 @@
   white-space: nowrap;
   .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
   .user-select(none);
-}
 
-.btn:focus {
+  &:focus {
     .tab-focus();
-}
+  }
 
-.btn:hover,
+  &:hover,
-.btn:focus {
+  &:focus {
     color: @btn-default-color;
     text-decoration: none;
-}
+  }
 
-.btn:active,
+  &:active,
-.btn.active {
+  &.active {
     outline: 0;
     background-image: none;
     .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
-}
+  }
 
-.btn.disabled,
+  &.disabled,
-.btn[disabled],
+  &[disabled],
-fieldset[disabled] .btn {
+  fieldset[disabled] & {
     cursor: not-allowed;
     pointer-events: none; // Future-proof disabling of clicks
     .opacity(.65);
     .box-shadow(none);
+  }
 }
 
 

less/navbar.less

@@ -215,7 +215,7 @@
 // Builds on top of the `.nav` components with its own modifier class to make
 // the nav the full height of the horizontal nav (above 768px).
 
-.navbar .nav {
+.navbar-nav {
   margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;
 
   > li > a {