Mark Otto 8c2df3ac3a resolve conflicts in merging in other branch

2011-08-25 23:12:29 -07:00

..

bootstrap.less

v1.1.0

2011-08-21 22:30:39 -07:00

forms.less

resolve conflicts in merging in other branch

2011-08-25 23:12:29 -07:00

patterns.less

resolve conflicts in merging in other branch

2011-08-25 23:12:29 -07:00

preboot.less

updated classnames in the docs for the alerts, updated colors on error and info alerts/buttons

2011-08-25 22:52:21 -07:00

reset.less

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

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

scaffolding.less

resolve conflicts in merging in other branch

2011-08-25 23:12:29 -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