6 commits

Author	SHA1	Message	Date
Adam Wathan	3797220c44	Extract padding/margin values to spacing	2019-02-16 20:33:05 -05:00
Adam Wathan	b8f965179c	Finish merge of master	2019-02-07 13:58:47 -05:00
Adam Wathan	0318bd25d8	Remove colors constant	2019-02-05 20:42:14 -05:00
Adam Wathan	04e1274e86	Rename mergeConfig to resolveConfig ... Accept configs to resolve as an array to allow reuse when only resolving from a single config, update processTailwindFeatures to use resolveConfig even when no config is provided, update defaultTheme to self-reference colors.	2019-02-05 20:36:54 -05:00
Adam Wathan	083ab97e12	Fix code style	2019-02-01 12:32:50 -05:00
Adam Wathan	a4bdae4d63	Extract default theme to separate file	2019-02-01 12:32:50 -05:00