Merge branch '3.0.0-wip' into bs3_remove_examples

Conflicts:
	docs/_includes/nav-getting-started.html
	docs/examples/navbar-fixed-top.html
	docs/examples/navbar-static-top.html
	docs/examples/navbar.html
	docs/getting-started.html

less/breadcrumbs.less

@@ -12,15 +12,12 @@
   > li {
     display: inline-block;
     text-shadow: 0 1px 0 #fff;
-    &:after {
+    &+li:before {
       display: inline-block;
-      content: "\00a0 /"; // Unicode space added since inline-block means non-collapsing white-space
+      content: "/\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
       color: #ccc;
     }
-    &:last-child:after {
-      display: none; // No divider after last element
-    }
   }
   > .active {
     color: @gray-light;

less/button-groups.less

@@ -72,9 +72,11 @@
 .btn-group > .btn-group:not(:first-child):not(:last-child) > .btn {
   border-radius: 0;
 }
-.btn-group > .btn-group:first-child > .btn:last-child,
-.btn-group > .btn-group:first-child > .dropdown-toggle {
-  .border-right-radius(0);
+.btn-group > .btn-group:first-child {
+  > .btn:last-child,
+  > .dropdown-toggle {
+    .border-right-radius(0);
+  }
 }
 .btn-group > .btn-group:last-child > .btn:first-child {
   .border-left-radius(0);
@@ -96,10 +98,6 @@
   padding-left: 8px;
   padding-right: 8px;
 }
-.btn-group > .btn-mini + .dropdown-toggle {
-  padding-left: 5px;
-  padding-right: 5px;
-}
 .btn-group > .btn-large + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px;
@@ -138,14 +136,16 @@
     margin-top: -1px;
   }
 }
-.btn-group-vertical .btn:not(:first-child):not(:last-child) {
-  border-radius: 0;
-}
-.btn-group-vertical .btn:first-child {
-  .border-bottom-radius(0);
-}
-.btn-group-vertical .btn:last-child {
-  .border-top-radius(0);
+.btn-group-vertical .btn {
+  &:not(:first-child):not(:last-child) {
+    border-radius: 0;
+  }
+  &:first-child {
+    .border-bottom-radius(0);
+  }
+  &:last-child {
+    .border-top-radius(0);
+  }
 }
 
 

less/buttons.less

@@ -81,33 +81,32 @@
 // -------------------------
 
 // Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  background-image: none;
-  .box-shadow(none);
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
 .btn-link {
   color: @link-color;
   font-weight: normal;
   cursor: pointer;
   border-radius: 0;
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: @link-hover-color;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link {
+
+  &,
+  &:active,
+  &[disabled],
+  fieldset[disabled] & {
+    background-color: transparent;
+    background-image: none;
+    .box-shadow(none);
+  }
+  &,
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: transparent;
+  }
+  &:hover,
+  &:focus {
+    color: @link-hover-color;
+    text-decoration: underline;
+    background-color: transparent;
+  }
   &[disabled],
   fieldset[disabled] & {
     &:hover,

less/close.less

@@ -19,15 +19,15 @@
     cursor: pointer;
     .opacity(.5);
   }
-}
 
-// Additional properties for button version
-// iOS requires the button element instead of an anchor tag.
-// If you want the anchor version, it requires `href="#"`.
-button.close {
-  padding: 0;
-  cursor: pointer;
-  background: transparent;
-  border: 0;
-  -webkit-appearance: none;
+  // Additional properties for button version
+  // iOS requires the button element instead of an anchor tag.
+  // If you want the anchor version, it requires `href="#"`.
+  button& {
+    padding: 0;
+    cursor: pointer;
+    background: transparent;
+    border: 0;
+    -webkit-appearance: none;
+  }
 }

less/jumbotron.less

@@ -18,13 +18,10 @@
   p {
     line-height: 1.4;
   }
-}
 
-@media screen and (min-width: @screen-tablet) {
-  .jumbotron {
+  @media screen and (min-width: @screen-tablet) {
     padding: 50px 60px;
     border-radius: @border-radius-large; // Only round corners at higher resolutions
-
     h1 {
       font-size: (@font-size-base * 4.5);
     }

less/modals.less

@@ -23,7 +23,6 @@
   bottom: 0;
   left: 0;
   z-index: @zindex-modal-background;
-  -webkit-overflow-scrolling: touch;
 
   // When fading in the modal, animate it to slide down
   &.fade {

less/pager.less

@@ -4,6 +4,7 @@
 
 
 .pager {
+  padding-left: 0;
   margin: @line-height-computed 0;
   list-style: none;
   text-align: center;