Solves bug with CSS, LESS & SCSS where not updated anymore

davidbenque · Feb 23, 2018 · f116949 · f116949
1 parent 924196b
commit f116949
Show file tree

Hide file tree

Showing 12 changed files with 41 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Changelog
 
 ## Changelog of Fork awesome
+- v1.0.5
+  - Solves a bug where CSS, LESS & SCSS folder were not updated
 - v1.0.4
   - Some build process changes
   - Adds a SVG template file in src/icons for better icon placement and sizing comparison

diff --git a/_config.yml b/_config.yml
@@ -21,10 +21,10 @@ icon_destination: icon         # Relative to destination
 forkawesome:
   name:           Fork Awesome
   tagline:        A fork of the iconic font and CSS toolkit
-  version:        1.0.4
+  version:        1.0.5
   minor_version:  1.0
   major_version:  1
-  doc_blob:       v1.0.4
+  doc_blob:       v1.0.5
   url:            http://forkawesome.github.com/Fork-Awesome/
   legacy_url:     http://forkawesome.github.com/Fork-Awesome/
   css_prefix:     fa

diff --git a/css/fork-awesome.css b/css/fork-awesome.css
@@ -1,13 +1,13 @@
 /*!
- *  Fork Awesome 1.0.3, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/
+ *  Fork Awesome 1.0.4, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/
  *  License - http://forkawesome.github.com/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'ForkAwesome';
-  src: url('../fonts/forkawesome-webfont.eot?v=1.0.3');
-  src: url('../fonts/forkawesome-webfont.eot?#iefix&v=1.0.3') format('embedded-opentype'), url('../fonts/forkawesome-webfont.woff2?v=1.0.3') format('woff2'), url('../fonts/forkawesome-webfont.woff?v=1.0.3') format('woff'), url('../fonts/forkawesome-webfont.ttf?v=1.0.3') format('truetype'), url('../fonts/forkawesome-webfont.svg?v=1.0.3#forkawesomeregular') format('svg');
+  src: url('../fonts/forkawesome-webfont.eot?v=1.0.4');
+  src: url('../fonts/forkawesome-webfont.eot?#iefix&v=1.0.4') format('embedded-opentype'), url('../fonts/forkawesome-webfont.woff2?v=1.0.4') format('woff2'), url('../fonts/forkawesome-webfont.woff?v=1.0.4') format('woff'), url('../fonts/forkawesome-webfont.ttf?v=1.0.4') format('truetype'), url('../fonts/forkawesome-webfont.svg?v=1.0.4#forkawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -2361,6 +2361,15 @@
 .fa-snowdrift:before {
   content: "\f2f1";
 }
+.fa-activitypub:before {
+  content: "\f2f2";
+}
+.fa-ethereum:before {
+  content: "\f2f3";
+}
+.fa-keybase:before {
+  content: "\f2f4";
+}
 .sr-only {
   position: absolute;
   width: 1px;

diff --git a/css/fork-awesome.min.css b/css/fork-awesome.min.css
diff --git a/less/fork-awesome.less b/less/fork-awesome.less
@@ -1,5 +1,5 @@
 /*!
- *  Fork Awesome 1.0.3, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/
+ *  Fork Awesome 1.0.4, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/
  *  License - http://forkawesome.github.com/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 

diff --git a/less/icons.less b/less/icons.less
@@ -804,3 +804,6 @@
 .@{fa-css-prefix}-discord-alt:before { content: @fa-var-discord-alt; }
 .@{fa-css-prefix}-patreon:before { content: @fa-var-patreon; }
 .@{fa-css-prefix}-snowdrift:before { content: @fa-var-snowdrift; }
+.@{fa-css-prefix}-activitypub:before { content: @fa-var-activitypub; }
+.@{fa-css-prefix}-ethereum:before { content: @fa-var-ethereum; }
+.@{fa-css-prefix}-keybase:before { content: @fa-var-keybase; }
diff --git a/less/variables.less b/less/variables.less
@@ -6,12 +6,13 @@
 @fa-line-height-base: 1;
 @fa-css-prefix:       fa;
 @fa-font-family:      ForkAwesome;
-@fa-version:          "1.0.3";
+@fa-version:          "1.0.4";
 @fa-border-color:     #eee;
 @fa-inverse:          #fff;
 @fa-li-width:         (30em / 14);
 
 @fa-var-500px: "\f26e";
+@fa-var-activitypub: "\f2f2";
 @fa-var-address-book: "\f2b9";
 @fa-var-address-book-o: "\f2ba";
 @fa-var-address-card: "\f2bb";
@@ -245,6 +246,7 @@
 @fa-var-envelope-square: "\f199";
 @fa-var-envira: "\f299";
 @fa-var-eraser: "\f12d";
+@fa-var-ethereum: "\f2f3";
 @fa-var-etsy: "\f2d7";
 @fa-var-eur: "\f153";
 @fa-var-euro: "\f153";
@@ -414,6 +416,7 @@
 @fa-var-jpy: "\f157";
 @fa-var-jsfiddle: "\f1cc";
 @fa-var-key: "\f084";
+@fa-var-keybase: "\f2f4";
 @fa-var-keyboard-o: "\f11c";
 @fa-var-krw: "\f159";
 @fa-var-language: "\f1ab";

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "fork-awesome",
   "description": "A fork of the iconic font and CSS framework",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "style": "css/fork-awesome.css",
   "keywords": [
     "font",

diff --git a/scss/_icons.scss b/scss/_icons.scss
@@ -804,3 +804,6 @@
 .#{$fa-css-prefix}-discord-alt:before { content: $fa-var-discord-alt; }
 .#{$fa-css-prefix}-patreon:before { content: $fa-var-patreon; }
 .#{$fa-css-prefix}-snowdrift:before { content: $fa-var-snowdrift; }
+.#{$fa-css-prefix}-activitypub:before { content: $fa-var-activitypub; }
+.#{$fa-css-prefix}-ethereum:before { content: $fa-var-ethereum; }
+.#{$fa-css-prefix}-keybase:before { content: $fa-var-keybase; }
diff --git a/scss/_variables.scss b/scss/_variables.scss
@@ -13,6 +13,7 @@ $fa-inverse:          #fff !default;
 $fa-li-width:         (30em / 14) !default;
 
 $fa-var-500px: "\f26e";
+$fa-var-activitypub: "\f2f2";
 $fa-var-address-book: "\f2b9";
 $fa-var-address-book-o: "\f2ba";
 $fa-var-address-card: "\f2bb";
@@ -246,6 +247,7 @@ $fa-var-envelope-open-o: "\f2b7";
 $fa-var-envelope-square: "\f199";
 $fa-var-envira: "\f299";
 $fa-var-eraser: "\f12d";
+$fa-var-ethereum: "\f2f3";
 $fa-var-etsy: "\f2d7";
 $fa-var-eur: "\f153";
 $fa-var-euro: "\f153";
@@ -415,6 +417,7 @@ $fa-var-joomla: "\f1aa";
 $fa-var-jpy: "\f157";
 $fa-var-jsfiddle: "\f1cc";
 $fa-var-key: "\f084";
+$fa-var-keybase: "\f2f4";
 $fa-var-keyboard-o: "\f11c";
 $fa-var-krw: "\f159";
 $fa-var-language: "\f1ab";

diff --git a/scss/fork-awesome.scss b/scss/fork-awesome.scss
@@ -1,5 +1,5 @@
 /*!
- *  Fork Awesome 1.0.3, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/
+ *  Fork Awesome 1.0.4, originaly by Dave Gandy - http://forkawesome.github.com/Fork-Awesome/
  *  License - http://forkawesome.github.com/Fork-Awesome//license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 

diff --git a/src/doc/Makefile b/src/doc/Makefile
@@ -29,8 +29,13 @@ build:
 
 	bundle exec lessc --clean-css="--compatibility=ie8" ${SITE_LESS} > ${SITE_CSS}
 
-	@echo "Moving font files and README"
-	cp -r ../fonts ${FA_ROOT_DIRECTORY}/ 
+	@echo "Moving CSS, LESS & SASS to /"
+	cp -r ${FA_ROOT_DIRECTORY}/ ../
+
+	@echo "Moving font files to assets"
+	cp -r ../fonts ${FA_ROOT_DIRECTORY}/
+
+	@echo "Updating Readme"
 	mv README.md-nobuild ../README.md
 
 	@echo "Generating zip file"