Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip

Conflicts:
	Makefile
	README.md
	bootstrap.css
	bootstrap.min.css
	lib/bootstrap.less
	lib/scaffolding.less

diff --cc Makefile
index ca99eaa185bede24f23ffcb1ca56942c54fe479f,b9bd7aeb435aeadabed923cf5f5e676d4bc295bd..b3dce89ac40fc7764a632ccf5f7f96ce5e39a0b1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,6 -1,7 +1,7 @@@
+ VERSION=1.2.0
  DATE=$(shell DATE)
 -BOOTSTRAP = ./bootstrap-${VERSION}.css
 -BOOTSTRAP_MIN = ./bootstrap-${VERSION}.min.css
 +BOOTSTRAP = ./bootstrap.css
 +BOOTSTRAP_MIN = ./bootstrap.min.css
  BOOTSTRAP_LESS = ./lib/bootstrap.less
  LESS_COMPESSOR ?= `which lessc`
  WATCHR ?= `which watchr`

diff --cc README.md
index 98953a7ad9d896686159a3d4109619e3880f365e,734e317454613ac1a923731832dccb897c5acd34..a3fd9876a144b6a2f438e8493f9b1a8ab5d42e34
--- 1/README.md
--- 2/README.md
+++ b/README.md
@@@ -18,7 -20,9 +20,9 @@@ Here's what the LESS version looks like
  
  Or if you prefer, the standard css way:
  
 -<link rel="stylesheet" type="text/css" href="bootstrap-1.2.0.css">
+ ``` html
 +    <link rel="stylesheet" type="text/css" href="bootstrap.css">
+ ```
  
  For more info, refer to the docs!
  

diff --cc bootstrap.css
index 94dbb099be31df4f804ee3a34a72af51bd9097a1,f828b2f3cc0fe05bbbc90bf8b40b00c24cbba072..a1cde80ec068fb1311156b7e578ee126a919fe4e
--- 1/bootstrap.css
--- 2/bootstrap-1.2.0.css
+++ b/bootstrap.css
@@@ -6,7 -6,7 +6,11 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
++<<<<<<< HEAD:bootstrap.css
 + * Date: Fri Sep 16 10:51:22 PDT 2011
++=======
+  * Date: Mon Sep 12 09:25:40 PDT 2011
++>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
   */
  /* Reset.less
   * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here     that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).
@@@ -266,131 -277,152 +270,183 @@@ a:hover 
  .row:after {
    clear: both;
  }
++<<<<<<< HEAD:bootstrap.css
 +[class*="span"] {
++=======
+ .row [class*="span"] {
++>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
    display: inline;
    float: left;
    margin-left: 20px;
  }
 -.row .span1 {
 +.span1 {
    width: 40px;
  }
 -.row .span2 {
 +.span2 {
    width: 100px;
  }
 -.row .span3 {
 +.span3 {
    width: 160px;
  }
 -.row .span4 {
 +.span4 {
    width: 220px;
  }
 -.row .span5 {
 +.span5 {
    width: 280px;
  }
 -.row .span6 {
 +.span6 {
    width: 340px;
  }
 -.row .span7 {
 +.span7 {
    width: 400px;
  }
 -.row .span8 {
 +.span8 {
    width: 460px;
  }
 -.row .span9 {
 +.span9 {
    width: 520px;
  }
 -.row .span10 {
 +.span10 {
    width: 580px;
  }
 -.row .span11 {
 +.span11 {
    width: 640px;
  }
 -.row .span12 {
 +.span12 {
    width: 700px;
  }
 -.row .span13 {
 +.span13 {
    width: 760px;
  }
 -.row .span14 {
 +.span14 {
    width: 820px;
  }
 -.row .span15 {
 +.span15 {
    width: 880px;
  }
 -.row .span16 {
 +.span16 {
    width: 940px;
  }
 -.row .offset1 {
 +.span17 {
 +  width: 1000px;
 +}
 +.span18 {
 +  width: 1060px;
 +}
 +.span19 {
 +  width: 1120px;
 +}
 +.span20 {
 +  width: 1180px;
 +}
 +.span21 {
 +  width: 1240px;
 +}
 +.span22 {
 +  width: 1300px;
 +}
 +.span23 {
 +  width: 1360px;
 +}
 +.span24 {
 +  width: 1420px;
 +}
 +.offset1 {
    margin-left: 80px;
  }
 -.row .offset2 {
 +.offset2 {
    margin-left: 140px;
  }
 -.row .offset3 {
 +.offset3 {
    margin-left: 200px;
  }
 -.row .offset4 {
 +.offset4 {
    margin-left: 260px;
  }
 -.row .offset5 {
 +.offset5 {
    margin-left: 320px;
  }
 -.row .offset6 {
 +.offset6 {
    margin-left: 380px;
  }
 -.row .offset7 {
 +.offset7 {
    margin-left: 440px;
  }
 -.row .offset8 {
 +.offset8 {
    margin-left: 500px;
  }
 -.row .offset9 {
 +.offset9 {
    margin-left: 560px;
  }
 -.row .offset10 {
 +.offset10 {
    margin-left: 620px;
  }
 -.row .offset11 {
 +.offset11 {
    margin-left: 680px;
  }
 -.row .offset12 {
 +.offset12 {
    margin-left: 740px;
  }
 -.row .span-one-third {
 +.span-one-third {
    width: 300px;
  }
 -.row .span-two-thirds {
 +.span-two-thirds {
    width: 620px;
  }
 -.row .offset-one-third {
 +.offset-one-third {
    margin-left: 340px;
  }
 -.row .offset-two-thirds {
 +.offset-two-thirds {
    margin-left: 660px;
  }
++<<<<<<< HEAD:bootstrap.css
++=======
+ html, body {
+   background-color: #fff;
+ }
+ body {
+   margin: 0;
+   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+   font-size: 13px;
+   font-weight: normal;
+   line-height: 18px;
+   color: #808080;
+ }
+ .container {
+   width: 940px;
+   margin: 0 auto;
+ }
+ .container-fluid {
+   padding: 0 20px;
+   zoom: 1;
+ }
+ .container-fluid:before, .container-fluid:after {
+   display: table;
+   content: "";
+ }
+ .container-fluid:after {
+   clear: both;
+ }
+ .container-fluid > .sidebar {
+   float: left;
+   width: 220px;
+ }
+ .container-fluid > .content {
+   min-width: 700px;
+   max-width: 1180px;
+   margin-left: 240px;
+ }
+ a {
+   color: #0069d6;
+   text-decoration: none;
+   line-height: inherit;
+   font-weight: inherit;
+ }
+ a:hover {
+   color: #0050a3;
+   text-decoration: underline;
+ }
++>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.css
  /* Typography.less
   * Headings, body text, lists, code, and more for a versatile and durable typography system
   * ---------------------------------------------------------------------------------------- */

diff --cc bootstrap.min.css
index e9ddd96fc3ae8e6bb06a3a323e11c5fea9c36e57,cbecfe32e7758802641005d4c8a3715adbd4251f..8deaea967760f1b59299eab23675625bdd869f05
--- 1/bootstrap.min.css
--- 2/bootstrap-1.2.0.min.css
+++ b/bootstrap.min.css
@@@ -20,62 -19,58 +20,113 @@@ button,input[type="button"],input[type=
  input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
  input[type="search"]::-webkit-search-decoration{-webkit-appearance:none;}
  textarea{overflow:auto;vertical-align:top;}
++<<<<<<< HEAD:bootstrap.min.css
 +html,body{background-color:#ffffff;}
 +body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#404040;}
 +.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;}.container:before,.container:after{display:table;content:"";zoom:1;*display:inline;}
 +.container:after{clear:both;}
 +.container-fluid{position:relative;padding-left:20px;padding-right:20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";zoom:1;*display:inline;}
++=======
+ .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+ .clearfix:after{clear:both;}
+ .center-block{display:block;margin:0 auto;}
+ .container{width:940px;margin:0 auto;zoom:1;}.container:before,.container:after{display:table;content:"";}
+ .container:after{clear:both;}
+ .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;}
+ .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+ .btn.success,.alert-message.success{background-color:#57a957;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#62c462), to(#57a957));background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #62c462), color-stop(100%, #57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#57a957 #57a957 #3d773d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+ .btn.info,.alert-message.info{background-color:#339bb9;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#5bc0de), to(#339bb9));background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #5bc0de), color-stop(100%, #339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#339bb9 #339bb9 #22697d;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);}
+ .row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";}
+ .row:after{clear:both;}
+ .row [class*="span"]{display:inline;float:left;margin-left:20px;}
+ .row .span1{width:40px;}
+ .row .span2{width:100px;}
+ .row .span3{width:160px;}
+ .row .span4{width:220px;}
+ .row .span5{width:280px;}
+ .row .span6{width:340px;}
+ .row .span7{width:400px;}
+ .row .span8{width:460px;}
+ .row .span9{width:520px;}
+ .row .span10{width:580px;}
+ .row .span11{width:640px;}
+ .row .span12{width:700px;}
+ .row .span13{width:760px;}
+ .row .span14{width:820px;}
+ .row .span15{width:880px;}
+ .row .span16{width:940px;}
+ .row .offset1{margin-left:80px;}
+ .row .offset2{margin-left:140px;}
+ .row .offset3{margin-left:200px;}
+ .row .offset4{margin-left:260px;}
+ .row .offset5{margin-left:320px;}
+ .row .offset6{margin-left:380px;}
+ .row .offset7{margin-left:440px;}
+ .row .offset8{margin-left:500px;}
+ .row .offset9{margin-left:560px;}
+ .row .offset10{margin-left:620px;}
+ .row .offset11{margin-left:680px;}
+ .row .offset12{margin-left:740px;}
+ .row .span-one-third{width:300px;}
+ .row .span-two-thirds{width:620px;}
+ .row .offset-one-third{margin-left:340px;}
+ .row .offset-two-thirds{margin-left:660px;}
+ html,body{background-color:#fff;}
+ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;color:#808080;}
+ .container{width:940px;margin:0 auto;}
+ .container-fluid{padding:0 20px;zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
++>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
  .container-fluid:after{clear:both;}
  .container-fluid>.sidebar{float:left;width:220px;}
 -.container-fluid>.content{min-width:700px;max-width:1180px;margin-left:240px;}
 -a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#0050a3;text-decoration:underline;}
 +.container-fluid>.content{float:left;min-width:700px;max-width:1180px;margin-left:20px;}
 +.hide{display:none;}
 +.show{display:block;}
 +a{color:#0069d6;text-decoration:none;line-height:inherit;font-weight:inherit;}a:hover{color:#00438a;text-decoration:underline;}
 +.pull-right{float:right;}
 +.pull-left{float:left;}
 +.row{zoom:1;margin-left:-20px;}.row:before,.row:after{display:table;content:"";zoom:1;*display:inline;}
 +.row:after{clear:both;}
 +[class*="span"]{display:inline;float:left;margin-left:20px;}
 +.span1{width:40px;}
 +.span2{width:100px;}
 +.span3{width:160px;}
 +.span4{width:220px;}
 +.span5{width:280px;}
 +.span6{width:340px;}
 +.span7{width:400px;}
 +.span8{width:460px;}
 +.span9{width:520px;}
 +.span10{width:580px;}
 +.span11{width:640px;}
 +.span12{width:700px;}
 +.span13{width:760px;}
 +.span14{width:820px;}
 +.span15{width:880px;}
 +.span16{width:940px;}
 +.span17{width:1000px;}
 +.span18{width:1060px;}
 +.span19{width:1120px;}
 +.span20{width:1180px;}
 +.span21{width:1240px;}
 +.span22{width:1300px;}
 +.span23{width:1360px;}
 +.span24{width:1420px;}
 +.offset1{margin-left:80px;}
 +.offset2{margin-left:140px;}
 +.offset3{margin-left:200px;}
 +.offset4{margin-left:260px;}
 +.offset5{margin-left:320px;}
 +.offset6{margin-left:380px;}
 +.offset7{margin-left:440px;}
 +.offset8{margin-left:500px;}
 +.offset9{margin-left:560px;}
 +.offset10{margin-left:620px;}
 +.offset11{margin-left:680px;}
 +.offset12{margin-left:740px;}
 +.span-one-third{width:300px;}
 +.span-two-thirds{width:620px;}
 +.offset-one-third{margin-left:340px;}
 +.offset-two-thirds{margin-left:660px;}
  p{font-size:13px;font-weight:normal;line-height:18px;margin-bottom:9px;}p small{font-size:11px;color:#bfbfbf;}
  h1,h2,h3,h4,h5,h6{font-weight:bold;color:#404040;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#bfbfbf;}
  h1{margin-bottom:18px;font-size:30px;line-height:36px;}h1 small{font-size:18px;}
@@@ -103,14 -98,13 +154,19 @@@ blockquote small{display:block;font-siz
  address{display:block;line-height:18px;margin-bottom:18px;}
  code,pre{padding:0 3px 2px;font-family:Monaco, Andale Mono, Courier New, monospace;font-size:12px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
  code{background-color:#fee9cc;color:rgba(0, 0, 0, 0.75);padding:1px 3px;}
 -pre{background-color:#f5f5f5;display:block;padding:17px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
 +pre{background-color:#f5f5f5;display:block;padding:8.5px;margin:0 0 18px;line-height:18px;font-size:12px;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;white-space:pre;white-space:pre-wrap;word-wrap:break-word;}
  form{margin-bottom:18px;}
++<<<<<<< HEAD:bootstrap.min.css
 +fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;padding-left:150px;font-size:19.5px;line-height:1;color:#404040;*padding:0 0 5px 145px;*line-height:1.5;}
 +form .clearfix{margin-bottom:18px;zoom:1;}form .clearfix:before,form .clearfix:after{display:table;content:"";zoom:1;*display:inline;}
 +form .clearfix:after{clear:both;}
++=======
+ fieldset{margin-bottom:18px;padding-top:18px;}fieldset legend{display:block;margin-left:150px;font-size:20px;line-height:1;*margin:0 0 5px 145px;*line-height:1.5;color:#404040;}
+ form .clearfix{margin-bottom:18px;}
++>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
  label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:normal;}
  label{padding-top:6px;font-size:13px;line-height:18px;float:left;width:130px;text-align:right;color:#404040;}
 -div.input{margin-left:150px;}
 +form .input{margin-left:150px;}
  input[type=checkbox],input[type=radio]{cursor:pointer;}
  input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;font-size:13px;line-height:18px;color:#808080;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
  input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;}
@@@ -231,30 -194,23 +287,34 @@@ table .headerSortUp.purple,table .heade
  .topbar div>ul .menu-dropdown .divider,.nav .menu-dropdown .divider,.topbar div>ul .dropdown-menu .divider,.nav .dropdown-menu .divider{background-color:#222;border-color:#444;}
  .topbar ul .menu-dropdown li a,.topbar ul .dropdown-menu li a{padding:4px 15px;}
  li.menu,.dropdown{position:relative;}
 -a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"&darr;";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #fff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
 -.menu-dropdown,.dropdown-menu{background-color:#fff;float:left;display:none;position:absolute;top:40px;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.menu-dropdown li,.dropdown-menu li{float:none;display:block;background-color:none;}
 -.menu-dropdown .divider,.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #fff;}
 -.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #fff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);}
 -.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#fff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
 +a.menu:after,.dropdown-toggle:after{width:0;height:0;display:inline-block;content:"&darr;";text-indent:-99999px;vertical-align:top;margin-top:8px;margin-left:4px;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=50);-khtml-opacity:0.5;-moz-opacity:0.5;opacity:0.5;}
 +.menu-dropdown,.dropdown-menu{background-color:#ffffff;float:left;display:none;position:absolute;top:40px;z-index:900;min-width:160px;max-width:220px;_width:160px;margin-left:0;margin-right:0;padding:6px 0;zoom:1;border-color:#999;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:0 1px 1px;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);box-shadow:0 2px 4px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.menu-dropdown li,.dropdown-menu li{float:none;display:block;background-color:none;}
 +.menu-dropdown .divider,.dropdown-menu .divider{height:1px;margin:5px 0;overflow:hidden;background-color:#eee;border-bottom:1px solid #ffffff;}
 +.topbar .dropdown-menu a,.dropdown-menu a{display:block;padding:4px 15px;clear:both;font-weight:normal;line-height:18px;color:#808080;text-shadow:0 1px 0 #ffffff;}.topbar .dropdown-menu a:hover,.dropdown-menu a:hover{background-color:#dddddd;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#eeeeee), to(#dddddd));background-image:-moz-linear-gradient(top, #eeeeee, #dddddd);background-image:-ms-linear-gradient(top, #eeeeee, #dddddd);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #dddddd));background-image:-webkit-linear-gradient(top, #eeeeee, #dddddd);background-image:-o-linear-gradient(top, #eeeeee, #dddddd);background-image:linear-gradient(top, #eeeeee, #dddddd);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#dddddd', GradientType=0);color:#404040;text-decoration:none;-webkit-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 0 rgba(0, 0, 0, 0.025),inset 0 -1px rgba(0, 0, 0, 0.025);}
 +.open .menu,.dropdown.open .menu,.open .dropdown-toggle,.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
  .open .menu-dropdown,.dropdown.open .menu-dropdown,.open .dropdown-menu,.dropdown.open .dropdown-menu{display:block;}
++<<<<<<< HEAD:bootstrap.min.css
 +.tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";zoom:1;*display:inline;}
++=======
+ .tabs,.pills{margin:0 0 20px;padding:0;list-style:none;zoom:1;}.tabs:before,.pills:before,.tabs:after,.pills:after{display:table;content:"";}
++>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
  .tabs:after,.pills:after{clear:both;}
  .tabs>li,.pills>li{float:left;}.tabs>li>a,.pills>li>a{display:block;}
 -.tabs{width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{margin-right:2px;padding:0 15px;line-height:35px;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{background-color:#eee;border-bottom:1px solid #ddd;text-decoration:none;}
 -.tabs>li.active>a{background-color:#fff;padding:0 14px;border:1px solid #ddd;border-bottom:0;color:#808080;}
 +.tabs{float:left;width:100%;border-bottom:1px solid #ddd;}.tabs>li{position:relative;top:1px;}.tabs>li>a{padding:0 15px;margin-right:2px;line-height:36px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.tabs>li>a:hover{text-decoration:none;background-color:#eee;border-color:#eee #eee #ddd;}
 +.tabs>li.active>a{color:#808080;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;}
  .tabs .menu-dropdown,.tabs .dropdown-menu{top:35px;border-width:1px;-webkit-border-radius:0 6px 6px 6px;-moz-border-radius:0 6px 6px 6px;border-radius:0 6px 6px 6px;}
  .tabs a.menu:after,.tabs .dropdown-toggle:after{border-top-color:#999;margin-top:15px;margin-left:5px;}
 +.tabs li.open.menu .menu,.tabs .open.dropdown .dropdown-toggle{border-color:#999;}
  .tabs li.open a.menu:after,.tabs .dropdown.open .dropdown-toggle:after{border-top-color:#555;}
 -.pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #fff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#0050a3;color:#fff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
 -.pills .active a{background:#0069d6;color:#fff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
 -.hero-unit{background-color:#f5f5f5;margin-top:60px;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
 +.tab-content{clear:both;}
 +.pills a{margin:5px 3px 5px 0;padding:0 15px;text-shadow:0 1px 1px #ffffff;line-height:30px;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}.pills a:hover{background:#00438a;color:#ffffff;text-decoration:none;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
 +.pills .active a{background:#0069d6;color:#ffffff;text-shadow:0 1px 1px rgba(0, 0, 0, 0.25);}
 +.tab-content>*,.pill-content>*{display:none;}
 +.tab-content>.active,.pill-content>.active{display:block;}
 +.breadcrumb{margin:0 0 18px;padding:7px 14px;background-color:#f5f5f5;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ffffff), to(#f5f5f5));background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline;text-shadow:0 1px 0 #ffffff;}
 +.breadcrumb .divider{padding:0 5px;color:#bfbfbf;}
 +.breadcrumb .active a{color:#404040;}
 +.hero-unit{background-color:#f5f5f5;margin-bottom:30px;padding:60px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;}
  .hero-unit p{font-size:18px;font-weight:200;line-height:27px;}
  footer{margin-top:17px;padding-top:17px;border-top:1px solid #eee;}
  .page-header{margin-bottom:17px;border-bottom:1px solid #ddd;-webkit-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);-moz-box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);box-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}.page-header h1{margin-bottom:8px;}
@@@ -292,19 -240,15 +352,28 @@@ button.btn::-moz-focus-inner,input[type
  .pagination a:hover,.pagination .active a{background-color:#c7eefe;}
  .pagination .disabled a,.pagination .disabled a:hover{background-color:transparent;color:#bfbfbf;}
  .pagination .next a{border:0;}
++<<<<<<< HEAD:bootstrap.min.css
 +.well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
 +.modal-backdrop{background-color:#000000;position:fixed;top:0;left:0;right:0;bottom:0;z-index:10000;}.modal-backdrop.fade{opacity:0;}
 +.modal-backdrop,.modal-backdrop.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
 +.modal{position:fixed;top:50%;left:50%;z-index:11000;width:560px;margin:-250px 0 0 -250px;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;-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;background-clip:padding-box;}.modal .close{margin-top:7px;}
 +.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
 +.modal.fade.in{top:50%;}
 +.modal-header{border-bottom:1px solid #eee;padding:5px 15px;}
 +.modal-body{padding:15px;}
 +.modal-footer{background-color:#f5f5f5;padding:14px 15px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";zoom:1;*display:inline;}
++=======
+ .well{background-color:#f5f5f5;margin-bottom:20px;padding:19px;min-height:20px;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}
+ .modal-backdrop{background-color:rgba(0, 0, 0, 0.5);position:fixed;top:0;left:0;right:0;bottom:0;z-index:1000;}
+ .modal{position:fixed;top:50%;left:50%;z-index:2000;width:560px;margin:-280px 0 0 -250px;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;-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;background-clip:padding-box;}
+ .modal-header{border-bottom:1px solid #eee;padding:5px 20px;}.modal-header .close{position:absolute;right:10px;top:10px;color:#999;line-height:10px;font-size:18px;}
+ .modal-body{padding:20px;}
+ .modal-footer{background-color:#f5f5f5;padding:14px 20px 15px;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;zoom:1;margin-bottom:0;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
++>>>>>>> 427a001c476569684027567e5a7cec89058185ad:bootstrap-1.2.0.min.css
  .modal-footer:after{clear:both;}
 -.modal-footer .btn{float:right;margin-left:10px;}
 -.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
 +.modal-footer .btn{float:right;margin-left:5px;}
 +.twipsy{display:block;position:absolute;visibility:visible;padding:5px;font-size:11px;z-index:1000;filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}.twipsy.fade.in{filter:alpha(opacity=80);-khtml-opacity:0.8;-moz-opacity:0.8;opacity:0.8;}
 +.twipsy.above .twipsy-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
  .twipsy.left .twipsy-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
  .twipsy.below .twipsy-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
  .twipsy.right .twipsy-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}

diff --cc lib/bootstrap.less
Simple merge

diff --cc lib/scaffolding.less
index 13cc4f2b1f641f0f91d7c06c938511df93cb9804,c07686ab3beebba280d05a0133e51ab9854c960c..aede36e53fb7e2fb64e07bfc661b3680d829ea80
--- 1/lib/scaffolding.less
--- 2/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@@ -63,75 -108,3 +63,75 @@@ a 
      text-decoration: underline;
    }
  }
- .offset-two-thirds  { margin-left: 660px; }
 +
 +// Quick floats
 +.pull-right {
 +  float: right;
 +}
 +.pull-left {
 +  float: left;
 +}
 +
 +
 +// GRID SYSTEM
 +// -----------
 +// To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
 +
 +.row {
 +  .clearfix();
 +  margin-left: -1 * @gridGutterWidth;
 +}
 +
 +// Find all .span# classes within .row and give them the necessary properties for grid columns (supported by all browsers back to IE7)
 +// Credit to @dhg for the idea
 +[class*="span"] {
 +  .gridColumn();
 +}
 +
 +// Default columns
 +.span1     { .columns(1); }
 +.span2     { .columns(2); }
 +.span3     { .columns(3); }
 +.span4     { .columns(4); }
 +.span5     { .columns(5); }
 +.span6     { .columns(6); }
 +.span7     { .columns(7); }
 +.span8     { .columns(8); }
 +.span9     { .columns(9); }
 +.span10    { .columns(10); }
 +.span11    { .columns(11); }
 +.span12    { .columns(12); }
 +.span13    { .columns(13); }
 +.span14    { .columns(14); }
 +.span15    { .columns(15); }
 +.span16    { .columns(16); }
 +
 +// For optional 24-column grid
 +.span17    { .columns(17); }
 +.span18    { .columns(18); }
 +.span19    { .columns(19); }
 +.span20    { .columns(20); }
 +.span21    { .columns(21); }
 +.span22    { .columns(22); }
 +.span23    { .columns(23); }
 +.span24    { .columns(24); }
 +
 +// Offset column options
 +.offset1   { .offset(1); }
 +.offset2   { .offset(2); }
 +.offset3   { .offset(3); }
 +.offset4   { .offset(4); }
 +.offset5   { .offset(5); }
 +.offset6   { .offset(6); }
 +.offset7   { .offset(7); }
 +.offset8   { .offset(8); }
 +.offset9   { .offset(9); }
 +.offset10  { .offset(10); }
 +.offset11  { .offset(11); }
 +.offset12  { .offset(12); }
 +
 +// Unique column sizes for 16-column grid
 +.span-one-third     { width: 300px; }
 +.span-two-thirds    { width: 620px; }
 +.offset-one-third   { margin-left: 340px; }
++.offset-two-thirds  { margin-left: 660px; }