From 38dbd4ae860d408f8e793203cfe5c237864ed130 Mon Sep 17 00:00:00 2001
From: davegandy <dave@davegandy.com>
Date: Tue, 1 Oct 2013 21:08:49 -0400
Subject: [PATCH] renaming font directory to fonts

---
 css/font-awesome.css                                |   4 ++--
 css/font-awesome.min.css                            |   2 +-
 {font => fonts}/FontAwesome.otf                     | Bin
 {font => fonts}/fontawesome-webfont.eot             | Bin
 {font => fonts}/fontawesome-webfont.svg             |   0
 {font => fonts}/fontawesome-webfont.ttf             | Bin
 {font => fonts}/fontawesome-webfont.woff            | Bin
 less/variables.less                                 |   2 +-
 .../font-awesome/{font => fonts}/FontAwesome.otf    | Bin
 .../{font => fonts}/fontawesome-webfont.eot         | Bin
 .../{font => fonts}/fontawesome-webfont.svg         |   0
 .../{font => fonts}/fontawesome-webfont.ttf         | Bin
 .../{font => fonts}/fontawesome-webfont.woff        | Bin
 src/assets/font-awesome/less/variables.less         |   2 +-
 14 files changed, 5 insertions(+), 5 deletions(-)
 rename {font => fonts}/FontAwesome.otf (100%)
 rename {font => fonts}/fontawesome-webfont.eot (100%)
 rename {font => fonts}/fontawesome-webfont.svg (100%)
 rename {font => fonts}/fontawesome-webfont.ttf (100%)
 rename {font => fonts}/fontawesome-webfont.woff (100%)
 rename src/assets/font-awesome/{font => fonts}/FontAwesome.otf (100%)
 rename src/assets/font-awesome/{font => fonts}/fontawesome-webfont.eot (100%)
 rename src/assets/font-awesome/{font => fonts}/fontawesome-webfont.svg (100%)
 rename src/assets/font-awesome/{font => fonts}/fontawesome-webfont.ttf (100%)
 rename src/assets/font-awesome/{font => fonts}/fontawesome-webfont.woff (100%)

diff --git a/css/font-awesome.css b/css/font-awesome.css
index ba1c8a710..d3379432c 100644
--- a/css/font-awesome.css
+++ b/css/font-awesome.css
@@ -27,8 +27,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../font/fontawesome-webfont.eot?v=4.0.0');
-  src: url('../font/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=4.0.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=4.0.0') format('truetype'), url('../font/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.0.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css
index f82670191..e2bace081 100644
--- a/css/font-awesome.min.css
+++ b/css/font-awesome.min.css
@@ -1,4 +1,4 @@
-@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=4.0.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=4.0.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=4.0.0') format('truetype'),url('../font/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal;}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}
+@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.0.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal;}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;}
 .fa-lg{font-size:1.3333333333333333em;vertical-align:-10%;line-height:0.75em;}
 .fa.fa-fixed-width{display:inline-block;width:1.1428571428571428em;padding-right:0.2857142857142857em;text-align:right;}.fa.fa-fixed-width.fa-lg{width:1.4285714285714286em;}
 .fa-ul{padding-left:0;margin-left:2.142857142857143em;list-style-type:none;}.fa-ul>li{position:relative;}
diff --git a/font/FontAwesome.otf b/fonts/FontAwesome.otf
similarity index 100%
rename from font/FontAwesome.otf
rename to fonts/FontAwesome.otf
diff --git a/font/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot
similarity index 100%
rename from font/fontawesome-webfont.eot
rename to fonts/fontawesome-webfont.eot
diff --git a/font/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg
similarity index 100%
rename from font/fontawesome-webfont.svg
rename to fonts/fontawesome-webfont.svg
diff --git a/font/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from font/fontawesome-webfont.ttf
rename to fonts/fontawesome-webfont.ttf
diff --git a/font/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff
similarity index 100%
rename from font/fontawesome-webfont.woff
rename to fonts/fontawesome-webfont.woff
diff --git a/less/variables.less b/less/variables.less
index 46fba0fd3..c7eaea0a9 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -1,7 +1,7 @@
 // Variables
 // --------------------------
 
-@FontAwesomePath:    "../font";
+@FontAwesomePath:    "../fonts";
 //@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/4.0.0/font"; // for referencing Bootstrap CDN font files directly
 @FontAwesomeVersion: "4.0.0";
 @borderColor:        #eee;
diff --git a/src/assets/font-awesome/font/FontAwesome.otf b/src/assets/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from src/assets/font-awesome/font/FontAwesome.otf
rename to src/assets/font-awesome/fonts/FontAwesome.otf
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.eot b/src/assets/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from src/assets/font-awesome/font/fontawesome-webfont.eot
rename to src/assets/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.svg b/src/assets/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from src/assets/font-awesome/font/fontawesome-webfont.svg
rename to src/assets/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.ttf b/src/assets/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from src/assets/font-awesome/font/fontawesome-webfont.ttf
rename to src/assets/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/src/assets/font-awesome/font/fontawesome-webfont.woff b/src/assets/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from src/assets/font-awesome/font/fontawesome-webfont.woff
rename to src/assets/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/src/assets/font-awesome/less/variables.less b/src/assets/font-awesome/less/variables.less
index 3cb4b616a..8eb4d04bf 100644
--- a/src/assets/font-awesome/less/variables.less
+++ b/src/assets/font-awesome/less/variables.less
@@ -3,7 +3,7 @@
 // Variables
 // --------------------------
 
-@FontAwesomePath:    "../font";
+@FontAwesomePath:    "../fonts";
 //@FontAwesomePath:    "//netdna.bootstrapcdn.com/font-awesome/{{ site.fontawesome.version}}/font"; // for referencing Bootstrap CDN font files directly
 @FontAwesomeVersion: "{{ site.fontawesome.version }}";
 @borderColor:        #eee;