Mark Otto 6638f87f50 resolve conflicts

2011-09-02 11:54:17 -07:00

..

adaptive.less

le merging conflicts

2011-08-29 21:26:53 -07:00

bootstrap.less

rename all 1.1.1 stuff -> 1.2.0 and remove templates dir and fluid.html

2011-08-30 23:34:19 -07:00

forms.less

update the file input to undo the damage of the generic input selector

2011-09-02 11:53:58 -07:00

patterns.less

incorporated idea from @markdotto in #138

2011-09-02 12:45:03 -04:00

preboot.less

Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

2011-09-02 11:49:03 -07:00

reset.less

remove repeated table reset

2011-08-29 21:42:44 -07:00

scaffolding.less

Merge branch 'master' of github.com:twitter/bootstrap into 1.2-wip

2011-09-02 11:49:03 -07:00

tables.less

merge in master, resolve conflicts

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

type.less

base import of normalize into the reset css, tweaks to selector specificity across the board

2011-08-25 00:13:40 -07:00