Dave Gandy 4df6fec3a8 merge conflicts

2014-08-23 10:16:24 -04:00

..

_bordered-pulled.scss

re-porting to scss, fixing some fa variable names

2013-10-23 00:24:08 -04:00

_core.scss

shortening font declaration, adding font-variant and text-rendering defaults

2014-08-21 15:25:45 -04:00

_extras.scss

re-porting to scss, fixing some fa variable names

2013-10-23 00:24:08 -04:00

_fixed-width.scss

re-porting to scss, fixing some fa variable names

2013-10-23 00:24:08 -04:00

_icons.scss

adding twitch, yelp, newspaper, wifi, and calculator #1687 #581 #111 #223 #521

2014-08-23 10:13:35 -04:00

_larger.scss

re-porting to scss, fixing some fa variable names

2013-10-23 00:24:08 -04:00

_list.scss

re-porting to scss, fixing some fa variable names

2013-10-23 00:24:08 -04:00

_mixins.scss

Opera 12.10 supports unprefixed CSS animations, gradients, transforms, and transitions or will use -webkit.

2014-08-23 14:08:15 +02:00

_path.scss

Reverted e07edeb88487b3b4b59c11b28ea1197bd5cc6613

2013-11-05 10:05:14 +01:00

_rotated-flipped.scss

fix Issue with fa-rotate-* in IE9 #3527

2014-05-27 10:20:44 +02:00

_spinning.scss

Opera 12.10 supports unprefixed CSS animations, gradients, transforms, and transitions or will use -webkit.

2014-08-23 14:08:15 +02:00

_stacked.scss

Fixes fa-stack alignment

2013-10-24 20:49:23 +02:00

_variables.scss

adding twitch, yelp, newspaper, wifi, and calculator #1687 #581 #111 #223 #521

2014-08-23 10:13:35 -04:00

font-awesome.scss

updating config to new version, automating README.md better

2014-08-20 11:31:43 -04:00