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 /lib | |
| 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 'lib')
| -rw-r--r-- | lib/reset.less | 10 | ||||
| -rw-r--r-- | lib/scaffolding.less | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/lib/reset.less b/lib/reset.less index e79b77b40..9e2c6befe 100644 --- a/lib/reset.less +++ b/lib/reset.less @@ -133,14 +133,4 @@ input[type="search"]::-webkit-search-decoration { textarea { overflow: auto; // Remove vertical scrollbar in IE6-9 vertical-align: top; // Readability and alignment cross-browser -} - -// Tables -// ------------------------- -// Source: http://github.com/necolas/normalize.css - -// Remove spacing between table cells -table { - border-collapse: collapse; - border-spacing: 0; }
\ No newline at end of file diff --git a/lib/scaffolding.less b/lib/scaffolding.less index a0dee789c..7f2af56ba 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -54,8 +54,8 @@ // Unique column sizes for 16-column grid .span-one-third { width: 300px; } .span-two-thirds { width: 620px; } - .offset-one-third { margin-left: 320px; } - .offset-two-thirds { margin-left: 640px; } + .offset-one-third { margin-left: 340px; } + .offset-two-thirds { margin-left: 660px; } } |