diff --git a/fonts/forkawesome-webfont.eot b/fonts/forkawesome-webfont.eot index 197d57716..467121476 100644 Binary files a/fonts/forkawesome-webfont.eot and b/fonts/forkawesome-webfont.eot differ diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg index ba1d5bb36..82005d477 100644 --- a/fonts/forkawesome-webfont.svg +++ b/fonts/forkawesome-webfont.svg @@ -1,12 +1,12 @@ -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 diff --git a/fonts/forkawesome-webfont.ttf b/fonts/forkawesome-webfont.ttf index 246b13590..ae45e46ef 100644 Binary files a/fonts/forkawesome-webfont.ttf and b/fonts/forkawesome-webfont.ttf differ diff --git a/fonts/forkawesome-webfont.woff b/fonts/forkawesome-webfont.woff index b9c101112..ebf504c8f 100644 Binary files a/fonts/forkawesome-webfont.woff and b/fonts/forkawesome-webfont.woff differ diff --git a/fonts/forkawesome-webfont.woff2 b/fonts/forkawesome-webfont.woff2 index ef21bd6d4..6af59f96d 100644 Binary files a/fonts/forkawesome-webfont.woff2 and b/fonts/forkawesome-webfont.woff2 differ diff --git a/src/doc/Makefile b/src/doc/Makefile index 3f8e3f74c..4ab6921e5 100644 --- a/src/doc/Makefile +++ b/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" diff --git a/src/doc/assets/fork-awesome/fonts/ForkAwesome.otf b/src/doc/assets/fork-awesome/fonts/ForkAwesome.otf deleted file mode 100644 index c8efe6c42..000000000 Binary files a/src/doc/assets/fork-awesome/fonts/ForkAwesome.otf and /dev/null differ diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot deleted file mode 100644 index 197d57716..000000000 Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.eot and /dev/null differ diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg deleted file mode 100644 index ba1d5bb36..000000000 --- a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg +++ /dev/null @@ -1,2599 +0,0 @@ - - - - - -Created by FontForge 20170731 at Wed Feb 21 16:50:23 2018 - By Micah Ilbery,,, -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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf deleted file mode 100644 index 246b13590..000000000 Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.ttf and /dev/null differ diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff deleted file mode 100644 index b9c101112..000000000 Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff and /dev/null differ diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 deleted file mode 100644 index ef21bd6d4..000000000 Binary files a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.woff2 and /dev/null differ diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json index 1e7ab6320..dd01fe9a1 100644 --- a/src/icons/.fontcustom-manifest.json +++ b/src/icons/.fontcustom-manifest.json @@ -1,7 +1,7 @@ { "checksum": { - "previous": "d4070ad39f365ffdf43edf72ca8d7577906d72be6727b4673d3a49a3812910f7", - "current": "d4070ad39f365ffdf43edf72ca8d7577906d72be6727b4673d3a49a3812910f7" + "previous": "58ca894ed710c44aeaf100d90dec2ebb2bfe2ea5aa4975cf0123efe7cce0c69d", + "current": "58ca894ed710c44aeaf100d90dec2ebb2bfe2ea5aa4975cf0123efe7cce0c69d" }, "fonts": [ "forkawesome/forkawesome.ttf", diff --git a/src/icons/Makefile b/src/icons/Makefile index ff175c54f..f3f945e6c 100644 --- a/src/icons/Makefile +++ b/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 @@ -24,7 +16,7 @@ build: cp ${FA_FONTCUSTOM_OUTPUT_DIR}/forkawesome.woff2 ${FA_ROOT_FONTS_DIR}/forkawesome-webfont.woff2 @echo "done." - + default: build