From d828502f9184fba177aa6ee7061399b028c8b7f2 Mon Sep 17 00:00:00 2001
From: Scott McCauley <scott@ascottmccauley.com>
Date: Mon, 4 Mar 2013 09:59:01 -0500
Subject: [PATCH] update to make compatible with Foundation

just include .button alongside .btn
---
 sass/font-awesome.sass | 12 ++++++------
 sass/font-awesome.scss | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sass/font-awesome.sass b/sass/font-awesome.sass
index 8425a429e..fb33d73d0 100644
--- a/sass/font-awesome.sass
+++ b/sass/font-awesome.sass
@@ -93,7 +93,7 @@ a
   vertical-align: -10%
   font-size: 1.3333333333333333em
 
-.btn, .nav
+.btn, .button, .nav
   [class^="icon-"],
   [class*=" icon-"]
     display: inline
@@ -177,7 +177,7 @@ ul.icons
   &.pull-right
     margin-left: .3em
 
-.btn
+.btn, .button
   [class^="icon-"],
   [class*=" icon-"]
     &.pull-left, &.pull-right
@@ -186,14 +186,14 @@ ul.icons
     &.icon-spin.icon-large
       line-height: .8em
 
-.btn.btn-small
+.btn.btn-small, .button.small
   [class^="icon-"],
   [class*=" icon-"]
     &.pull-left, &.pull-right
       &.icon-2x
         margin-top: .25em
 
-.btn.btn-large
+.btn.btn-large, .button.large
   [class^="icon-"],
   [class*=" icon-"]
     margin-top: 0 // overrides bootstrap default
@@ -246,11 +246,11 @@ ul.icons
 @-moz-document url-prefix()
   .icon-spin
     height: .9em
-  .btn .icon-spin
+  .btn .icon-spin, .button .icon-spin
     height: auto
   .icon-spin.icon-large
     height: 1.25em
-  .btn .icon-spin.icon-large
+  .btn .icon-spin.icon-large, .button .icon-spin.icon-large
     height: .75em
 
 
diff --git a/sass/font-awesome.scss b/sass/font-awesome.scss
index 92ade8d21..77da4e917 100644
--- a/sass/font-awesome.scss
+++ b/sass/font-awesome.scss
@@ -97,7 +97,7 @@ a {
   font-size: 1.3333333333333333em;
 }
 
-.btn, .nav {
+.btn, .button, .nav {
   [class^="icon-"],
   [class*=" icon-"] {
     display: inline;
@@ -195,7 +195,7 @@ ul.icons {
   }
 }
 
-.btn {
+.btn, .button {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
@@ -205,7 +205,7 @@ ul.icons {
   }
 }
 
-.btn.btn-small {
+.btn.btn-small, .button.small {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
@@ -258,9 +258,9 @@ ul.icons {
 
 @-moz-document url-prefix() {
   .icon-spin { height: .9em; }
-  .btn .icon-spin { height: auto; }
+  .btn .icon-spin, .button .icon-spin { height: auto; }
   .icon-spin.icon-large { height: 1.25em; }
-  .btn .icon-spin.icon-large { height: .75em; }
+  .btn .icon-spin.icon-large, .button .icon-spin.icon-large { height: .75em; }
 }
 
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen