diff --git a/bootstrap.css b/bootstrap.css index ed0556b3d8a1942deab95f03621b1f45c7fe6f4f..ec9217a21be8c988f9b788601c4d7a8997b0b265 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Thu Oct 27 12:48:41 PDT 2011 + * Date: Fri Oct 28 18:37:59 PDT 2011 */ /* 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). @@ -180,10 +180,8 @@ textarea { * Scaffolding * Basic and global styles for generating a grid system, structural layout, and page templates * ------------------------------------------------------------------------------------------- */ -html, body { - background-color: #ffffff; -} body { + background-color: #ffffff; margin: 0; font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; font-size: 13px; diff --git a/bootstrap.min.css b/bootstrap.min.css index b443f02e39638bb0f7b8d431e579a47da03837eb..7eb8efe2fade7981a036e3cd9f138463fb7054da 100644 --- a/bootstrap.min.css +++ b/bootstrap.min.css @@ -20,8 +20,7 @@ button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:poin 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;} -html,body{background-color:#ffffff;} -body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#404040;} +body{background-color:#ffffff;margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;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;} .fluid-container{position:relative;min-width:940px;padding-left:20px;padding-right:20px;zoom:1;}.fluid-container:before,.fluid-container:after{display:table;content:"";zoom:1;*display:inline;} diff --git a/docs/scaffolding.html b/docs/scaffolding.html index 2a5ae8bc632cea064452b477808c2deb9ce4576d..de612a0746e1fce512d33eaf5a1a415d800a72cb 100644 --- a/docs/scaffolding.html +++ b/docs/scaffolding.html @@ -53,6 +53,7 @@ </header> + <!-- Grid system ================================================== --> <section id="grid-system"> diff --git a/lib/scaffolding.less b/lib/scaffolding.less index f15f6853cf86b82764450b724fc6bb5d9906b798..7b8aa369a40a494e27d2c9d73116866f31f5b4ea 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -7,10 +7,8 @@ // STRUCTURAL LAYOUT // ----------------- -html, body { - background-color: @white; -} body { + background-color: @white; margin: 0; font-family: @baseFontFamily; font-size: @baseFontSize;