aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2011-10-28 18:38:06 -0700
committerMark Otto <[email protected]>2011-10-28 18:38:06 -0700
commit2764cfda6dbda56b4a50561fb8cd2a8be86dc096 (patch)
tree64a1af7bdcf5c43ae045f72f6f541f9977179d83
parent9fd4e459fe829454c811118c64aa32eafd6e8b97 (diff)
downloadbootstrap-2764cfda6dbda56b4a50561fb8cd2a8be86dc096.tar.xz
bootstrap-2764cfda6dbda56b4a50561fb8cd2a8be86dc096.zip
remove html from body background
-rw-r--r--bootstrap.css6
-rw-r--r--bootstrap.min.css3
-rw-r--r--docs/scaffolding.html1
-rw-r--r--lib/scaffolding.less4
4 files changed, 5 insertions, 9 deletions
diff --git a/bootstrap.css b/bootstrap.css
index ed0556b3d..ec9217a21 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 b443f02e3..7eb8efe2f 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 2a5ae8bc6..de612a074 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 f15f6853c..7b8aa369a 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;