Merge branch 'css-template'

fonts/forkawesome-webfont.svg

@@ -1,12 +1,12 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!--
-2018-2-21: Created with FontForge (http://fontforge.org)
+2018-2-22: Created with FontForge (http://fontforge.org)
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20170731 at Wed Feb 21 16:50:23 2018
- By Micah Ilbery,,,
+Created by FontForge 20170925 at Thu Feb 22 17:31:53 2018
+ By Julien Deswaef
 The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io
 </metadata>
 <defs>

src/doc/Makefile

@@ -29,8 +29,8 @@ build:
 
 	bundle exec lessc --clean-css="--compatibility=ie8" ${SITE_LESS} > ${SITE_CSS}
 
-	@echo "Moving font filse and README"
-	cp -r ${FA_ROOT_DIRECTORY}/* ../
+	@echo "Moving font files and README"
+	cp -r ../fonts ${FA_ROOT_DIRECTORY}/ 
 	mv README.md-nobuild ../README.md
 
 	@echo "Generating zip file"

src/icons/.fontcustom-manifest.json

@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "d4070ad39f365ffdf43edf72ca8d7577906d72be6727b4673d3a49a3812910f7",
-    "current": "d4070ad39f365ffdf43edf72ca8d7577906d72be6727b4673d3a49a3812910f7"
+    "previous": "58ca894ed710c44aeaf100d90dec2ebb2bfe2ea5aa4975cf0123efe7cce0c69d",
+    "current": "58ca894ed710c44aeaf100d90dec2ebb2bfe2ea5aa4975cf0123efe7cce0c69d"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",

src/icons/Makefile

@@ -1,5 +1,4 @@
 FA_ROOT_FONTS_DIR = ../../fonts
-FA_DOC_ASSETS_DIR = ../doc/assets/fork-awesome/fonts
 FA_FONTCUSTOM_OUTPUT_DIR = ./forkawesome
 
 build:
@@ -9,13 +8,6 @@ build:
 	@echo "Compiling Icons into a ForkAwesome fonts..."
 	bundle exec fontcustom compile
 
-	@echo "Copying builds to Doc folder..."
-	cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.eot ${FA_DOC_ASSETS_DIR}/forkawesome-webfont.eot
-	cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.svg ${FA_DOC_ASSETS_DIR}/forkawesome-webfont.svg
-	cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.ttf ${FA_DOC_ASSETS_DIR}/forkawesome-webfont.ttf
-	cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.woff ${FA_DOC_ASSETS_DIR}/forkawesome-webfont.woff
-	cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.woff2 ${FA_DOC_ASSETS_DIR}/forkawesome-webfont.woff2
-
 	@echo "Copying builds to root folder (package release)..."
 	cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.eot ${FA_ROOT_FONTS_DIR}/forkawesome-webfont.eot
 	cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.svg ${FA_ROOT_FONTS_DIR}/forkawesome-webfont.svg