Merge pull request #169 from eidsonator/master. Fixes #168

Fix for icons missing from scss and build process improvements

README.md

@@ -78,7 +78,7 @@ to the `dependencies` in your `component.json`.
 From the root of the repository, install the tools used to develop.
 
     $ bundle install
-    $ npm install
+    $ npm ci
 
 Build the font:
 

less/font-awesome.less

@@ -1,18 +0,0 @@
-/*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
- */
-
-@import "variables.less";
-@import "mixins.less";
-@import "path.less";
-@import "core.less";
-@import "larger.less";
-@import "fixed-width.less";
-@import "list.less";
-@import "bordered-pulled.less";
-@import "animated.less";
-@import "rotated-flipped.less";
-@import "stacked.less";
-@import "icons.less";
-@import "screen-reader.less";

src/doc/Makefile

@@ -23,6 +23,10 @@ SITE_LESS = ${SITE_LESS_DIRECTORY}/site.less
 SITE_CSS = ${SITE_CSS_DIRECTORY}/site.css
 
 build:
+	@echo "Cleaning build dirs"
+	rm -rf ./less/
+	rm -rf ./scss/
+
 	@echo "Compiling Less files"
 	@mkdir -p ${FA_CSS_DIRECTORY}
 
@@ -36,7 +40,23 @@ build:
 
 	@echo "Moving CSS, LESS & SASS to /"
 	mv ${FA_SCSS_DIRECTORY}/fork-awesome.scss.txt ${FA_SCSS_DIRECTORY}/fork-awesome.scss
-	cp -r ${FA_ROOT_DIRECTORY}/ ../
+
+	mv ${FA_SCSS_DIRECTORY}/animated.scss.txt ${FA_SCSS_DIRECTORY}/_animated.scss
+	mv ${FA_SCSS_DIRECTORY}/bordered-pulled.scss.txt ${FA_SCSS_DIRECTORY}/_bordered-pulled.scss
+	mv ${FA_SCSS_DIRECTORY}/core.scss.txt ${FA_SCSS_DIRECTORY}/_core.scss
+	mv ${FA_SCSS_DIRECTORY}/fixed-width.scss.txt ${FA_SCSS_DIRECTORY}/_fixed-width.scss
+	mv ${FA_SCSS_DIRECTORY}/functions.scss.txt ${FA_SCSS_DIRECTORY}/_functions.scss
+	mv ${FA_SCSS_DIRECTORY}/icons.scss.txt ${FA_SCSS_DIRECTORY}/_icons.scss
+	mv ${FA_SCSS_DIRECTORY}/larger.scss.txt ${FA_SCSS_DIRECTORY}/_larger.scss
+	mv ${FA_SCSS_DIRECTORY}/list.scss.txt ${FA_SCSS_DIRECTORY}/_list.scss
+	mv ${FA_SCSS_DIRECTORY}/mixins.scss.txt ${FA_SCSS_DIRECTORY}/_mixins.scss
+	mv ${FA_SCSS_DIRECTORY}/path.scss.txt ${FA_SCSS_DIRECTORY}/_path.scss
+	mv ${FA_SCSS_DIRECTORY}/rotated-flipped.scss.txt ${FA_SCSS_DIRECTORY}/_rotated-flipped.scss
+	mv ${FA_SCSS_DIRECTORY}/screen-reader.scss.txt ${FA_SCSS_DIRECTORY}/_screen-reader.scss
+	mv ${FA_SCSS_DIRECTORY}/stacked.scss.txt ${FA_SCSS_DIRECTORY}/_stacked.scss
+	mv ${FA_SCSS_DIRECTORY}/variables.scss.txt ${FA_SCSS_DIRECTORY}/_variables.scss
+
+	cp -r ${FA_ROOT_DIRECTORY}/* ../
 
 	@echo "Moving font files to assets"
 	cp -r "../fonts" ${FA_ROOT_DIRECTORY}/

src/doc/README.md-nobuild

@@ -80,7 +80,7 @@ to the `dependencies` in your `component.json`.
 From the root of the repository, install the tools used to develop.
 
     $ bundle install
-    $ npm install
+    $ npm ci
 
 Build the font: