Revert commits

Bootstrap is being relicensed from Apache 2.0 to MIT so that more of our community can use the free and open source software we lovely create together. As commits are copyright their original authors, the commits of any individual not agreeing to relicense their contributions are being removed to be later rewritten by the @twbs/team.

This undoes the changes introduced by the following commits:
https://github.com/twbs/bootstrap/commit/7ea34ae0ef79c793e9a9d393b4eef825b71e84b5 , https://github.com/twbs/bootstrap/commit/7376eef378fe7d5e69b8b8cce93c7c64b751d55a , https://github.com/twbs/bootstrap/commit/303ba1326bbe367598ab4cc063b4607507208e56 , https://github.com/twbs/bootstrap/commit/7d1c8c2a0ce16331583a965821690f7715e62908 , https://github.com/twbs/bootstrap/commit/11319f6da9f9a19ec40743cdfe868ac732698149 , https://github.com/twbs/bootstrap/commit/110fc8860117d8675345806219ba313b18086db2 , https://github.com/twbs/bootstrap/commit/ced08f69359f3a70771804a98fa3c499f388cc74

diff --git a/README.md b/README.md
index 7d342d7a709453de320ffa0519130c9653812cb1..492c430fee56b00e02a2e42a23411a04c9adaed3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -131,7 +131,7 @@ Keep track of development and community news.
 
 ## Versioning
 
-For transparency and insight into our release cycle, and for striving to maintain backward compatibility, Bootstrap will be maintained under the Semantic Versioning guidelines as much as possible.
+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.
 
 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 backward compatibility bumps the major (and resets the minor and patch)
-* New additions without breaking backward compatibility bumps the minor (and resets the patch)
-* Bug fixes and misc changes bumps the patch
+* Breaking backwards compatibility bumps the major
+* New additions without breaking backwards compatibility bumps the minor
+* Bug fixes and misc changes bump the patch
 
 For more information on SemVer, please visit <http://semver.org/>.
 

diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
index 5917778f4ffa760085fac81d6c87cbcd77e494fc..a044c4c80a6c566f72ccd22fac66d9578c30b38d 100644 (file)
--- a/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@ -10,7 +10,7 @@
   background-color: @breadcrumb-bg;
   border-radius: @border-radius-base;
   > li {
-    display: inline-block;
+    display: inline;
     + li:before {
       content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;

diff --git a/less/buttons.less b/less/buttons.less
index b728f332c1e372fd1c9866a7d41933f85b61e9cc..68664ea5ca60951e961282651473097e158e0c87 100644 (file)
--- a/less/buttons.less
+++ b/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);
+}
 
-  &:focus {
-    .tab-focus();
-  }
+.btn:focus {
+  .tab-focus();
+}
 
-  &:hover,
-  &:focus {
-    color: @btn-default-color;
-    text-decoration: none;
-  }
+.btn:hover,
+.btn:focus {
+  color: @btn-default-color;
+  text-decoration: none;
+}
 
-  &:active,
-  &.active {
-    outline: 0;
-    background-image: none;
-    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
-  }
+.btn:active,
+.btn.active {
+  outline: 0;
+  background-image: none;
+  .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+}
 
-  &.disabled,
-  &[disabled],
-  fieldset[disabled] & {
-    cursor: not-allowed;
-    pointer-events: none; // Future-proof disabling of clicks
-    .opacity(.65);
-    .box-shadow(none);
-  }
+.btn.disabled,
+.btn[disabled],
+fieldset[disabled] .btn {
+  cursor: not-allowed;
+  pointer-events: none; // Future-proof disabling of clicks
+  .opacity(.65);
+  .box-shadow(none);
 }
 
 

diff --git a/less/navbar.less b/less/navbar.less
index 621772fbbfb464bd870ca9554eb7931285c81816..dd9d5592068b8d73228e4207495963302e3cfcae 100644 (file)
--- a/less/navbar.less
+++ b/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 {