Commit Graph

347 Commits

Author SHA1 Message Date
davegandy
99e4701d69 adding all the other changes to fix #1260 2013-06-14 17:21:10 -04:00
davegandy
692fba163d Merge remote-tracking branch 'origin/master' into 3.2.1-wip 2013-06-14 17:14:26 -04:00
Dave Gandy
b5f614f3be Merge pull request #1266 from dmyers/icon-dribbble
Changed spelling of dribbble
2013-06-14 13:59:11 -07:00
davegandy
b9af12baad fixing #1305 2013-06-14 16:57:00 -04:00
davegandy
8bafdcca80 Merge branch '3.2.1-wip' of https://github.com/FortAwesome/Font-Awesome into 3.2.1-wip 2013-06-14 16:48:56 -04:00
davegandy
254f30fb25 adding tests for stacked icons inside anchors 2013-06-14 16:48:45 -04:00
Dave Gandy
09ed5e1583 Merge pull request #1313 from Scotchester/linked-stack-fix
Stop linked stacks from going inline (fixes #1305)
2013-06-14 13:42:50 -07:00
davegandy
9c8f62ac70 updating docs for 3.2.1, adding site.fontawesome.minor_version jekyll variable as a hack for now 2013-06-14 16:39:10 -04:00
Scott Cranfill
3df2e4bfa1 Stop linked stacks from going inline (fixes #1305) 2013-06-14 15:10:15 -04:00
Derek Myers
b1e9c45e34 Changed spelling of dribbble, fixes #1264 2013-06-14 11:48:06 -05:00
davegandy
a9065a166e addressing #1250 2013-06-12 14:28:15 -04:00
Dave Gandy
1ba1537c9b Merge pull request #1251 from AJ-Acevedo/3.2-typo
3.2.0-wip Minor Typo corrections
2013-06-12 11:20:51 -07:00
davegandy
b01ec557c5 final(?) tweaks to scss 2013-06-12 14:18:07 -04:00
davegandy
1b69abcdc2 Merge branch '3.2.0-wip' of https://github.com/FortAwesome/Font-Awesome into 3.2.0-wip 2013-06-12 14:03:33 -04:00
davegandy
afdf66d7e0 updating compiled ie7 scss 2013-06-12 14:03:29 -04:00
Dave Gandy
d6374ff74b Merge pull request #1247 from LightGuard/3.2.0-wip
Fixing interpolation is scss path
2013-06-12 11:00:30 -07:00
AJ Acevedo
08508ecb33 Minor typo fixes 2013-06-12 13:34:44 -04:00
LightGuard
61f6d8cc90 Bumping the version up to 3.2.0 2013-06-12 10:42:54 -06:00
LightGuard
3e6cc95001 Fixing division 2013-06-12 10:42:37 -06:00
LightGuard
4c3b45789f Fixing interpolation is scss path 2013-06-12 10:11:37 -06:00
davegandy
dba0c9865a updating ie7 less and scss, fixing scss variable issue 2013-06-12 11:21:04 -04:00
davegandy
fc72d63889 straight port of _path.scss 2013-06-12 11:01:57 -04:00
davegandy
d737b2a33b removing extra mixins from scss to make a straight port 2013-06-12 10:54:30 -04:00
davegandy
ba907e7ede straight port of extras.scss 2013-06-12 10:51:29 -04:00
davegandy
fb07367e33 porting bootstrap.scss from scratch 2013-06-12 10:49:37 -04:00
davegandy
8033f2571f ported core.scss from scratch 2013-06-12 10:47:27 -04:00
davegandy
1a656a835f updating scss variables and icons to be driven by build 2013-06-12 10:40:25 -04:00
davegandy
96298854ea scss mixins and variables updated 2013-06-12 10:33:11 -04:00
davegandy
19aaed3ddd force jekyll to pass _foo.scss files through 2013-06-12 10:15:46 -04:00
davegandy
89cdc55b08 adding scss files to root dir, moving canonical files into root dir 2013-06-12 10:01:32 -04:00
Dave Gandy
453ccfc214 Merge pull request #1075 from tbleckert/3.2.0-wip
Added SASS support in here
2013-06-12 06:54:07 -07:00
davegandy
5abdb05a92 makefile now copies font-awesome directories to root level, creates zip file automatically 2013-06-12 00:32:47 -04:00
davegandy
5f867c303b updating icon-time 2013-06-12 00:01:12 -04:00
davegandy
9871ee8377 removing sharagift links, adding gittip 2013-06-11 23:53:44 -04:00
davegandy
6296efb2f4 adding compass icon to index jumbotron 2013-06-11 23:48:44 -04:00
davegandy
4562561460 adding renren, weibo 2013-06-11 23:37:20 -04:00
davegandy
44747c647c adding icon-weibo 2013-06-11 23:15:59 -04:00
davegandy
b56f56a855 adding icon-vk #236 2013-06-11 23:09:50 -04:00
davegandy
41b2eb9611 including license terms for brand icons in icon listing 2013-06-11 22:43:00 -04:00
davegandy
0f5fd63a5c fixing responsive phone 2013-06-11 20:33:08 -04:00
davegandy
1ff3646a43 adding icon-bug #332 2013-06-08 10:51:22 -02:30
davegandy
56dac48223 renaming source directory to src 2013-06-07 12:40:09 -02:30
davegandy
782cdbd02c adding icon-archive, finishing icon-male and icon-female 2013-06-07 12:27:16 -02:30
davegandy
3d51148cf2 fixing aliases text showing up when it shouldn't on icon pages 2013-06-06 15:22:06 -02:30
davegandy
a8f72b417c tweaking for responsive 2013-06-06 15:18:43 -02:30
davegandy
63787fc5b3 responsive for tablet & phone 2013-06-06 13:59:03 -02:30
davegandy
796f930263 adding 1200px width responsive to docs 2013-06-06 12:21:33 -02:30
davegandy
015860d654 changing order of new icons, adding sun and moon 2013-06-06 15:18:20 +02:00
davegandy
20f7d2a5e0 adding icon-gittip #699 2013-06-04 15:37:22 -04:00
davegandy
4edbdc94d7 renaming build directory to source, re-alphabetizing based on classname, not id 2013-06-04 10:47:21 -04:00