From 162534139170e3416cb33a5b5c5093d4a2a5e8f0 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Fri, 2 Sep 2011 22:09:12 -0700 Subject: [PATCH] fix repeated margin-left --- bootstrap-1.2.0.css | 6 +++--- bootstrap-1.2.0.min.css | 4 ++-- lib/preboot.less | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap-1.2.0.css b/bootstrap-1.2.0.css index b2bcc20b33..b502d7fa76 100644 --- a/bootstrap-1.2.0.css +++ b/bootstrap-1.2.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: Fri Sep 2 22:08:17 PDT 2011 + * Date: Fri Sep 2 22:09:02 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). @@ -188,7 +188,7 @@ textarea { .fixed-container { width: 940px; margin-left: auto; - margin-left: auto; + margin-right: auto; zoom: 1; margin-bottom: 18px; } @@ -396,7 +396,7 @@ body { .container { width: 940px; margin-left: auto; - margin-left: auto; + margin-right: auto; zoom: 1; margin-bottom: 18px; } diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index a294e905e7..d823c6bef3 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -22,7 +22,7 @@ textarea{overflow:auto;vertical-align:top;} .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";} .clearfix:after{clear:both;} .center-block{display:block;margin-left:auto;margin-right:auto;} -.fixed-container{width:940px;margin-left:auto;margin-left:auto;zoom:1;margin-bottom:18px;}.fixed-container:before,.fixed-container:after{display:table;content:"";} +.fixed-container{width:940px;margin-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.fixed-container:before,.fixed-container:after{display:table;content:"";} .fixed-container:after{clear:both;} .btn.danger,.alert-message.danger,.btn.danger:hover,.alert-message.danger:hover,.btn.error,.alert-message.error,.btn.error:hover,.alert-message.error:hover,.btn.success,.alert-message.success,.btn.success:hover,.alert-message.success:hover,.btn.info,.alert-message.info,.btn.info:hover,.alert-message.info:hover{color:#ffffff;} .btn.danger,.alert-message.danger,.btn.error,.alert-message.error{background-color:#c43c35;background-repeat:repeat-x;background-image:-khtml-gradient(linear, left top, left bottom, from(#ee5f5b), to(#c43c35));background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, left top, left bottom, color-stop(0%, #ee5f5b), color-stop(100%, #c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);border-color:#c43c35 #c43c35 #882a25;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);} @@ -65,7 +65,7 @@ textarea{overflow:auto;vertical-align:top;} .row .offset-two-thirds{margin-left:660px;} 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;} -.container{width:940px;margin-left:auto;margin-left:auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";} +.container{width:940px;margin-left:auto;margin-right:auto;zoom:1;margin-bottom:18px;}.container:before,.container:after{display:table;content:"";} .container:after{clear:both;} .container-fluid{padding-left:20px;padding-right:20px;zoom:1;margin-bottom:18px;}.container-fluid:before,.container-fluid:after{display:table;content:"";} .container-fluid:after{clear:both;} diff --git a/lib/preboot.less b/lib/preboot.less index adbbc676ea..3cf9241928 100644 --- a/lib/preboot.less +++ b/lib/preboot.less @@ -124,7 +124,7 @@ .fixed-container { width: @siteWidth; margin-left: auto; - margin-left: auto; + margin-right: auto; .clearfix(); } .columns(@columnSpan: 1) {