Mark Otto 23ec21d049 resolve conflicts

2011-08-21 20:51:13 -07:00

..

bootstrap.less

capitalize github properly, fix url for compiled css

2011-08-17 22:38:14 -07:00

forms.less

resolve conflicts

2011-08-21 20:51:13 -07:00

patterns.less

merge in master, resolve conflicts

2011-08-21 20:47:24 -07:00

preboot.less

merge in master, resolve conflicts

2011-08-21 20:47:24 -07:00

reset.less

update whitspace and comment styles

2011-08-16 22:58:01 -07:00

scaffolding.less

merge in master, resolve conflicts

2011-08-21 20:47:24 -07:00

tables.less

merge in master, resolve conflicts

2011-08-21 20:47:24 -07:00

type.less

updated docs to fix inconsistent display of code elements, update scaffolding to fix padding issue on fluid containers, add placeholder hero unit in patterns for future use, continue to refactor some rgba to hex values

2011-08-20 18:58:12 -07:00