From: Mark Otto <mark.otto@twitter.com>
Date: Fri, 26 Aug 2011 05:44:23 +0000 (-0700)
Subject: resolve issue #87 in this branch
X-Git-Tag: v1.1.1~1^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d821f18acf04cddd1067ee612773ce2f98cb4ac;p=thirdparty%2Fbootstrap.git

resolve issue #87 in this branch
---

diff --git a/bootstrap-1.1.0.css b/bootstrap-1.1.0.css
index f06827bc5d..e97f2fc897 100644
--- a/bootstrap-1.1.0.css
+++ b/bootstrap-1.1.0.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 Aug 25 22:35:30 PDT 2011
+ * Date: Thu Aug 25 22:44:09 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).
@@ -315,26 +315,26 @@ body {
   color: #808080;
   text-rendering: optimizeLegibility;
 }
-div.container {
+.container {
   width: 940px;
   margin: 0 auto;
 }
-div.container-fluid {
+.container-fluid {
   padding: 0 20px;
   zoom: 1;
 }
-div.container-fluid:before, div.container-fluid:after {
+.container-fluid:before, .container-fluid:after {
   display: table;
   content: "";
 }
-div.container-fluid:after {
+.container-fluid:after {
   clear: both;
 }
-div.container-fluid div.sidebar {
+.container-fluid .sidebar {
   float: left;
   width: 220px;
 }
-div.container-fluid div.content {
+.container-fluid .content {
   min-width: 700px;
   max-width: 1180px;
   margin-left: 240px;
diff --git a/bootstrap-1.1.0.min.css b/bootstrap-1.1.0.min.css
index 4cd8bdcbac..343a51ec63 100644
--- a/bootstrap-1.1.0.min.css
+++ b/bootstrap-1.1.0.min.css
@@ -46,11 +46,11 @@ header,section,footer,article,aside{display:block;}
 .row .offset12{margin-left:740px;}
 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;text-rendering:optimizeLegibility;}
-div.container{width:940px;margin:0 auto;}
-div.container-fluid{padding:0 20px;zoom:1;}div.container-fluid:before,div.container-fluid:after{display:table;content:"";}
-div.container-fluid:after{clear:both;}
-div.container-fluid div.sidebar{float:left;width:220px;}
-div.container-fluid div.content{min-width:700px;max-width:1180px;margin-left:240px;}
+.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;}
 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;}
diff --git a/lib/scaffolding.less b/lib/scaffolding.less
index ad5cc7644d..6b7fa799fa 100644
--- a/lib/scaffolding.less
+++ b/lib/scaffolding.less
@@ -81,20 +81,20 @@ body {
 }
 
 // Container (centered, fixed-width layouts)
-div.container {
+.container {
   width: 940px;
   margin: 0 auto;
 }
 
 // Fluid layouts (left aligned, with sidebar, min- & max-width content)
-div.container-fluid {
+.container-fluid {
   padding: 0 20px;
   .clearfix();
-  div.sidebar {
+  .sidebar {
     float: left;
     width: 220px;
   }
-  div.content {
+  .content {
     min-width: 700px;
     max-width: 1180px;
     margin-left: 240px;