Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip

Conflicts:
	bootstrap.css
	docs/base-css.html
	docs/components.html
	docs/index.html
	docs/javascript.html
	docs/less.html
	docs/scaffolding.html

17 files changed, 381 insertions, 243 deletions

diff --git a/bootstrap.css b/bootstrap.css
index b911730eb..2908ac296 100644
--- a/bootstrap.css
+++ b/bootstrap.css
@@ -6,95 +6,12 @@
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Designed and built with all the love in the world @twitter by @mdo and @fat.
+<<<<<<< HEAD
  * Date: Mon Jan 23 14:12:25 PST 2012
+=======
+ * Date: Mon Jan 23 13:48:03 PST 2012
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
  */
-html, body {
-  margin: 0;
-  padding: 0;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-p,
-blockquote,
-pre,
-a,
-abbr,
-acronym,
-address,
-cite,
-code,
-del,
-dfn,
-em,
-img,
-q,
-s,
-samp,
-small,
-strike,
-strong,
-sub,
-sup,
-tt,
-var,
-dd,
-dl,
-dt,
-li,
-ol,
-ul,
-fieldset,
-form,
-label,
-legend,
-button,
-table,
-caption,
-tbody,
-tfoot,
-thead,
-tr,
-th,
-td {
-  margin: 0;
-  padding: 0;
-  border: 0;
-  font-weight: normal;
-  font-style: normal;
-  font-size: 100%;
-  line-height: 1;
-  font-family: inherit;
-}
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol, ul {
-  list-style: none;
-}
-q:before,
-q:after,
-blockquote:before,
-blockquote:after {
-  content: "";
-}
-html {
-  overflow-y: scroll;
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-a:focus {
-  outline: thin dotted;
-}
-a:hover, a:active {
-  outline: 0;
-}
 article,
 aside,
 details,
@@ -115,6 +32,17 @@ audio, canvas, video {
 audio:not([controls]) {
   display: none;
 }
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+  -ms-text-size-adjust: 100%;
+}
+a:focus {
+  outline: thin dotted;
+}
+a:hover, a:active {
+  outline: 0;
+}
 sub, sup {
   position: relative;
   font-size: 75%;
@@ -228,8 +156,6 @@ body {
   width: 100%;
 }
 a {
-  font-weight: inherit;
-  line-height: inherit;
   color: #0088cc;
   text-decoration: none;
 }
@@ -238,6 +164,7 @@ a:hover {
   text-decoration: underline;
 }
 .row {
+  margin-left: -20px;
   *zoom: 1;
 }
 .row:before, .row:after {
@@ -247,9 +174,6 @@ a:hover {
 .row:after {
   clear: both;
 }
-[class*="span"]:first-child {
-  margin-left: 0;
-}
 [class*="span"] {
   float: left;
   margin-left: 20px;
@@ -324,7 +248,7 @@ a:hover {
   margin-left: 900px;
 }
 p {
-  margin-bottom: 9px;
+  margin: 0 0 9px;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-size: 13px;
   line-height: 18px;
@@ -339,6 +263,7 @@ h3,
 h4,
 h5,
 h6 {
+  margin: 0;
   font-weight: bold;
   color: #333333;
   text-rendering: optimizelegibility;
@@ -349,6 +274,7 @@ h3 small,
 h4 small,
 h5 small,
 h6 small {
+  font-weight: normal;
   color: #999999;
 }
 h1 {
@@ -390,6 +316,7 @@ h6 {
   text-transform: uppercase;
 }
 ul, ol {
+  padding: 0;
   margin: 0 0 9px 25px;
 }
 ul ul,
@@ -430,13 +357,10 @@ hr {
   border-bottom: 1px solid #ffffff;
 }
 strong {
-  font-style: inherit;
   font-weight: bold;
 }
 em {
   font-style: italic;
-  font-weight: inherit;
-  line-height: inherit;
 }
 .muted {
   color: #999999;
@@ -448,8 +372,8 @@ abbr {
   cursor: help;
 }
 blockquote {
-  padding-left: 15px;
-  margin-bottom: 18px;
+  padding: 0 0 0 15px;
+  margin: 0 0 18px;
   border-left: 5px solid #eeeeee;
 }
 blockquote p {
@@ -476,10 +400,17 @@ blockquote.pull-right {
 blockquote.pull-right p, blockquote.pull-right small {
   text-align: right;
 }
+q:before,
+q:after,
+blockquote:before,
+blockquote:after {
+  content: "";
+}
 address {
   display: block;
   margin-bottom: 18px;
   line-height: 18px;
+  font-style: normal;
 }
 code, pre {
   padding: 0 3px 2px;
@@ -517,21 +448,35 @@ pre code {
   padding: 0;
   background-color: transparent;
 }
+small {
+  font-size: 100%;
+}
+cite {
+  font-style: normal;
+}
 form {
-  margin-bottom: 18px;
+  margin: 0 0 18px;
+}
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
 }
 legend {
   display: block;
   width: 100%;
+  padding: 0;
   margin-bottom: 27px;
   font-size: 19.5px;
   line-height: 36px;
   color: #333333;
+  border: 0;
   border-bottom: 1px solid #eee;
   -webkit-margin-collapse: separate;
 }
 label,
 input,
+button,
 select,
 textarea {
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
@@ -955,6 +900,9 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
   display: inline-block;
 }
 .control-group {
+  margin-bottom: 9px;
+}
+.form-horizontal .control-group {
   margin-bottom: 18px;
 }
 .form-horizontal .control-group > label {
@@ -969,6 +917,11 @@ input:focus:required:invalid:focus, textarea:focus:required:invalid:focus, selec
 .form-horizontal .form-actions {
   padding-left: 160px;
 }
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
 .table {
   width: 100%;
   margin-bottom: 18px;
@@ -1897,7 +1850,7 @@ i {
 .navbar-search .search-query :-moz-placeholder {
   color: #eeeeee;
 }
-.navbar-search .search-query::-webkit-input-placeholder {
+.navbar-search .search-query ::-webkit-input-placeholder {
   color: #eeeeee;
 }
 .navbar-search .search-query:hover {
@@ -2725,7 +2678,7 @@ button.btn::-moz-focus-inner, input[type=submit].btn::-moz-focus-inner {
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 20px 20px;
+  margin: 0 0 18px 20px;
 }
 .thumbnail {
   display: block;
@@ -3119,6 +3072,7 @@ a.thumbnail:hover {
     left: 20px;
     right: 20px;
     width: auto;
+    margin: 0;
   }
   .modal.fade.in {
     top: auto;
diff --git a/bootstrap.min.css b/bootstrap.min.css
index 216c786f0..733ad5d11 100644
--- a/bootstrap.min.css
+++ b/bootstrap.min.css
@@ -1,14 +1,9 @@
-html,body{margin:0;padding:0;}
-h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,cite,code,del,dfn,em,img,q,s,samp,small,strike,strong,sub,sup,tt,var,dd,dl,dt,li,ol,ul,fieldset,form,label,legend,button,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;font-weight:normal;font-style:normal;font-size:100%;line-height:1;font-family:inherit;}
-table{max-width:100%;border-collapse:collapse;border-spacing:0;}
-ol,ul{list-style:none;}
-q:before,q:after,blockquote:before,blockquote:after{content:"";}
-html{overflow-y:scroll;font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
-a:focus{outline:thin dotted;}
-a:hover,a:active{outline:0;}
 article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
 audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
 audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted;}
+a:hover,a:active{outline:0;}
 sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
 sup{top:-0.5em;}
 sub{bottom:-0.25em;}
@@ -31,10 +26,9 @@ body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:
 .sidebar-left .fluid-sidebar{float:left;margin-left:-240px;}
 .sidebar-right .fluid-sidebar{float:right;margin-right:-240px;}
 .fluid-content{float:left;width:100%;}
-a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
-.row{*zoom:1;}.row:before,.row:after{display:table;content:"";}
+a{color:#0088cc;text-decoration:none;}a:hover{color:#005580;text-decoration:underline;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
 .row:after{clear:both;}
-[class*="span"]:first-child{margin-left:0;}
 [class*="span"]{float:left;margin-left:20px;}
 .span1{width:60px;}
 .span2{width:140px;}
@@ -59,8 +53,8 @@ a{font-weight:inherit;line-height:inherit;color:#0088cc;text-decoration:none;}a:
 .offset9{margin-left:740px;}
 .offset10{margin-left:820px;}
 .offset11{margin-left:900px;}
-p{margin-bottom:9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
-h1,h2,h3,h4,h5,h6{font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{color:#999999;}
+p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
+h1,h2,h3,h4,h5,h6{margin:0;font-weight:bold;color:#333333;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
 h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
 h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
 h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
@@ -68,7 +62,7 @@ h4,h5,h6{line-height:18px;}
 h4{font-size:14px;}h4 small{font-size:12px;}
 h5{font-size:12px;}
 h6{font-size:11px;color:#999999;text-transform:uppercase;}
-ul,ol{margin:0 0 9px 25px;}
+ul,ol{padding:0;margin:0 0 9px 25px;}
 ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
 ul{list-style:disc;}
 ol{list-style:decimal;}
@@ -79,21 +73,25 @@ dt,dd{line-height:18px;}
 dt{font-weight:bold;}
 dd{margin-left:9px;}
 hr{margin:18px 0;border:0;border-top:1px solid #e5e5e5;border-bottom:1px solid #ffffff;}
-strong{font-style:inherit;font-weight:bold;}
-em{font-style:italic;font-weight:inherit;line-height:inherit;}
+strong{font-weight:bold;}
+em{font-style:italic;}
 .muted{color:#999999;}
 abbr{font-size:90%;text-transform:uppercase;border-bottom:1px dotted #ddd;cursor:help;}
-blockquote{padding-left:15px;margin-bottom:18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
 blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
 blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
-address{display:block;margin-bottom:18px;line-height:18px;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
 code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 code{padding:1px 3px;background-color:#fee9cc;}
 pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12px;line-height:18px;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;white-space:pre;white-space:pre-wrap;word-break:break-all;}pre.prettyprint{margin-bottom:18px;}
 pre code{padding:0;background-color:transparent;}
-form{margin-bottom:18px;}
-legend{display:block;width:100%;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
-label,input,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
+small{font-size:100%;}
+cite{font-style:normal;}
+form{margin:0 0 18px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;-webkit-margin-collapse:separate;}
+label,input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:18px;}
 label{display:block;margin-bottom:5px;color:#333333;}
 input,textarea,select,.uneditable-input{display:block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #ccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
 input[type=image],input[type=checkbox],input[type=radio]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;border:none;cursor:pointer;}
@@ -173,10 +171,12 @@ input:focus:required:invalid,textarea:focus:required:invalid,select:focus:requir
 .search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
 .form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input{display:inline-block;margin-bottom:0;}
 .form-search label,.form-inline label{display:inline-block;}
-.control-group{margin-bottom:18px;}
+.control-group{margin-bottom:9px;}
+.form-horizontal .control-group{margin-bottom:18px;}
 .form-horizontal .control-group>label{float:left;width:140px;padding-top:5px;text-align:right;}
 .form-horizontal .controls{margin-left:160px;}
 .form-horizontal .form-actions{padding-left:160px;}
+table{max-width:100%;border-collapse:collapse;border-spacing:0;}
 .table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;border-top:1px solid #ddd;}
 .table th{font-weight:bold;vertical-align:bottom;}
 .table td{vertical-align:top;}
@@ -376,7 +376,7 @@ i{background-image:url(docs/assets/img/glyphicons-halflings-sprite.png);backgrou
 .navbar .btn-group .btn{margin-top:0;}
 .navbar-form{margin-bottom:0;}.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
 .navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;color:rgba(255, 255, 255, 0.75);background:#444;background:rgba(255, 255, 255, 0.3);border:1px solid #111;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query :-moz-placeholder{color:#eeeeee;}
-.navbar-search .search-query::-webkit-input-placeholder{color:#eeeeee;}
+.navbar-search .search-query ::-webkit-input-placeholder{color:#eeeeee;}
 .navbar-search .search-query:hover{color:#ffffff;background-color:#999999;background-color:rgba(255, 255, 255, 0.5);}
 .navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
 .navbar-static{margin-bottom:18px;}
@@ -493,7 +493,7 @@ button.btn::-moz-focus-inner,input[type=submit].btn::-moz-focus-inner{padding:0;
 .alert-block p+p{margin-top:5px;}
 .thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
 .thumbnails:after{clear:both;}
-.thumbnails>li{float:left;margin:0 0 20px 20px;}
+.thumbnails>li{float:left;margin:0 0 18px 20px;}
 .thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}
 a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
 .thumbnail>img{display:block;max-width:100%;}
@@ -539,4 +539,4 @@ a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105,
 .show{display:block;}
 .invisible{visibility:hidden;}
 .hidden{display:none;visibility:hidden;}
-@media (max-width:480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"&darr;";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>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-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width:768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width:768px) and (max-width:940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
+@media (max-width: 480px){.navbar .nav{position:absolute;top:0;left:0;width:180px;padding-top:40px;list-style:none;} .navbar .nav,.navbar .nav>li:last-child a{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;} .navbar .nav>li{float:none;display:none;} .navbar .nav>li>a{float:none;background-color:#222;} .navbar .nav>.active{display:block;position:absolute;top:0;left:0;} .navbar .nav>.active>a{background-color:transparent;} .navbar .nav>.active>a:hover{background-color:#333;} .navbar .nav>.active>a:after{display:inline-block;width:0;height:0;margin-top:8px;margin-left:6px;text-indent:-99999px;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #ffffff;filter:alpha(opacity=100);-moz-opacity:1;opacity:1;content:"&darr;";} .navbar .nav:hover>li{display:block;} .navbar .nav:hover>li>a:hover{background-color:#333;} .form-horizontal .control-group>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-left:0;} .modal{position:fixed;top:20px;left:20px;right:20px;width:auto;margin:0;}.modal.fade.in{top:auto;} .modal-header .close{padding:10px;}}@media (max-width: 768px){.navbar-fixed{position:absolute;} .navbar-fixed .nav{float:none;} .container{width:auto;padding:0 20px;} .row{margin-left:0;} .row>[class*="span"]{float:none;display:block;width:auto;margin:0;}}@media (min-width: 768px) and (max-width: 940px){.container{width:748px;} .span1{width:44px;} .span2{width:108px;} .span3{width:172px;} .span4{width:236px;} .span5{width:300px;} .span6{width:364px;} .span7{width:428px;} .span8{width:492px;} .span9{width:556px;} .span10{width:620px;} .span11{width:684px;} .span12{width:748px;} .offset1{margin-left:64px;} .offset2{margin-left:128px;} .offset3{margin-left:192px;} .offset4{margin-left:256px;} .offset5{margin-left:320px;} .offset6{margin-left:384px;} .offset7{margin-left:448px;} .offset8{margin-left:512px;} .offset9{margin-left:576px;} .offset10{margin-left:640px;} .offset11{margin-left:704px;} .offset12{margin-left:768px;}}
diff --git a/docs/assets/css/docs.css b/docs/assets/css/docs.css
index 416b1830c..69d9dac56 100644
--- a/docs/assets/css/docs.css
+++ b/docs/assets/css/docs.css
@@ -115,8 +115,8 @@ section {
 ------------------------- */
 /* supporting docs pages */
 .subhead {
-  padding-bottom: 14px;
-  border-bottom: 3px solid #e5e5e5;
+  padding-bottom: 0;
+  border-bottom: 0;
 }
 .subhead h1,
 .subhead p {
@@ -126,6 +126,36 @@ section {
   font-size: 45px;
 }
 
+/* Subnav */
+.subhead .nav {
+  padding: 0 10px;
+  background-color: #eeeeee; /* Old browsers */
+  background-repeat: repeat-x; /* Repeat the gradient */
+  background-image: -moz-linear-gradient(top, #f5f5f5 0%, #eeeeee 100%); /* FF3.6+ */
+  background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#f5f5f5), color-stop(100%,#eeeeee)); /* Chrome,Safari4+ */
+  background-image: -webkit-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Chrome 10+,Safari 5.1+ */
+  background-image: -ms-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* IE10+ */
+  background-image: -o-linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* Opera 11.10+ */
+  filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f5f5f5', endColorstr='#eeeeee',GradientType=0 ); /* IE6-9 */
+  background-image: linear-gradient(top, #f5f5f5 0%,#eeeeee 100%); /* W3C */
+  border: 1px solid #eee;
+  -webkit-border-radius: 4px;
+     -moz-border-radius: 4px;
+          border-radius: 4px;
+}
+.subhead .nav a {
+  margin: 0;
+  padding-top: 11px;
+  padding-bottom: 11px;
+  -webkit-border-radius: 0;
+     -moz-border-radius: 0;
+          border-radius: 0;
+}
+.subhead .nav .active a {
+  background-color: #fff;
+  color: #333;
+}
+
 
 /* Quick links
 -------------------------------------------------- */
@@ -418,6 +448,7 @@ h2 + .row {
   margin: -18px 0 27px;
   font-size: 18px;
   font-weight: 300;
+  line-height: 24px;
   color: #999;
   text-align: center;
 }
@@ -533,6 +564,18 @@ form.well {
     margin: 0 auto 10px;
   }
 
+  /* Subnav */
+  .subhead .nav {
+    padding: 0;
+    background: none;
+  }
+  .subhead .nav > li {
+    float: none;
+  }
+  .subhead .nav li + li a {
+    border-top: 1px solid #eee;
+  }
+
   /* Don't space out quick links so much */
   .quick-links {
     margin: 40px 0 0;
diff --git a/docs/base-css.html b/docs/base-css.html
index a3e8cc85a..a869eecf8 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -34,6 +34,7 @@
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
+<<<<<<< HEAD
             <li class=""><a href="./index.html">Overview</a></li>
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -45,20 +46,16 @@
                 <li><a href="./scaffolding.html#layouts">Layouts</a></li>
                 <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
               </ul>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
-            <li class="dropdown active">
-              <a href="./base-css.html" class="dropdown-toggle" data-toggle="dropdown">
-                Base CSS
-                <b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="./base-css.html#typography">Typography</a></li>
-                <li><a href="./base-css.html#tables">Tables</a></li>
-                <li><a href="./base-css.html#forms">Forms</a></li>
-                <li><a href="./base-css.html#buttons">Buttons</a></li>
-                <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
-              </ul>
+            <li class="active">
+              <a href="./base-css.html">Base CSS</a>
             </li>
+<<<<<<< HEAD
             <li class="dropdown ">
               <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
                 Components
@@ -100,6 +97,16 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li>
+              <a href="./components.html">Components</a>
+            </li>
+            <li>
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -108,12 +115,28 @@
 
     <div class="container">
 
+<<<<<<< HEAD
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
   <h1>Base CSS</h1>
   <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
 </header>
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Base CSS</h1>
+        <p class="lead">On top of the scaffolding, basic HTML elements are styled and enhanced with extensible classes to provide a fresh, consistent look and feel.</p>
+        <ul class="nav pills">
+          <li><a href="./base-css.html#typography">Typography</a></li>
+          <li><a href="./base-css.html#tables">Tables</a></li>
+          <li><a href="./base-css.html#forms">Forms</a></li>
+          <li><a href="./base-css.html#buttons">Buttons</a></li>
+          <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
+        </ul>
+      </header>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
 <!-- Typography
diff --git a/docs/components.html b/docs/components.html
index ea58cecb8..ee14526e5 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -34,6 +34,7 @@
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
+<<<<<<< HEAD
             <li class=""><a href="./index.html">Overview</a></li>
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -58,24 +59,19 @@
                 <li><a href="./base-css.html#buttons">Buttons</a></li>
                 <li><a href="./base-css.html#icons">Icons by Glyphicons</a></li>
               </ul>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
             </li>
-            <li class="dropdown active">
-              <a href="./components.html" class="dropdown-toggle" data-toggle="dropdown">
-                Components
-                <b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="./components.html#buttonGroups">Button groups</a></li>
-                <li><a href="./components.html#buttonDropdowns">Split button dropdowns</a></li>
-                <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
-                <li><a href="./components.html#navbar">Navbar</a></li>
-                <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
-                <li><a href="./components.html#pagination">Pagination</a></li>
-                <li><a href="./components.html#thumbnails">Thumbnails</a></li>
-                <li><a href="./components.html#alerts">Alert messages</a></li>
-                <li><a href="./components.html#progress">Progress bars</a></li>
-              </ul>
+            <li>
+              <a href="./base-css.html">Base CSS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
+            </li>
+            <li class="active">
+              <a href="./components.html">Components</a>
             </li>
+<<<<<<< HEAD
             <li class="dropdown ">
               <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
                 Javascript plugins
@@ -100,6 +96,13 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li>
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -108,12 +111,33 @@
 
     <div class="container">
 
+<<<<<<< HEAD
 <!-- Masthead
 ================================================== -->
 <header class="jumbotron subhead" id="overview">
   <h1>Components</h1>
   <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
 </header>
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Components</h1>
+        <p class="lead">Dozens of reusable components are built into Bootstrap to provide navigation, alerts, popovers, and much more.</p>
+        <ul class="nav pills">
+          <li><a href="./components.html#buttonGroups">Button groups</a></li>
+          <li><a href="./components.html#buttonDropdowns">Button dropdowns</a></li>
+          <li><a href="./components.html#navs">Nav, tabs, pills</a></li>
+          <li><a href="./components.html#navbar">Navbar</a></li>
+          <li><a href="./components.html#breadcrumbs">Breadcrumbs</a></li>
+          <li><a href="./components.html#pagination">Pagination</a></li>
+          <li><a href="./components.html#thumbnails">Thumbnails</a></li>
+          <li><a href="./components.html#alerts">Alerts</a></li>
+          <li><a href="./components.html#progress">Progress bars</a></li>
+        </ul>
+      </header>
+
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
   <!-- Button Groups
diff --git a/docs/index.html b/docs/index.html
index 1e0ff52f6..f61518e07 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -35,6 +35,7 @@
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
             <li class="active"><a href="./index.html">Overview</a></li>
+<<<<<<< HEAD
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
                 Scaffolding
@@ -100,6 +101,22 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
+            </li>
+            <li>
+              <a href="./base-css.html">Base CSS</a>
+            </li>
+            <li>
+              <a href="./components.html">Components</a>
+            </li>
+            <li>
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
diff --git a/docs/javascript.html b/docs/javascript.html
index fda3ae32b..ac933b9cf 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -34,6 +34,7 @@
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
+<<<<<<< HEAD
             <li class=""><a href="./index.html">Overview</a></li>
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -75,31 +76,30 @@
                 <li><a href="./components.html#alerts">Alert messages</a></li>
                 <li><a href="./components.html#progress">Progress bars</a></li>
               </ul>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
             </li>
-            <li class="dropdown active">
-              <a href="./javascript.html" class="dropdown-toggle" data-toggle="dropdown">
-                Javascript plugins
-                <b class="caret"></b>
-              </a>
-              <ul class="dropdown-menu">
-                <li><a href="./javascript.html#javascript">Overview</a></li>
-                <li><a href="./javascript.html#modals">Modal</a></li>
-                <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
-                <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
-                <li><a href="./javascript.html#tabs">Tab</a></li>
-                <li><a href="./javascript.html#tooltips">Tooltip</a></li>
-                <li><a href="./javascript.html#popovers">Popover</a></li>
-                <li><a href="./javascript.html#alerts">Alert</a></li>
-                <li><a href="./javascript.html#buttons">Button</a></li>
-                <li><a href="./javascript.html#collapse">Collapse</a></li>
-                <li><a href="./javascript.html#carousel">Carousel</a></li>
-                <li><a href="./javascript.html#typeahead">Typeahead</a></li>
-              </ul>
+            <li>
+              <a href="./base-css.html">Base CSS</a>
             </li>
+            <li>
+              <a href="./components.html">Components</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
+            </li>
+            <li class="active">
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+<<<<<<< HEAD
             <li class="">
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -107,6 +107,29 @@
     </div>
 
     <div class="container">
+<<<<<<< HEAD
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Javascript for Bootstrap</h1>
+        <p class="lead">Bring Bootstrap's components to life&mdash;now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
+        <ul class="nav pills">
+          <li><a href="./javascript.html#javascript">Overview</a></li>
+          <li><a href="./javascript.html#modals">Modal</a></li>
+          <li><a href="./javascript.html#dropdowns">Dropdown</a></li>
+          <li><a href="./javascript.html#scrollspy">Scrollspy</a></li>
+          <li><a href="./javascript.html#tabs">Tab</a></li>
+          <li><a href="./javascript.html#tooltips">Tooltip</a></li>
+          <li><a href="./javascript.html#popovers">Popover</a></li>
+          <li><a href="./javascript.html#alerts">Alert</a></li>
+          <li><a href="./javascript.html#buttons">Button</a></li>
+          <li><a href="./javascript.html#collapse">Collapse</a></li>
+          <li><a href="./javascript.html#carousel">Carousel</a></li>
+          <li><a href="./javascript.html#typeahead">Typeahead</a></li>
+        </ul>
+      </header>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 <!-- Masthead
 ================================================== -->
diff --git a/docs/less.html b/docs/less.html
index 84f58f00d..5c8eb735d 100644
--- a/docs/less.html
+++ b/docs/less.html
@@ -34,6 +34,7 @@
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
+<<<<<<< HEAD
             <li class=""><a href="./index.html">Overview</a></li>
             <li class="dropdown ">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -95,11 +96,23 @@
                 <li><a href="./javascript.html#carousel">Carousel</a></li>
                 <li><a href="./javascript.html#typeahead">Typeahead</a></li>
               </ul>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li>
+              <a href="./scaffolding.html">Scaffolding</a>
+            </li>
+            <li>
+              <a href="./base-css.html">Base CSS</a>
+            </li>
+            <li>
+              <a href="./components.html">Components</a>
+            </li>
+            <li>
+              <a href="./javascript.html">Javascript plugins</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
             <li class="active">
-              <a href="./less.html">
-                Using LESS
-              </a>
+              <a href="./less.html">Using LESS</a>
             </li>
           </ul>
         </div>
diff --git a/docs/scaffolding.html b/docs/scaffolding.html
index 7fdbea0ec..904d53af6 100644
--- a/docs/scaffolding.html
+++ b/docs/scaffolding.html
@@ -34,6 +34,7 @@
         <div class="container">
           <a class="brand" href="./index.html">Bootstrap</a>
           <ul class="nav">
+<<<<<<< HEAD
             <li class=""><a href="./index.html">Overview</a></li>
             <li class="dropdown active">
               <a href="./scaffolding.html" class="dropdown-toggle" data-toggle="dropdown">
@@ -100,6 +101,23 @@
               <a href="./less.html">
                 Using LESS
               </a>
+=======
+            <li><a href="./index.html">Overview</a></li>
+            <li class="active">
+              <a href="./scaffolding.html">Scaffolding</a>
+            </li>
+            <li>
+              <a href="./base-css.html">Base CSS</a>
+            </li>
+            <li>
+              <a href="./components.html">Components</a>
+            </li>
+            <li>
+              <a href="./javascript.html">Javascript plugins</a>
+            </li>
+            <li>
+              <a href="./less.html">Using LESS</a>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
             </li>
           </ul>
         </div>
@@ -108,6 +126,7 @@
 
     <div class="container">
 
+<<<<<<< HEAD
 
 <!-- Masthead
 ================================================== -->
@@ -115,6 +134,19 @@
   <h1>Scaffolding</h1>
   <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
 </header>
+=======
+      <!-- Masthead
+      ================================================== -->
+      <header class="jumbotron subhead" id="overview">
+        <h1>Scaffolding</h1>
+        <p class="lead">Bootstrap is built on a responsive 12-column grid. We've also included fixed- and fluid-width layouts based on that system.</p>
+        <ul class="nav pills">
+          <li><a href="./scaffolding.html#grid-system">Grid system</a></li>
+          <li><a href="./scaffolding.html#layouts">Layouts</a></li>
+          <li><a href="./scaffolding.html#responsive">Responsive design</a></li>
+        </ul>
+      </header>
+>>>>>>> a074087034716804610637a5ad9cc0447a2cccb2
 
 
 
diff --git a/lib/buttons.less b/lib/buttons.less
index 5da34a525..f13a9acbf 100644
--- a/lib/buttons.less
+++ b/lib/buttons.less
@@ -102,7 +102,6 @@
   }
 }
 // Super jank hack for removing border-radius from IE9 so we can keep filter gradients on alerts and buttons
-:root .alert-message,
 :root .btn {
   border-radius: 0 \0;
 }
diff --git a/lib/forms.less b/lib/forms.less
index bdc6e3e07..be53c60cb 100644
--- a/lib/forms.less
+++ b/lib/forms.less
@@ -8,17 +8,25 @@
 
 // Make all forms have space below them
 form {
-  margin-bottom: @baseLineHeight;
+  margin: 0 0 @baseLineHeight;
+}
+
+fieldset {
+  padding: 0;
+  margin: 0;
+  border: 0;
 }
 
 // Groups of fields with labels on top (legends)
 legend {
   display: block;
   width: 100%;
+  padding: 0;
   margin-bottom: @baseLineHeight * 1.5;
   font-size: @baseFontSize * 1.5;
   line-height: @baseLineHeight * 2;
   color: @grayDark;
+  border: 0;
   border-bottom: 1px solid #eee;
   -webkit-margin-collapse: separate;
 }
@@ -26,6 +34,7 @@ legend {
 // Set font for forms
 label,
 input,
+button,
 select,
 textarea {
   #font > .sans-serif(@baseFontSize,normal,@baseLineHeight);
@@ -454,13 +463,17 @@ select:focus:required:invalid {
 
 // Margin to space out fieldsets
 .control-group {
-  margin-bottom: @baseLineHeight;
+  margin-bottom: @baseLineHeight / 2;
 }
 
 // Horizontal-specific styles
 // --------------------------
 
 .form-horizontal {
+  // Increase spacing between groups
+  .control-group {
+    margin-bottom: @baseLineHeight;
+  }
   // Float the labels left
   .control-group > label {
     float: left;
diff --git a/lib/reset.less b/lib/reset.less
index 8fe04d6d1..31e7160f2 100644
--- a/lib/reset.less
+++ b/lib/reset.less
@@ -1,50 +1,10 @@
 // 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).
+// Adapted from Normalize.css http://github.com/necolas/normalize.css
 // ------------------------------------------------------------------------
 
-
-// ERIC MEYER RESET
-// --------------------------------------------------
-
-html, body { margin: 0; padding: 0; }
-h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, cite, code, del, dfn, em, img, q, s, samp, small, strike, strong, sub, sup, tt, var, dd, dl, dt, li, ol, ul, fieldset, form, label, legend, button, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: normal; font-style: normal; font-size: 100%; line-height: 1; font-family: inherit; }
-table {
-  max-width: 100%;
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol, ul { list-style: none; }
-q:before, q:after, blockquote:before, blockquote:after { content: ""; }
-
-
-// Normalize.css
-// Pulling in select resets form the normalize.css project
-// --------------------------------------------------
-
 // Display in IE6-9 and FF3
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
-html {
-  overflow-y: scroll;
-  font-size: 100%;
-  -webkit-text-size-adjust: 100%;
-      -ms-text-size-adjust: 100%;
-}
-// Focus states
-a:focus {
-  outline: thin dotted;
-}
-// Hover & Active
-a:hover,
-a:active {
-  outline: 0;
-}
 
-// Display in IE6-9 and FF3
-// -------------------------
-// Source: http://github.com/necolas/normalize.css
 article,
 aside,
 details,
@@ -60,7 +20,7 @@ section {
 
 // Display block in IE6-9 and FF3
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 audio,
 canvas,
 video {
@@ -71,14 +31,32 @@ video {
 
 // Prevents modern browsers from displaying 'audio' without controls
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 audio:not([controls]) {
     display: none;
 }
 
+// Base settings
+// -------------------------
+
+html {
+  font-size: 100%;
+  -webkit-text-size-adjust: 100%;
+      -ms-text-size-adjust: 100%;
+}
+// Focus states
+a:focus {
+  outline: thin dotted;
+}
+// Hover & Active
+a:hover,
+a:active {
+  outline: 0;
+}
+
 // Prevents sub and sup affecting line-height in all browsers
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 sub,
 sup {
   position: relative;
@@ -95,7 +73,7 @@ sub {
 
 // Img border in a's and image quality
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
+
 img {
   max-width: 100%;
   height: auto;
@@ -105,7 +83,6 @@ img {
 
 // Forms
 // -------------------------
-// Source: http://github.com/necolas/normalize.css
 
 // Font size in all browsers, margin changes, misc consistency
 button,
diff --git a/lib/responsive.less b/lib/responsive.less
index f5c23df3c..416a8da7b 100644
--- a/lib/responsive.less
+++ b/lib/responsive.less
@@ -97,11 +97,12 @@
 
   // Modals
   .modal {
-    position: fixed;
+    position: absolute;
     top: 20px;
     left: 20px;
     right: 20px;
     width: auto;
+    margin: 0;
     &.fade.in { top: auto; }
   }
   .modal-header .close {
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index 66e5cc32f..ff029e841 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -60,8 +60,6 @@ body {
 
 // Links
 a {
-  font-weight: inherit;
-  line-height: inherit;
   color: @linkColor;
   text-decoration: none;
   &:hover {
@@ -75,13 +73,10 @@ a {
 // -----------
 // To customize the grid system, bring up the variables.less file and change the column count, size, and gutter there
 .row {
+  margin-left: @gridGutterWidth * -1;
   .clearfix();
 }
 
-[class*="span"]:first-child{
-  margin-left: 0;
-}
-
 // 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
diff --git a/lib/tables.less b/lib/tables.less
index 14e4ea44a..4010f63ec 100644
--- a/lib/tables.less
+++ b/lib/tables.less
@@ -4,6 +4,15 @@
 // ----------------------------------------
 
 
+// BASE TABLES
+// -----------------
+
+table {
+  max-width: 100%;
+  border-collapse: collapse;
+  border-spacing: 0;
+}
+
 // BASELINE STYLES
 // ---------------
 
diff --git a/lib/thumbnails.less b/lib/thumbnails.less
index 4f9c5f76d..0ba749059 100644
--- a/lib/thumbnails.less
+++ b/lib/thumbnails.less
@@ -8,7 +8,7 @@
 }
 .thumbnails > li {
   float: left;
-  margin: 0 0 20px 20px;
+  margin: 0 0 @baseLineHeight 20px;
 }
 .thumbnail {
   display: block;
diff --git a/lib/type.less b/lib/type.less
index a94a4956e..2c6e7db6a 100644
--- a/lib/type.less
+++ b/lib/type.less
@@ -7,7 +7,7 @@
 // ---------
 
 p {
-  margin-bottom: @baseLineHeight / 2;
+  margin: 0 0 @baseLineHeight / 2;
   font-family: @baseFontFamily;
   font-size: @baseFontSize;
   line-height: @baseLineHeight;
@@ -17,15 +17,16 @@ p {
   }
 }
 
-
 // HEADINGS
 // --------
 
 h1, h2, h3, h4, h5, h6 {
+  margin: 0;
   font-weight: bold;
   color: @grayDark;
   text-rendering: optimizelegibility; // Fix the character spacing for headings
   small {
+    font-weight: normal;
     color: @grayLight;
   }
 }
@@ -74,6 +75,7 @@ h6 {
 
 // Unordered and Ordered lists
 ul, ol {
+  padding: 0;
   margin: 0 0 @baseLineHeight / 2 25px;
 }
 ul ul,
@@ -124,13 +126,10 @@ hr {
 
 // Emphasis
 strong {
-  font-style: inherit;
   font-weight: bold;
 }
 em {
   font-style: italic;
-  font-weight: inherit;
-  line-height: inherit;
 }
 .muted {
   color: @grayLight;
@@ -146,8 +145,8 @@ abbr {
 
 // Blockquotes
 blockquote {
-  padding-left: 15px;
-  margin-bottom: @baseLineHeight;
+  padding: 0 0 0 15px;
+  margin: 0 0 @baseLineHeight;
   border-left: 5px solid @grayLighter;
   p {
     margin-bottom: 0;
@@ -176,11 +175,19 @@ blockquote {
   }
 }
 
+q:before,
+q:after,
+blockquote:before, 
+blockquote:after {
+  content: "";
+}
+
 // Addresses
 address {
   display: block;
   margin-bottom: @baseLineHeight;
   line-height: @baseLineHeight;
+  font-style: normal;
 }
 
 // Inline and block code styles
@@ -220,4 +227,12 @@ pre {
     padding: 0;
     background-color: transparent;
   }
-}
\ No newline at end of file
+}
+
+small {
+  font-size: 100%;
+}
+
+cite {
+  font-style: normal;
+}