Merge branch 'normalize' of https://github.com/necolas/bootstrap into necolas-normalize

Conflicts:
	bootstrap.css
	bootstrap.min.css
	lib/type.less

diff --cc bootstrap.css
index aa68f04b9907036a76a7d6fe27346258b4306f3a,b2aaece91fa0c70649ad2c60bd572b47582c8936..85a3edb6f7fce5a0dd69bca2b0b8ab6ab80e8b84
--- 1/bootstrap.css
--- 2/bootstrap.css
+++ b/bootstrap.css
@@@ -6,95 -6,8 +6,8 @@@
   * http://www.apache.org/licenses/LICENSE-2.0
   *
   * Designed and built with all the love in the world @twitter by @mdo and @fat.
-  * Date: Sun Jan 22 20:50:28 PST 2012
 - * Date: Fri 20 Jan 2012 21:21:51 GMT
++ * Date: Mon Jan 23 11:25:06 PST 2012
   */
- 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,
@@@ -427,10 -350,9 +352,9 @@@ hr 
    margin: 18px 0;
    border: 0;
    border-top: 1px solid #e5e5e5;
 -  border-bottom: 1px solid #fff;
 +  border-bottom: 1px solid #ffffff;
  }
  strong {
-   font-style: inherit;
    font-weight: bold;
  }
  em {
@@@ -448,9 -368,9 +370,9 @@@ abbr 
    cursor: help;
  }
  blockquote {
-   padding-left: 15px;
-   margin-bottom: 18px;
+   padding: 0 0 0 15px;
+   margin: 0 0 18px;
 -  border-left: 5px solid #eee;
 +  border-left: 5px solid #eeeeee;
  }
  blockquote p {
    margin-bottom: 0;
@@@ -1897,7 -1843,7 +1845,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 {

diff --cc bootstrap.min.css
index 216c786f0765a81336558b43e9e07bd762c49d65,d709e87a9c155434ba96d0e9e3a17d89e4d7b2d3..172e7961be94212d4f84f48004af6394ef55568f
--- 1/bootstrap.min.css
--- 2/bootstrap.min.css
+++ b/bootstrap.min.css
@@@ -31,10 -26,9 +26,10 @@@ body{margin:0;font-family:"Helvetica Ne
  .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;}
+ 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{*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;}
@@@ -78,15 -72,16 +73,16 @@@ dl{margin-bottom:18px;
  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 #fff;}
 +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 #eee;}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 #eee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
 +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;}
@@@ -376,7 -375,7 +376,7 @@@ i{background-image:url(docs/assets/img/
  .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;}
@@@ -539,4 -538,4 +539,4 @@@ a.thumbnail:hover{border-color:#0088cc;
  .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:"↓";} .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:"↓";} .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;}}

diff --cc lib/forms.less
Simple merge

diff --cc lib/scaffolding.less
Simple merge

diff --cc lib/tables.less
Simple merge

diff --cc lib/type.less
index a94a4956ed54dbdc1117ec6a711c60ef3662b6e0,e2049fb71ccf80bdb03d39f5ed5653d4e112f53a..2c6e7db6a23a7efb74f7d914c446eb387bc1c3b5
--- 1/lib/type.less
--- 2/lib/type.less
+++ b/lib/type.less
@@@ -146,9 -145,9 +145,9 @@@ abbr 
  
  // Blockquotes
  blockquote {
-   padding-left: 15px;
-   margin-bottom: @baseLineHeight;
+   padding: 0 0 0 15px;
+   margin: 0 0 @baseLineHeight;
 -  border-left: 5px solid #eee;
 +  border-left: 5px solid @grayLighter;
    p {
      margin-bottom: 0;
      #font > .shorthand(16px,300,@baseLineHeight * 1.25);