diff options
| author | Jacob Thornton <[email protected]> | 2011-09-01 22:54:59 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-01 22:54:59 -0700 |
| commit | 0159524413f7a90b90cff50fa07d07b85380845d (patch) | |
| tree | a05a627878a00e467dc4acfdef164ff89179aeef /bootstrap-1.2.0.min.css | |
| parent | 72da5dd54d154bb2b87b0ec23107eca775c72f51 (diff) | |
| parent | 0cb6804b6953d8fce53fcfae065288fd826d1941 (diff) | |
| download | bootstrap-0159524413f7a90b90cff50fa07d07b85380845d.tar.xz bootstrap-0159524413f7a90b90cff50fa07d07b85380845d.zip | |
Merge branch '1.2-wip' of github.com:twitter/bootstrap into 1.2-wip
Conflicts:
bootstrap-1.2.0.css
Diffstat (limited to 'bootstrap-1.2.0.min.css')
| -rw-r--r-- | bootstrap-1.2.0.min.css | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/bootstrap-1.2.0.min.css b/bootstrap-1.2.0.min.css index f2c3789fc..b84f81e7c 100644 --- a/bootstrap-1.2.0.min.css +++ b/bootstrap-1.2.0.min.css @@ -19,7 +19,6 @@ 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;} -table{border-collapse:collapse;border-spacing:0;} .clearfix{zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";} .clearfix:after{clear:both;} .center-block{display:block;margin:0 auto;} @@ -62,8 +61,8 @@ table{border-collapse:collapse;border-spacing:0;} .row .offset12{margin-left:740px;} .row .span-one-third{width:300px;} .row .span-two-thirds{width:620px;} -.row .offset-one-third{margin-left:320px;} -.row .offset-two-thirds{margin-left:640px;} +.row .offset-one-third{margin-left:340px;} +.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;text-rendering:optimizeLegibility;} .container{width:940px;margin:0 auto;} |