Merge branch '2.2.2-wip' into exploratory

Conflicts:
	docs/assets/css/bootstrap.css
	docs/getting-started.html
	docs/templates/pages/getting-started.mustache
	less/accordion.less
	less/alerts.less
	less/breadcrumbs.less
	less/buttons.less
	less/code.less
	less/dropdowns.less
	less/forms.less
	less/navbar.less
	less/progress-bars.less
	less/responsive-navbar.less
	less/tables.less
	less/thumbnails.less
	less/tooltip.less
	less/wells.less

diff --cc Makefile
Simple merge

diff --cc docs/assets/css/bootstrap.css
index 2e9ca173e6c7bd9b56cf337fabc7bde60fab9713,142df455aa529913ac7fe4949114d81c4c009922..309b07b28cd5bee2b1c957a69af6d3f407939dc5
--- 1/docs/assets/css/bootstrap.css
--- 2/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@@ -629,6 -915,9 +645,7 @@@ pre 
    background-color: #f5f5f5;
    border: 1px solid #ccc;
    border: 1px solid rgba(0, 0, 0, 0.15);
 -  -webkit-border-radius: 4px;
 -     -moz-border-radius: 4px;
 -          border-radius: 4px;
++  border-radius: 4px;
  }
  
  pre.prettyprint {
@@@ -792,10 -1082,8 +809,9 @@@ input[type="radio"]
  input[type="checkbox"] {
    margin: 4px 0 0;
    margin-top: 1px \9;
 -  *margin-top: 0;
 +  /* IE8-9 */
 +
    line-height: normal;
-   cursor: pointer;
  }
  
  input[type="file"],
@@@ -900,72 -1193,28 +916,72 @@@ textarea::-webkit-input-placeholder 
    margin-left: 10px;
  }
  
 -.input-mini {
 -  width: 60px;
 -}
 -
 -.input-small {
 -  width: 90px;
 -}
 -
 -.input-medium {
 -  width: 150px;
 -}
 -
 -.input-large {
 -  width: 210px;
 -}
 -
 -.input-xlarge {
 -  width: 270px;
 -}
 -
 -.input-xxlarge {
 -  width: 530px;
 +select.input-large,
 +textarea.input-large,
 +input[type="text"].input-large,
 +input[type="password"].input-large,
 +input[type="datetime"].input-large,
 +input[type="datetime-local"].input-large,
 +input[type="date"].input-large,
 +input[type="month"].input-large,
 +input[type="time"].input-large,
 +input[type="week"].input-large,
 +input[type="number"].input-large,
 +input[type="email"].input-large,
 +input[type="url"].input-large,
 +input[type="search"].input-large,
 +input[type="tel"].input-large,
 +input[type="color"].input-large,
 +.uneditable-input.input-large {
 +  padding: 11px 19px;
 +  padding-right: 14px;
 +  padding-left: 14px;
 +  font-size: 17.5px;
-   border-radius: 5px;
++  border-radius: 6px;
 +}
 +
 +select.input-small,
 +textarea.input-small,
 +input[type="text"].input-small,
 +input[type="password"].input-small,
 +input[type="datetime"].input-small,
 +input[type="datetime-local"].input-small,
 +input[type="date"].input-small,
 +input[type="month"].input-small,
 +input[type="time"].input-small,
 +input[type="week"].input-small,
 +input[type="number"].input-small,
 +input[type="email"].input-small,
 +input[type="url"].input-small,
 +input[type="search"].input-small,
 +input[type="tel"].input-small,
 +input[type="color"].input-small,
 +.uneditable-input.input-small {
 +  padding: 2px 10px;
 +  font-size: 11.9px;
 +  border-radius: 3px;
 +}
 +
 +select.input-mini,
 +textarea.input-mini,
 +input[type="text"].input-mini,
 +input[type="password"].input-mini,
 +input[type="datetime"].input-mini,
 +input[type="datetime-local"].input-mini,
 +input[type="date"].input-mini,
 +input[type="month"].input-mini,
 +input[type="time"].input-mini,
 +input[type="week"].input-mini,
 +input[type="number"].input-mini,
 +input[type="email"].input-mini,
 +input[type="url"].input-mini,
 +input[type="search"].input-mini,
 +input[type="tel"].input-mini,
 +input[type="color"].input-mini,
 +.uneditable-input.input-mini {
 +  padding: 1px 6px;
 +  font-size: 10.5px;
 +  border-radius: 3px;
  }
  
  input[class*="span"],
@@@ -2507,11 -2791,16 +2525,11 @@@ table th[class*="span"]
    background-color: #ffffff;
    border: 1px solid #ccc;
    border: 1px solid rgba(0, 0, 0, 0.2);
-   border-radius: 6px;
 -  *border-right-width: 2px;
 -  *border-bottom-width: 2px;
 -  -webkit-border-radius: 6px;
 -     -moz-border-radius: 6px;
 -          border-radius: 6px;
++  border-radius: 4px;
    -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
 -     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
            box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
    -webkit-background-clip: padding-box;
 -     -moz-background-clip: padding;
 +     -moz-background-clip: padding-box;
            background-clip: padding-box;
  }
  
@@@ -2579,8 -2868,13 +2595,9 @@@
    text-decoration: none;
    cursor: default;
    background-color: transparent;
+   background-image: none;
  }
  
 -.open {
 -  *z-index: 1000;
 -}
 -
  .open > .dropdown-menu {
    display: block;
  }
@@@ -2613,9 -2907,9 +2630,7 @@@
    left: 100%;
    margin-top: -6px;
    margin-left: -1px;
--  -webkit-border-radius: 0 6px 6px 6px;
--     -moz-border-radius: 0 6px 6px 6px;
--          border-radius: 0 6px 6px 6px;
++  border-radius: 0 4px 4px 4px;
  }
  
  .dropdown-submenu:hover > .dropdown-menu {
@@@ -2627,9 -2921,9 +2642,7 @@@
    bottom: 0;
    margin-top: 0;
    margin-bottom: -2px;
--  -webkit-border-radius: 5px 5px 5px 0;
--     -moz-border-radius: 5px 5px 5px 0;
--          border-radius: 5px 5px 5px 0;
++  border-radius: 4px 4px 4px 0;
  }
  
  .dropdown-submenu > a:after {
@@@ -2657,9 -2951,9 +2670,7 @@@
  .dropdown-submenu.pull-left > .dropdown-menu {
    left: -100%;
    margin-left: 10px;
--  -webkit-border-radius: 6px 0 6px 6px;
--     -moz-border-radius: 6px 0 6px 6px;
--          border-radius: 6px 0 6px 6px;
++  border-radius: 4px 0 4px 4px;
  }
  
  .dropdown .dropdown-menu .nav-header {
@@@ -2669,7 -2963,9 +2680,6 @@@
  
  .typeahead {
    margin-top: 2px;
-   border-radius: 4px;
 -  -webkit-border-radius: 4px;
 -     -moz-border-radius: 4px;
 -          border-radius: 4px;
  }
  
  .well {
@@@ -2773,10 -3080,15 +2783,10 @@@ button.close 
    border-color: #e6e6e6 #e6e6e6 #bfbfbf;
    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
    border-bottom-color: #a2a2a2;
 -  -webkit-border-radius: 4px;
 -     -moz-border-radius: 4px;
 -          border-radius: 4px;
 +  border-radius: 4px;
-   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
-   filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#ffe6e6e6', GradientType=0);
+   filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
 -  *zoom: 1;
    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
 -     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
  }
  
@@@ -2835,7 -3157,9 +2845,7 @@@
  .btn-large {
    padding: 11px 19px;
    font-size: 17.5px;
-   border-radius: 5px;
 -  -webkit-border-radius: 6px;
 -     -moz-border-radius: 6px;
 -          border-radius: 6px;
++  border-radius: 6px;
  }
  
  .btn-large [class^="icon-"],
@@@ -3639,9 -4196,13 +3649,9 @@@ input[type="button"].btn-block 
    background-image: linear-gradient(to bottom, #ffffff, #f2f2f2);
    background-repeat: repeat-x;
    border: 1px solid #d4d4d4;
-   border-radius: 6px;
-   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
 -  -webkit-border-radius: 4px;
 -     -moz-border-radius: 4px;
 -          border-radius: 4px;
++  border-radius: 4px;
+   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff', endColorstr='#fff2f2f2', GradientType=0);
 -  *zoom: 1;
    -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
 -     -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
            box-shadow: 0 1px 4px rgba(0, 0, 0, 0.065);
  }
  
@@@ -3882,9 -4468,10 +3892,9 @@@
    background-repeat: repeat-x;
    border-color: #e5e5e5 #e5e5e5 #bfbfbf;
    border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
-   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
-   filter: progid:dximagetransform.microsoft.gradient(enabled=false);
+   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff2f2f2', endColorstr='#ffe5e5e5', GradientType=0);
+   filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
 -     -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075);
  }
  
@@@ -4381,8 -4991,13 +4391,9 @@@
    background-color: #ffffff;
    border: 1px solid #999;
    border: 1px solid rgba(0, 0, 0, 0.3);
 -  *border: 1px solid #999;
 -  -webkit-border-radius: 6px;
 -     -moz-border-radius: 6px;
 -          border-radius: 6px;
 +  border-radius: 6px;
+   outline: none;
    -webkit-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
 -     -moz-box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
            box-shadow: 0 3px 7px rgba(0, 0, 0, 0.3);
    -webkit-background-clip: padding-box;
       -moz-background-clip: padding-box;
@@@ -4889,9 -5551,12 +4900,9 @@@ a.badge:hover 
    background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9);
    background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
    background-repeat: repeat-x;
 -  -webkit-border-radius: 4px;
 -     -moz-border-radius: 4px;
 -          border-radius: 4px;
 +  border-radius: 4px;
-   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
+   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0);
    -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
 -     -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
            box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
  }
  
@@@ -4910,8 -5575,9 +4921,8 @@@
    background-image: -o-linear-gradient(top, #149bdf, #0480be);
    background-image: linear-gradient(to bottom, #149bdf, #0480be);
    background-repeat: repeat-x;
-   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
+   filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0);
    -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
 -     -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
            box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
    -webkit-box-sizing: border-box;
       -moz-box-sizing: border-box;
@@@ -5138,30 -5818,9 +5149,30 @@@
    filter: alpha(opacity=50);
  }
  
-   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#bf000000', endColorstr='#00000000', GradientType=1);
 +.carousel-control.left {
 +  background-color: rgba(0, 0, 0, 0.001);
 +  background-color: transparent;
 +  background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001));
 +  background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.75)), to(rgba(0, 0, 0, 0.001)));
 +  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001));
 +  background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001));
 +  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.75), rgba(0, 0, 0, 0.001));
 +  background-repeat: repeat-x;
++  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#bf000000', endColorstr='#00000000', GradientType=1);
 +}
 +
  .carousel-control.right {
 -  right: 15px;
 +  right: 0;
    left: auto;
-   background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.001)), to(rgba(0, 0, 0, 0.75)));
 +  background-color: rgba(0, 0, 0, 0.75);
 +  background-color: transparent;
-   background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75));
 +  background-image: -moz-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75));
++  background-image: -webkit-gradient(linear, 0 0, 100% 0, from(rgba(0, 0, 0, 0.001)), to(rgba(0, 0, 0, 0.75)));
++  background-image: -webkit-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75));
 +  background-image: -o-linear-gradient(left, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75));
 +  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.001), rgba(0, 0, 0, 0.75));
-   filter: progid:dximagetransform.microsoft.gradient(startColorstr='#00000000', endColorstr='#bf000000', GradientType=1);
 +  background-repeat: repeat-x;
++  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#00000000', endColorstr='#bf000000', GradientType=1);
  }
  
  .carousel-control:hover {
@@@ -5216,8 -5857,14 +5227,12 @@@
  .hero-unit {
    padding: 60px;
    margin-bottom: 30px;
+   font-size: 18px;
+   font-weight: 200;
+   line-height: 30px;
+   color: inherit;
    background-color: #eeeeee;
 -  -webkit-border-radius: 6px;
 -     -moz-border-radius: 6px;
 -          border-radius: 6px;
 +  border-radius: 6px;
  }
  
  .hero-unit h1 {
@@@ -5228,24 -5875,10 +5243,21 @@@
    color: inherit;
  }
  
- .hero-unit p {
-   font-size: 18px;
-   font-weight: 200;
+ .hero-unit li {
    line-height: 30px;
-   color: inherit;
  }
  
 +.clear:before,
 +.clear:after {
 +  display: table;
 +  line-height: 0;
 +  content: "";
 +}
 +
 +.clear:after {
 +  clear: both;
 +}
 +
  .pull-right {
    float: right;
  }
@@@ -5277,684 -5902,3 +5289,691 @@@
  .affix {
    position: fixed;
  }
-     display: block;
 +
 +.control-block-level {
 +  display: block;
 +  width: 100%;
 +}
 +
 +.hidden {
 +  display: none;
 +  visibility: hidden;
 +}
 +
 +.visible-phone {
 +  display: none !important;
 +}
 +
 +.visible-tablet {
 +  display: none !important;
 +}
 +
 +.hidden-desktop {
 +  display: none !important;
 +}
 +
 +.visible-desktop {
 +  display: inherit !important;
 +}
 +
 +@media (min-width: 768px) and (max-width: 979px) {
 +  .hidden-desktop {
 +    display: inherit !important;
 +  }
 +  .visible-desktop {
 +    display: none !important ;
 +  }
 +  .visible-tablet {
 +    display: inherit !important;
 +  }
 +  .hidden-tablet {
 +    display: none !important;
 +  }
 +}
 +
 +@media (max-width: 767px) {
 +  .hidden-desktop {
 +    display: inherit !important;
 +  }
 +  .visible-desktop {
 +    display: none !important;
 +  }
 +  .visible-phone {
 +    display: inherit !important;
 +  }
 +  .hidden-phone {
 +    display: none !important;
 +  }
 +}
 +
 +@media (min-width: 1200px) {
 +  .container,
 +  .navbar-fixed-top .container,
 +  .navbar-fixed-bottom .container {
 +    width: 1170px;
 +  }
 +  .row {
 +    margin-right: -15px;
 +    margin-left: -15px;
 +  }
 +  .row:before,
 +  .row:after {
 +    display: table;
 +    line-height: 0;
 +    content: "";
 +  }
 +  .row:after {
 +    clear: both;
 +  }
 +  [class*="span"] {
 +    float: left;
 +    min-height: 1px;
 +    padding-right: 15px;
 +    padding-left: 15px;
 +    -webkit-box-sizing: border-box;
 +       -moz-box-sizing: border-box;
 +            box-sizing: border-box;
 +  }
 +  .span12 {
 +    width: 100%;
 +  }
 +  .span11 {
 +    width: 91.66666666666666%;
 +  }
 +  .span10 {
 +    width: 83.33333333333334%;
 +  }
 +  .span9 {
 +    width: 75%;
 +  }
 +  .span8 {
 +    width: 66.66666666666666%;
 +  }
 +  .span7 {
 +    width: 58.333333333333336%;
 +  }
 +  .span6 {
 +    width: 50%;
 +  }
 +  .span5 {
 +    width: 41.66666666666667%;
 +  }
 +  .span4 {
 +    width: 33.33333333333333%;
 +  }
 +  .span3 {
 +    width: 25%;
 +  }
 +  .span2 {
 +    width: 16.666666666666664%;
 +  }
 +  .span1 {
 +    width: 8.333333333333332%;
 +  }
 +  .offset12 {
 +    margin-left: 100%;
 +  }
 +  .offset11 {
 +    margin-left: 91.66666666666666%;
 +  }
 +  .offset10 {
 +    margin-left: 83.33333333333334%;
 +  }
 +  .offset9 {
 +    margin-left: 75%;
 +  }
 +  .offset8 {
 +    margin-left: 66.66666666666666%;
 +  }
 +  .offset7 {
 +    margin-left: 58.333333333333336%;
 +  }
 +  .offset6 {
 +    margin-left: 50%;
 +  }
 +  .offset5 {
 +    margin-left: 41.66666666666667%;
 +  }
 +  .offset4 {
 +    margin-left: 33.33333333333333%;
 +  }
 +  .offset3 {
 +    margin-left: 25%;
 +  }
 +  .offset2 {
 +    margin-left: 16.666666666666664%;
 +  }
 +  .offset1 {
 +    margin-left: 8.333333333333332%;
 +  }
 +  input.span12,
 +  textarea.span12,
 +  select.span12,
 +  .uneditable-input.span12 {
 +    width: 97.43589743589743%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span11,
 +  textarea.span11,
 +  select.span11,
 +  .uneditable-input.span11 {
 +    width: 89.10256410256409%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span10,
 +  textarea.span10,
 +  select.span10,
 +  .uneditable-input.span10 {
 +    width: 80.76923076923077%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span9,
 +  textarea.span9,
 +  select.span9,
 +  .uneditable-input.span9 {
 +    width: 72.43589743589743%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span8,
 +  textarea.span8,
 +  select.span8,
 +  .uneditable-input.span8 {
 +    width: 64.10256410256409%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span7,
 +  textarea.span7,
 +  select.span7,
 +  .uneditable-input.span7 {
 +    width: 55.769230769230774%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span6,
 +  textarea.span6,
 +  select.span6,
 +  .uneditable-input.span6 {
 +    width: 47.43589743589744%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span5,
 +  textarea.span5,
 +  select.span5,
 +  .uneditable-input.span5 {
 +    width: 39.10256410256411%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span4,
 +  textarea.span4,
 +  select.span4,
 +  .uneditable-input.span4 {
 +    width: 30.769230769230766%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span3,
 +  textarea.span3,
 +  select.span3,
 +  .uneditable-input.span3 {
 +    width: 22.435897435897438%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span2,
 +  textarea.span2,
 +  select.span2,
 +  .uneditable-input.span2 {
 +    width: 14.1025641025641%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.span1,
 +  textarea.span1,
 +  select.span1,
 +  .uneditable-input.span1 {
 +    width: 5.769230769230768%;
 +    margin-right: 1.282051282051282%;
 +    margin-left: 1.282051282051282%;
 +  }
 +  input.offset12,
 +  textarea.offset12,
 +  select.offset12,
 +  uneditable-input.offset12 {
 +    margin-left: 101.28205128205128%;
 +  }
 +  input.offset11,
 +  textarea.offset11,
 +  select.offset11,
 +  uneditable-input.offset11 {
 +    margin-left: 92.94871794871794%;
 +  }
 +  input.offset10,
 +  textarea.offset10,
 +  select.offset10,
 +  uneditable-input.offset10 {
 +    margin-left: 84.61538461538463%;
 +  }
 +  input.offset9,
 +  textarea.offset9,
 +  select.offset9,
 +  uneditable-input.offset9 {
 +    margin-left: 76.28205128205128%;
 +  }
 +  input.offset8,
 +  textarea.offset8,
 +  select.offset8,
 +  uneditable-input.offset8 {
 +    margin-left: 67.94871794871794%;
 +  }
 +  input.offset7,
 +  textarea.offset7,
 +  select.offset7,
 +  uneditable-input.offset7 {
 +    margin-left: 59.61538461538462%;
 +  }
 +  input.offset6,
 +  textarea.offset6,
 +  select.offset6,
 +  uneditable-input.offset6 {
 +    margin-left: 51.282051282051285%;
 +  }
 +  input.offset5,
 +  textarea.offset5,
 +  select.offset5,
 +  uneditable-input.offset5 {
 +    margin-left: 42.948717948717956%;
 +  }
 +  input.offset4,
 +  textarea.offset4,
 +  select.offset4,
 +  uneditable-input.offset4 {
 +    margin-left: 34.61538461538461%;
 +  }
 +  input.offset3,
 +  textarea.offset3,
 +  select.offset3,
 +  uneditable-input.offset3 {
 +    margin-left: 26.28205128205128%;
 +  }
 +  input.offset2,
 +  textarea.offset2,
 +  select.offset2,
 +  uneditable-input.offset2 {
 +    margin-left: 17.948717948717945%;
 +  }
 +  input.offset1,
 +  textarea.offset1,
 +  select.offset1,
 +  uneditable-input.offset1 {
 +    margin-left: 9.615384615384613%;
 +  }
 +}
 +
 +@media (min-width: 768px) and (max-width: 979px) {
 +  .row {
 +    margin-right: -10px;
 +    margin-left: -10px;
 +  }
 +  .row:before,
 +  .row:after {
 +    display: table;
 +    line-height: 0;
 +    content: "";
 +  }
 +  .row:after {
 +    clear: both;
 +  }
 +  [class*="span"] {
 +    float: left;
 +    min-height: 1px;
 +    padding-right: 10px;
 +    padding-left: 10px;
 +    -webkit-box-sizing: border-box;
 +       -moz-box-sizing: border-box;
 +            box-sizing: border-box;
 +  }
 +  .span12 {
 +    width: 100%;
 +  }
 +  .span11 {
 +    width: 91.66666666666666%;
 +  }
 +  .span10 {
 +    width: 83.33333333333334%;
 +  }
 +  .span9 {
 +    width: 75%;
 +  }
 +  .span8 {
 +    width: 66.66666666666666%;
 +  }
 +  .span7 {
 +    width: 58.333333333333336%;
 +  }
 +  .span6 {
 +    width: 50%;
 +  }
 +  .span5 {
 +    width: 41.66666666666667%;
 +  }
 +  .span4 {
 +    width: 33.33333333333333%;
 +  }
 +  .span3 {
 +    width: 25%;
 +  }
 +  .span2 {
 +    width: 16.666666666666664%;
 +  }
 +  .span1 {
 +    width: 8.333333333333332%;
 +  }
 +  .offset12 {
 +    margin-left: 100%;
 +  }
 +  .offset11 {
 +    margin-left: 91.66666666666666%;
 +  }
 +  .offset10 {
 +    margin-left: 83.33333333333334%;
 +  }
 +  .offset9 {
 +    margin-left: 75%;
 +  }
 +  .offset8 {
 +    margin-left: 66.66666666666666%;
 +  }
 +  .offset7 {
 +    margin-left: 58.333333333333336%;
 +  }
 +  .offset6 {
 +    margin-left: 50%;
 +  }
 +  .offset5 {
 +    margin-left: 41.66666666666667%;
 +  }
 +  .offset4 {
 +    margin-left: 33.33333333333333%;
 +  }
 +  .offset3 {
 +    margin-left: 25%;
 +  }
 +  .offset2 {
 +    margin-left: 16.666666666666664%;
 +  }
 +  .offset1 {
 +    margin-left: 8.333333333333332%;
 +  }
 +}
 +
 +@media (max-width: 767px) {
 +  body {
 +    padding-right: 20px;
 +    padding-left: 20px;
 +  }
 +  .navbar-fixed-top,
 +  .navbar-fixed-bottom,
 +  .navbar-static-top {
 +    margin-right: -20px;
 +    margin-left: -20px;
 +  }
 +  .container-fluid {
 +    padding: 0;
 +  }
 +  .dl-horizontal dt {
 +    float: none;
 +    width: auto;
 +    clear: none;
 +    text-align: left;
 +  }
 +  .dl-horizontal dd {
 +    margin-left: 0;
 +  }
 +  .container {
 +    width: auto;
 +  }
 +  [class*="span"],
 +  .uneditable-input[class*="span"] {
 +    display: block;
 +    float: none;
 +    width: 100%;
 +    margin-left: 0;
 +  }
 +  input[class*="span"],
 +  select[class*="span"],
 +  textarea[class*="span"],
 +  .uneditable-input {
 +    display: block;
 +    width: 100%;
 +  }
 +  .input-prepend input,
 +  .input-append input,
 +  .input-prepend input[class*="span"],
 +  .input-append input[class*="span"] {
 +    display: inline-block;
 +    width: auto;
 +  }
 +  .controls-row [class*="span"] + [class*="span"] {
 +    margin-left: 0;
 +  }
 +  .modal {
 +    position: fixed;
 +    top: 20px;
 +    right: 20px;
 +    left: 20px;
 +    width: auto;
 +    margin: 0;
 +  }
 +  .modal.fade {
 +    top: -100px;
 +  }
 +  .modal.fade.in {
 +    top: 20px;
 +  }
 +}
 +
 +@media (max-width: 480px) {
 +  .nav-collapse {
 +    -webkit-transform: translate3d(0, 0, 0);
 +  }
 +  .page-header h1 small {
 +    display: block;
 +    line-height: 20px;
 +  }
 +  input[type="checkbox"],
 +  input[type="radio"] {
 +    border: 1px solid #ccc;
 +  }
 +  .form-horizontal .control-label {
 +    float: none;
 +    width: auto;
 +    padding-top: 0;
 +    text-align: left;
 +  }
 +  .form-horizontal .controls {
 +    margin-left: 0;
 +  }
 +  .form-horizontal .control-list {
 +    padding-top: 0;
 +  }
 +  .form-horizontal .form-actions {
 +    padding-right: 10px;
 +    padding-left: 10px;
 +  }
 +  .media .pull-left,
 +  .media .pull-right {
 +    display: block;
 +    float: none;
 +    margin-bottom: 10px;
 +  }
 +  .media-object {
 +    margin-right: 0;
 +    margin-left: 0;
 +  }
 +  .modal {
 +    top: 10px;
 +    right: 10px;
 +    left: 10px;
 +  }
 +  .modal-header .close {
 +    padding: 10px;
 +    margin: -10px;
 +  }
 +  .carousel-caption {
 +    position: static;
 +  }
 +}
 +
 +@media (max-width: 979px) {
 +  body {
 +    padding-top: 0;
 +  }
 +  .navbar-fixed-top,
 +  .navbar-fixed-bottom {
 +    position: static;
 +  }
 +  .navbar-fixed-top {
 +    margin-bottom: 20px;
 +  }
 +  .navbar-fixed-bottom {
 +    margin-top: 20px;
 +  }
 +  .navbar-fixed-top,
 +  .navbar-fixed-bottom {
 +    padding: 5px;
 +  }
 +  .navbar .container {
 +    width: auto;
 +    padding: 0;
 +  }
 +  .navbar .brand {
 +    padding-right: 10px;
 +    padding-left: 10px;
 +    margin: 0 0 0 -5px;
 +  }
 +  .nav-collapse {
 +    clear: both;
 +  }
 +  .nav-collapse .nav {
 +    float: none;
 +    margin: 0 0 10px;
 +  }
 +  .nav-collapse .nav > li {
 +    float: none;
 +  }
 +  .nav-collapse .nav > li > a {
 +    margin-bottom: 2px;
 +  }
 +  .nav-collapse .nav > .divider-vertical {
 +    display: none;
 +  }
 +  .nav-collapse .nav .nav-header {
 +    color: #777777;
 +    text-shadow: none;
 +  }
 +  .nav-collapse .nav > li > a,
 +  .nav-collapse .dropdown-menu a {
 +    padding: 9px 15px;
 +    font-weight: bold;
 +    color: #777777;
 +    border-radius: 3px;
 +  }
 +  .nav-collapse .btn {
 +    padding: 4px 10px 4px;
 +    font-weight: normal;
 +    border-radius: 4px;
 +  }
 +  .nav-collapse .dropdown-menu li + li a {
 +    margin-bottom: 2px;
 +  }
 +  .nav-collapse .nav > li > a:hover,
 +  .nav-collapse .dropdown-menu a:hover {
 +    background-color: #f2f2f2;
 +  }
++  .navbar-inverse .nav-collapse .nav > li > a,
++  .navbar-inverse .nav-collapse .dropdown-menu a {
++    color: #999999;
++  }
 +  .navbar-inverse .nav-collapse .nav > li > a:hover,
 +  .navbar-inverse .nav-collapse .dropdown-menu a:hover {
 +    background-color: #111111;
 +  }
 +  .nav-collapse.in .btn-group {
 +    padding: 0;
 +    margin-top: 5px;
 +  }
 +  .nav-collapse .dropdown-menu {
 +    position: static;
 +    top: auto;
 +    left: auto;
++    display: none;
 +    float: none;
 +    max-width: none;
 +    padding: 0;
 +    margin: 0 15px;
 +    background-color: transparent;
 +    border: none;
 +    border-radius: 0;
 +    -webkit-box-shadow: none;
 +            box-shadow: none;
 +  }
++  .nav-collapse .open > .dropdown-menu {
++    display: block;
++  }
 +  .nav-collapse .dropdown-menu:before,
 +  .nav-collapse .dropdown-menu:after {
 +    display: none;
 +  }
 +  .nav-collapse .dropdown-menu .divider {
 +    display: none;
 +  }
 +  .nav-collapse .nav > li > .dropdown-menu:before,
 +  .nav-collapse .nav > li > .dropdown-menu:after {
 +    display: none;
 +  }
 +  .nav-collapse .navbar-form,
 +  .nav-collapse .navbar-search {
 +    float: none;
 +    padding: 10px 15px;
 +    margin: 10px 0;
 +    border-top: 1px solid #f2f2f2;
 +    border-bottom: 1px solid #f2f2f2;
 +    -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
 +            box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1);
 +  }
 +  .navbar-inverse .nav-collapse .navbar-form,
 +  .navbar-inverse .nav-collapse .navbar-search {
 +    border-top-color: #111111;
 +    border-bottom-color: #111111;
 +  }
 +  .navbar .nav-collapse .nav.pull-right {
 +    float: none;
 +    margin-left: 0;
 +  }
 +  .nav-collapse,
 +  .nav-collapse.collapse {
 +    height: 0;
 +    overflow: hidden;
 +  }
 +  .navbar .btn-navbar {
 +    display: block;
 +  }
 +  .navbar-static {
 +    padding-right: 10px;
 +    padding-left: 10px;
 +  }
 +}
 +
 +@media (min-width: 980px) {
 +  .nav-collapse.collapse {
 +    height: auto !important;
 +    overflow: visible !important;
 +  }
 +}

diff --cc docs/assets/css/docs.css
Simple merge

diff --cc docs/base-css.html
index 1070ef2f453127ab5e1b42c70a3e801a800f90fc,4d27a6d69d371350aafbe27f4175e610c787349f..7fe561b97efb5d4c0ce67466f025706e4c8db40d
--- 1/docs/base-css.html
--- 2/docs/base-css.html
+++ b/docs/base-css.html
@@@ -1333,16 -1334,29 +1333,27 @@@ For example, <code><section&gt
  </form>
  </pre>
  
 -          <h3>Control sizing</h3>
 +          <h3 id="forms-extending-sizes">Control sizing</h3>
            <p>Use relative sizing classes like <code>.input-large</code> or match your inputs to the grid column sizes using <code>.span*</code> classes.</p>
  
+           <h4>Block level inputs</h4>
+           <p>Make any <code>&lt;input&gt;</code> or <code>&lt;textarea&gt;</code> element behave like a block level element.</p>
+           <form class="bs-docs-example" style="padding-bottom: 15px;">
+             <div class="controls">
+               <input class="input-block-level" type="text" placeholder=".input-block-level">
+             </div>
+           </form>
+ <pre class="prettyprint linenums">
+ &lt;input class="input-block-level" type="text" placeholder=".input-block-level"&gt;
+ </pre>
+ 
            <h4>Relative sizing</h4>
 +          <p>Create larger or smaller form controls that match button sizes.</p>
            <form class="bs-docs-example" style="padding-bottom: 15px;">
              <div class="controls docs-input-sizes">
 -              <input class="input-mini" type="text" placeholder=".input-mini">
 -              <input class="input-small" type="text" placeholder=".input-small">
 -              <input class="input-medium" type="text" placeholder=".input-medium">
                <input class="input-large" type="text" placeholder=".input-large">
 -              <input class="input-xlarge" type="text" placeholder=".input-xlarge">
 -              <input class="input-xxlarge" type="text" placeholder=".input-xxlarge">
 +              <input class="input-small" type="text" placeholder=".input-small">
 +              <input class="input-mini" type="text" placeholder=".input-mini">
              </div>
            </form>
  <pre class="prettyprint linenums">

diff --cc docs/components.html
Simple merge

diff --cc docs/customize.html
Simple merge

diff --cc docs/extend.html
Simple merge

diff --cc docs/getting-started.html
index c37c037bd660c891e4e444568eac0c323a9333da,6142508440b3f6374a238a6028c655615695924a..cfc61cc7910b1695d4ff6be5d1af07774d9655be
--- 1/docs/getting-started.html
--- 2/docs/getting-started.html
+++ b/docs/getting-started.html
@@@ -238,8 -240,15 +238,15 @@@
              <h1>5. Examples</h1>
            </div>
            <p class="lead">Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.</p>
 -          <ul class="thumbnails bootstrap-examples">
 -            <li class="span3">
 +          <div class="row bootstrap-examples">
++            <div class="span4">
+               <a class="thumbnail" href="examples/starter-template.html">
+                 <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
+               </a>
+               <h4>Starter template</h4>
+               <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
 -            </li>
 -            <li class="span3">
++            </div>
 +            <div class="span4">
                <a class="thumbnail" href="examples/hero.html">
                  <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
                </a>
@@@ -252,16 -261,9 +259,8 @@@
                </a>
                <h4>Fluid layout</h4>
                <p>Uses our new responsive, fluid grid system to create a seamless liquid layout.</p>
 -            </li>
 -
 -            <li class="span3">
 +            </div>
-             <div class="span4">
-               <a class="thumbnail" href="examples/starter-template.html">
-                 <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
-               </a>
-               <h4>Starter template</h4>
-               <p>A barebones HTML document with all the Bootstrap CSS and JavaScript included.</p>
-             </div>
- 
 +            <div class="span4">
                <a class="thumbnail" href="examples/marketing-narrow.html">
                  <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
                </a>
@@@ -281,19 -283,16 +280,15 @@@
                </a>
                <h4>Sticky footer</h4>
                <p>Pin a fixed-height footer to the bottom of the user's viewport.</p>
 -            </li>
 -
 -            <li class="span3">
 +            </div>
- 
- <!--
 +            <div class="span4">
                <a class="thumbnail" href="examples/carousel.html">
                  <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
                </a>
                <h4>Carousel jumbotron</h4>
                <p>A more interactive riff on the basic marketing site featuring a prominent carousel.</p>
 -            </li>
 -          </ul>
 +            </div>
- -->
 +          </div>
- 
          </section>
  
  

diff --cc docs/index.html
Simple merge

diff --cc docs/javascript.html
Simple merge

diff --cc docs/scaffolding.html
Simple merge

diff --cc docs/templates/layout.mustache
Simple merge

diff --cc docs/templates/pages/base-css.mustache
index a539e7e2b3b39cdc20e3be5852147f53fa4e9bee,e0a0280687d0897e3293f8b4e7a24e732f13d318..4b5d0ddb4bbe500f3dda200939ac8b33a2987e8a
--- 1/docs/templates/pages/base-css.mustache
--- 2/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@@ -1272,16 -1271,29 +1272,27 @@@
  </form>
  </pre>
  
 -          <h3>{{_i}}Control sizing{{/i}}</h3>
 +          <h3 id="forms-extending-sizes">{{_i}}Control sizing{{/i}}</h3>
            <p>{{_i}}Use relative sizing classes like <code>.input-large</code> or match your inputs to the grid column sizes using <code>.span*</code> classes.{{/i}}</p>
  
+           <h4>{{_i}}Block level inputs{{/i}}</h4>
+           <p>{{_i}}Make any <code>&lt;input&gt;</code> or <code>&lt;textarea&gt;</code> element behave like a block level element.{{/i}}</p>
+           <form class="bs-docs-example" style="padding-bottom: 15px;">
+             <div class="controls">
+               <input class="input-block-level" type="text" placeholder=".input-block-level">
+             </div>
+           </form>
+ <pre class="prettyprint linenums">
+ &lt;input class="input-block-level" type="text" placeholder=".input-block-level"&gt;
+ </pre>
+ 
            <h4>{{_i}}Relative sizing{{/i}}</h4>
 +          <p>{{_i}}Create larger or smaller form controls that match button sizes.{{/i}}</p>
            <form class="bs-docs-example" style="padding-bottom: 15px;">
              <div class="controls docs-input-sizes">
 -              <input class="input-mini" type="text" placeholder=".input-mini">
 -              <input class="input-small" type="text" placeholder=".input-small">
 -              <input class="input-medium" type="text" placeholder=".input-medium">
                <input class="input-large" type="text" placeholder=".input-large">
 -              <input class="input-xlarge" type="text" placeholder=".input-xlarge">
 -              <input class="input-xxlarge" type="text" placeholder=".input-xxlarge">
 +              <input class="input-small" type="text" placeholder=".input-small">
 +              <input class="input-mini" type="text" placeholder=".input-mini">
              </div>
            </form>
  <pre class="prettyprint linenums">

diff --cc docs/templates/pages/components.mustache
Simple merge

diff --cc docs/templates/pages/getting-started.mustache
index 5086c56321cc5f75baf7d23b0c50628ff5bfa6bd,2eec7ff7699a5fda90984051fdbf483d945d6dba..81dab1c5b3f581e5863cbc3a4679eb12408e1325
--- 1/docs/templates/pages/getting-started.mustache
--- 2/docs/templates/pages/getting-started.mustache
+++ b/docs/templates/pages/getting-started.mustache
@@@ -169,8 -169,15 +169,15 @@@
              <h1>{{_i}}5. Examples{{/i}}</h1>
            </div>
            <p class="lead">{{_i}}Move beyond the base template with a few example layouts. We encourage folks to iterate on these examples and not simply use them as an end result.{{/i}}</p>
 -          <ul class="thumbnails bootstrap-examples">
 -            <li class="span3">
 +          <div class="row bootstrap-examples">
++            <div class="span4">
+               <a class="thumbnail" href="examples/starter-template.html">
+                 <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
+               </a>
+               <h4>{{_i}}Starter template{{/i}}</h4>
+               <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p>
 -            </li>
 -            <li class="span3">
++            </div>
 +            <div class="span4">
                <a class="thumbnail" href="examples/hero.html">
                  <img src="assets/img/examples/bootstrap-example-hero.jpg" alt="">
                </a>
@@@ -183,16 -190,9 +190,8 @@@
                </a>
                <h4>{{_i}}Fluid layout{{/i}}</h4>
                <p>{{_i}}Uses our new responsive, fluid grid system to create a seamless liquid layout.{{/i}}</p>
 -            </li>
 -
 -            <li class="span3">
 +            </div>
-             <div class="span4">
-               <a class="thumbnail" href="examples/starter-template.html">
-                 <img src="assets/img/examples/bootstrap-example-starter.jpg" alt="">
-               </a>
-               <h4>{{_i}}Starter template{{/i}}</h4>
-               <p>{{_i}}A barebones HTML document with all the Bootstrap CSS and JavaScript included.{{/i}}</p>
-             </div>
- 
 +            <div class="span4">
                <a class="thumbnail" href="examples/marketing-narrow.html">
                  <img src="assets/img/examples/bootstrap-example-marketing-narrow.png" alt="">
                </a>
@@@ -212,19 -212,16 +211,15 @@@
                </a>
                <h4>{{_i}}Sticky footer{{/i}}</h4>
                <p>{{_i}}Pin a fixed-height footer to the bottom of the user's viewport.{{/i}}</p>
 -            </li>
 -
 -            <li class="span3">
 +            </div>
- 
- <!--
 +            <div class="span4">
                <a class="thumbnail" href="examples/carousel.html">
                  <img src="assets/img/examples/bootstrap-example-carousel.png" alt="">
                </a>
                <h4>{{_i}}Carousel jumbotron{{/i}}</h4>
                <p>{{_i}}A more interactive riff on the basic marketing site featuring a prominent carousel.{{/i}}</p>
 -            </li>
 -          </ul>
 +            </div>
- -->
 +          </div>
- 
          </section>
  
  

diff --cc docs/templates/pages/index.mustache
Simple merge

diff --cc docs/templates/pages/javascript.mustache
Simple merge

diff --cc less/accordion.less
index 00e5844a68fa456aea04a1b9a23f5a3305738514,d63523bc8c13992d943175fef2036356aa48db77..6b71deefc47dbc33bd30476189e25052b9929f3e
--- 1/less/accordion.less
--- 2/less/accordion.less
+++ b/less/accordion.less
@@@ -12,7 -12,7 +12,7 @@@
  .accordion-group {
    margin-bottom: 2px;
    border: 1px solid #e5e5e5;
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
  }
  .accordion-heading {
    border-bottom: 0;

diff --cc less/alerts.less
index 32a4b23122795a62452331c6cfb68736d59a8945,9abb226d6bc6e0ace3d51818959561f8c5ad5869..977d960b664dac3a6220f07e2d1d552aace83eef
--- 1/less/alerts.less
--- 2/less/alerts.less
+++ b/less/alerts.less
@@@ -12,7 -12,7 +12,7 @@@
    text-shadow: 0 1px 0 rgba(255,255,255,.5);
    background-color: @warningBackground;
    border: 1px solid @warningBorder;
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
    color: @warningText;
  }
  .alert h4 {

diff --cc less/bootstrap.less
Simple merge

diff --cc less/breadcrumbs.less
index ed6e58adcbfa9b136281cb148c45bf04d556d718,76fbe30ffda83bceee536a158476d4ad738c46d3..541bbf50de0893fac929f71a78fbe23f0a476912
--- 1/less/breadcrumbs.less
--- 2/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@@ -8,16 -8,15 +8,16 @@@
    margin: 0 0 @baseLineHeight;
    list-style: none;
    background-color: #f5f5f5;
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
    li {
      display: inline-block;
 -    .ie7-inline-block();
      text-shadow: 0 1px 0 @white;
 -  }
 -  .divider {
 -    padding: 0 5px;
 -    color: #ccc;
 +    &:after {
 +      display: inline-block;
 +      content: "\00a0 /"; // Unicode space added since inline-block means non-collapsing white-space
 +      padding: 0 5px;
 +      color: #ccc;
 +    }
    }
    .active {
      color: @grayLight;

diff --cc less/button-groups.less
Simple merge

diff --cc less/buttons.less
index 9974d840232a4aa42824ae72e58a22f68369f0cd,63f2d86c8ff505a10d470e3a604e16411b898432..85eee44b0e3e4ffabc439a8a39ad8cfca33c54d1
--- 1/less/buttons.less
--- 2/less/buttons.less
+++ b/less/buttons.less
@@@ -18,8 -20,10 +18,8 @@@
    cursor: pointer;
    .buttonBackground(@btnBackground, @btnBackgroundHighlight, @grayDark, 0 1px 1px rgba(255,255,255,.75));
    border: 1px solid @btnBorder;
 -  *border: 0; // Remove the border to prevent IE7's black border on input:focus
    border-bottom-color: darken(@btnBorder, 10%);
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
 -  .ie7-restore-left-whitespace(); // Give IE7 some love
++  border-radius: @baseBorderRadius;
    .box-shadow(~"inset 0 1px 0 rgba(255,255,255,.2), 0 1px 2px rgba(0,0,0,.05)");
  
    // Hover state

diff --cc less/code.less
index b26389b3ecfa3810c548e4625b81fcf08718edb8,5495b15ec956eb7ab3571737602e341523e9546a..2e26e67462f524dcc2546a92920f34c518ffb521
--- 1/less/code.less
--- 2/less/code.less
+++ b/less/code.less
@@@ -33,8 -33,9 +33,9 @@@ pre 
    white-space: pre;
    white-space: pre-wrap;
    background-color: #f5f5f5;
 -  border: 1px solid #ccc; // fallback for IE7-8
 +  border: 1px solid #ccc; // IE8 fallback
    border: 1px solid rgba(0,0,0,.15);
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
  
    // Make prettyprint styles more spaced out for readability
    &.prettyprint {

diff --cc less/dropdowns.less
index bff96a9816d2635154825ac61097f1742abd7e51,730ff6e1904fbd9f89fdbb69927d3df95d6c0fb9..f5a5462c045bde6d2d295830bdd46b8b548a0260
--- 1/less/dropdowns.less
--- 2/less/dropdowns.less
+++ b/less/dropdowns.less
@@@ -46,11 -50,15 +46,11 @@@
    margin: 2px 0 0; // override default ul
    list-style: none;
    background-color: @dropdownBackground;
 -  border: 1px solid #ccc; // Fallback for IE7-8
 +  border: 1px solid #ccc; // IE8 fallback
    border: 1px solid @dropdownBorder;
-   border-radius: 6px;
 -  *border-right-width: 2px;
 -  *border-bottom-width: 2px;
 -  .border-radius(6px);
++  border-radius: @baseBorderRadius;
    .box-shadow(0 5px 10px rgba(0,0,0,.2));
 -  -webkit-background-clip: padding-box;
 -     -moz-background-clip: padding;
 -          background-clip: padding-box;
 +  .background-clip(padding-box);
  
    // Aligns the dropdown menu to right
    &.pull-right {
@@@ -157,9 -168,7 +156,7 @@@
    left: 100%;
    margin-top: -6px;
    margin-left: -1px;
-   -webkit-border-radius: 0 6px 6px 6px;
-      -moz-border-radius: 0 6px 6px 6px;
-           border-radius: 0 6px 6px 6px;
 -  .border-radius(0 6px 6px 6px);
++  border-radius: 0 4px 4px 4px;
  }
  .dropdown-submenu:hover > .dropdown-menu {
    display: block;
@@@ -171,9 -180,7 +168,7 @@@
    bottom: 0;
    margin-top: 0;
    margin-bottom: -2px;
-   -webkit-border-radius: 5px 5px 5px 0;
-      -moz-border-radius: 5px 5px 5px 0;
-           border-radius: 5px 5px 5px 0;
 -  .border-radius(5px 5px 5px 0);
++  border-radius: 4px 4px 4px 0;
  }
  
  // Caret to indicate there is a submenu
@@@ -204,9 -211,7 +199,7 @@@
    > .dropdown-menu {
      left: -100%;
      margin-left: 10px;
-     -webkit-border-radius: 6px 0 6px 6px;
-        -moz-border-radius: 6px 0 6px 6px;
-             border-radius: 6px 0 6px 6px;
 -    .border-radius(6px 0 6px 6px);
++    border-radius: 4px 0 4px 4px;
    }
  }
  
@@@ -222,5 -227,5 +215,4 @@@
  // ---------
  .typeahead {
    margin-top: 2px; // give it some space to breathe
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
  }

diff --cc less/forms.less
index 19ab1158f7031bc79ff80bc26468546aeb7e1007,0f3f425edcfc86faf9060ee618194b4c36db379a..81ddb002e447a8f26abddc47c4cfd680cdbd3011
--- 1/less/forms.less
--- 2/less/forms.less
+++ b/less/forms.less
@@@ -136,9 -135,9 +136,8 @@@ input[type="color"]
  input[type="radio"],
  input[type="checkbox"] {
    margin: 4px 0 0;
 -  *margin-top: 0; /* IE7 */
    margin-top: 1px \9; /* IE8-9 */
    line-height: normal;
-   cursor: pointer;
  }
  
  // Reset width of input images, buttons, radios, checkboxes

diff --cc less/hero-unit.less
index b55b0420a649a172769ed5359a7e1de620b8cc66,763d86aeee5d5c06e3c7ca6ffe835775e6b7bf9a..4b350983e18b54a6c4c1c604697eaa55953e2113
--- 1/less/hero-unit.less
--- 2/less/hero-unit.less
+++ b/less/hero-unit.less
@@@ -6,8 -6,12 +6,12 @@@
  .hero-unit {
    padding: 60px;
    margin-bottom: 30px;
+   font-size: 18px;
+   font-weight: 200;
+   line-height: @baseLineHeight * 1.5;
+   color: @heroUnitLeadColor;
    background-color: @heroUnitBackground;
 -  .border-radius(6px);
 +  border-radius: 6px;
    h1 {
      margin-bottom: 0;
      font-size: 60px;

diff --cc less/modals.less
index 6745d831d7a6c1297404d850ba2efa559f3a201e,fbc48590883fa51cd24d6aa78353b8d8ccd1018f..99fe2d45f666f77660e3cf8c031204f4cabfd62b
--- 1/less/modals.less
--- 2/less/modals.less
+++ b/less/modals.less
@@@ -31,9 -31,13 +31,12 @@@
    background-color: @white;
    border: 1px solid #999;
    border: 1px solid rgba(0,0,0,.3);
 -  *border: 1px solid #999; /* IE6-7 */
 -  .border-radius(6px);
 +  border-radius: 6px;
    .box-shadow(0 3px 7px rgba(0,0,0,0.3));
    .background-clip(padding-box);
+   // Remove focus outline from opened modal
+   outline: none;
+ 
    &.fade {
      .transition(e('opacity .3s linear, top .3s ease-out'));
      top: -25%;

diff --cc less/navbar.less
index 6ba70cdbcfc6aa9dcfc15ab2fa00d06e96bbf996,f69e048994682e68ddcc679849c5d57d8ab862c4..3bfc8ae6eb931fd170cefe2c9c029b2876d986d0
--- 1/less/navbar.less
--- 2/less/navbar.less
+++ b/less/navbar.less
@@@ -9,12 -9,23 +9,12 @@@
  // Base class and wrapper
  .navbar {
    overflow: visible;
 +  padding: 0 20px;
    margin-bottom: @baseLineHeight;
    color: @navbarText;
 -
 -  // Fix for IE7's bad z-indexing so dropdowns don't appear below content that follows the navbar
 -  *position: relative;
 -  *z-index: 2;
 -}
 -
 -// Inner for background effects
 -// Gradient is applied to its own element because overflow visible is not honored by IE when filter is present
 -.navbar-inner {
 -  min-height: @navbarHeight;
 -  padding-left:  20px;
 -  padding-right: 20px;
    #gradient > .vertical(@navbarBackgroundHighlight, @navbarBackground);
    border: 1px solid @navbarBorder;
-   border-radius: 6px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
    .box-shadow(0 1px 4px rgba(0,0,0,.065));
  
    // Prevent floats from breaking the navbar

diff --cc less/progress-bars.less
index f7305113e45bc4d2a3de8faf5b5387f16466ed52,5e0c3dda0180068e3435f0461f75141bf8a69806..584ef96bb1311064f665591af4dee0432638eade
--- 1/less/progress-bars.less
--- 2/less/progress-bars.less
+++ b/less/progress-bars.less
@@@ -48,7 -48,7 +48,7 @@@
    margin-bottom: @baseLineHeight;
    #gradient > .vertical(#f5f5f5, #f9f9f9);
    .box-shadow(inset 0 1px 2px rgba(0,0,0,.1));
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
  }
  
  // Bar of progress

diff --cc less/reset.less
Simple merge

diff --cc less/responsive-navbar.less
index bbfe52c9771bdd5f920ef6df55ac5a946a38ed54,2a0b0c057f50020d7f33d0ed0835e1581beb01ec..190ebb858e302fe4e099bfe71befd9743d78ca3d
--- 1/less/responsive-navbar.less
--- 2/less/responsive-navbar.less
+++ b/less/responsive-navbar.less
@@@ -75,7 -75,7 +75,7 @@@
    .nav-collapse .btn {
      padding: 4px 10px 4px;
      font-weight: normal;
-     border-radius: 4px;
 -    .border-radius(@baseBorderRadius);
++    border-radius: @baseBorderRadius;
    }
    .nav-collapse .dropdown-menu li + li a {
      margin-bottom: 2px;
@@@ -105,9 -109,13 +109,13 @@@
      padding: 0;
      background-color: transparent;
      border: none;
 -    .border-radius(0);
 +    border-radius: 0;
      .box-shadow(none);
    }
 -  .nav-collapse .open > .dropdown-menu { 
 -    display: block; 
++  .nav-collapse .open > .dropdown-menu {
++    display: block;
+   }
+ 
    .nav-collapse .dropdown-menu:before,
    .nav-collapse .dropdown-menu:after {
      display: none;

diff --cc less/tables.less
index 911ef67afb690d1aaaca1e2e386915ada86a35ce,fc8750f97c599fc57487558369e56c06bc210ec5..44c3909b7f26c5a414f09aae82f1a1f583cf613f
--- 1/less/tables.less
--- 2/less/tables.less
+++ b/less/tables.less
@@@ -69,8 -69,9 +69,8 @@@ table 
  .table-bordered {
    border: 1px solid @tableBorder;
    border-collapse: separate; // Done so we can round those corners!
 -  *border-collapse: collapse; // IE7 can't round corners anyway
    border-left: 0;
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
    th,
    td {
      border-left: 1px solid @tableBorder;

diff --cc less/thumbnails.less
index c9b2b09da5493d6c8bd57962d9008d542827fa15,a84a7d37d921fe7d773a1d0d18b33d3c536d237b..d2a23c7f3198bbf21d64b4e24cf2f851dd5713d2
--- 1/less/thumbnails.less
--- 2/less/thumbnails.less
+++ b/less/thumbnails.less
@@@ -9,7 -29,7 +9,7 @@@
    padding: 4px;
    line-height: @baseLineHeight;
    border: 1px solid #ddd;
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
    .box-shadow(0 1px 3px rgba(0,0,0,.055));
    .transition(all .2s ease-in-out);
  }

diff --cc less/tooltip.less
index 821325fac95b5300a56ffaaeca0ec5d8faccef6e,93fac8d6b2ebe7d62279d93a416ace9d00a565ef..0d8eb4f1c026a9f713e59b26fd6f485cfbafe519
--- 1/less/tooltip.less
--- 2/less/tooltip.less
+++ b/less/tooltip.less
@@@ -27,7 -27,7 +27,7 @@@
    text-align: center;
    text-decoration: none;
    background-color: @tooltipBackground;
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
  }
  
  // Arrows

diff --cc less/type.less
Simple merge

diff --cc less/variables.less
Simple merge

diff --cc less/wells.less
index dc80db21a33011c6be5faeffd607d97a7e88d7b6,84a744b1c5c8fdaa26e39ca3283d699ad1cbc5df..33cd07a9854f636aca09e4eeea3143539c82117b
--- 1/less/wells.less
--- 2/less/wells.less
+++ b/less/wells.less
@@@ -10,7 -10,7 +10,7 @@@
    margin-bottom: 20px;
    background-color: @wellBackground;
    border: 1px solid darken(@wellBackground, 7%);
-   border-radius: 4px;
 -  .border-radius(@baseBorderRadius);
++  border-radius: @baseBorderRadius;
    .box-shadow(inset 0 1px 1px rgba(0,0,0,.05));
    blockquote {
      border-color: #ddd;
@@@ -21,9 -21,9 +21,9 @@@
  // Sizes
  .well-large {
    padding: 24px;
-   border-radius: 6px;
 -  .border-radius(@borderRadiusLarge);
++  border-radius: @borderRadiusLarge;
  }
  .well-small {
    padding: 9px;
-   border-radius: 3px;
 -  .border-radius(@borderRadiusSmall);
++  border-radius: @borderRadiusSmall;
  }