Commit graph

6 commits

Author SHA1 Message Date
mrmrs
b272973285 Fixes white-space issues. 2014-09-17 03:27:02 -07:00
mrmrs
dc2a4fec7c Merge branch 'master' into gh-pages
Conflicts:
	css/i.css
	css/i.min.css
	index.html
	sass/_background_size.scss
	sass/_border_colors.scss
	sass/_border_radius.scss
	sass/_border_style.scss
	sass/_borders.scss
	sass/_box_sizing.scss
	sass/_clears.scss
	sass/_colors.scss
	sass/_debug.scss
	sass/_dimension_utilities.scss
	sass/_display.scss
	sass/_floats.scss
	sass/_font_family.scss
	sass/_font_style.scss
	sass/_font_weight.scss
	sass/_forms.scss
	sass/_images.scss
	sass/_letter_spacing.scss
	sass/_line_height.scss
	sass/_links.scss
	sass/_lists.scss
	sass/_max_widths.scss
	sass/_overflow.scss
	sass/_position.scss
	sass/_queries.scss
	sass/_skins.scss
	sass/_spacing.scss
	sass/_styles.scss
	sass/_text_align.scss
	sass/_text_decoration.scss
	sass/_text_transform.scss
	sass/_type_scale.scss
	sass/_vertical_align.scss
	sass/_visibility.scss
	sass/_white_space.scss
	sass/_widths.scss
	sass/_word_spacing.scss
	sass/tachyons.scss
2014-09-15 10:47:06 -07:00
mrmrs
7afbe7cf27 Revert white-space changes for demoing fugitive plugin. 2014-09-14 23:15:08 -07:00
mrmrs
5f32a91cbd Creating merge conflicts. 2014-09-12 19:49:46 -07:00
mrmrs
560be7b263 Add blank lines at end of file. 2014-09-12 19:47:14 -07:00
mrmrs
4417a758a6 Update list of included sass modules.
Add debug and styles modules.
2014-03-13 01:17:13 -07:00