Browse Source

Building with the new name and updated packages

Julien Deswaef 7 years ago
parent
commit
128dcbeef5

+ 5 - 1
README.md

@@ -74,6 +74,10 @@ Build the project and documentation:
 
     $ npm run build
 
-Or serve it on a local server on http://localhost:7998/Fork-Awesome/:
+Or serve it on a local server on (http://localhost:7998/Fork-Awesome/):
 
     $ npm run dev
+
+To deploy the project and documentation on GH pages:
+
+    $ jgd -n

+ 2 - 22
_config.yml

@@ -20,13 +20,13 @@ icon_destination: icon         # Relative to destination
 
 forkawesome:
   name:           Fork Awesome
+  tagline:        A fork of the iconic font and CSS toolkit
   version:        0.4.7
   minor_version:  0.4
   major_version:  0
   doc_blob:       v0.4.7
   url:            http://forkawesome.github.com/Fork-Awesome/
   legacy_url:     http://forkawesome.github.com/Fork-Awesome/
-  tagline:        A fork of the iconic font and CSS toolkit
   css_prefix:     fa
   font_family:    ForkAwesome
   github:
@@ -45,17 +45,7 @@ forkawesome:
       url:          http://creativecommons.org/licenses/by/3.0/
 
 fontawesome:
-  version:        4.7.0
-  minor_version:  4.7
-  major_version:  4
-  doc_blob:       v4.7.0
-  url:            http://fontawesome.io
-  legacy_url:     http://fortawesome.github.com/Font-Awesome/
-  blog_url:       http://articles.fortawesome.com
-  twitter:        fontawesome
-  tagline:        The iconic font and CSS toolkit
-  css_prefix:     fa
-  font_family:    FontAwesome
+  url:            http://fontawesome.com
   author:
     name:         Dave Gandy
     email:        dave@fontawesome.io
@@ -65,16 +55,6 @@ fontawesome:
     url:          https://github.com/FortAwesome/Font-Awesome
     project:      Font-Awesome
     org:          FortAwesome
-  license:
-    font:
-      version:      SIL OFL 1.1
-      url:          http://scripts.sil.org/OFL
-    code:
-      version:      MIT License
-      url:          http://opensource.org/licenses/mit-license.html
-    documentation:
-      version:      CC BY 3.0
-      url:          http://creativecommons.org/licenses/by/3.0/
 
 bootstrap:
   version:        3.3.5

+ 2 - 2
css/fork-awesome.css

@@ -1,6 +1,6 @@
 /*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ *  Fork Awesome 0.4.7, 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
  * -------------------------- */

File diff suppressed because it is too large
+ 2 - 2342
css/fork-awesome.min.css


+ 3 - 2
less/fork-awesome.less

@@ -1,8 +1,9 @@
 /*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ *  Fork Awesome 0.4.7, 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)
  */
 
+
 @import "variables.less";
 @import "mixins.less";
 @import "path.less";

+ 57 - 0
package-lock.json

@@ -0,0 +1,57 @@
+{
+  "name": "fork-awesome",
+  "version": "4.7.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true
+    },
+    "clean-css": {
+      "version": "3.4.28",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
+      "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
+      "dev": true,
+      "requires": {
+        "commander": "2.8.1",
+        "source-map": "0.4.4"
+      }
+    },
+    "commander": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+      "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+      "dev": true,
+      "requires": {
+        "graceful-readlink": "1.0.1"
+      }
+    },
+    "graceful-readlink": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+      "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
+      "dev": true
+    },
+    "less-plugin-clean-css": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz",
+      "integrity": "sha1-zFeveqM5iVflbezr5jy2DCNClwM=",
+      "dev": true,
+      "requires": {
+        "clean-css": "3.4.28"
+      }
+    },
+    "source-map": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+      "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+      "dev": true,
+      "requires": {
+        "amdefine": "1.0.1"
+      }
+    }
+  }
+}

+ 12 - 4
package.json

@@ -3,10 +3,16 @@
   "description": "A fork of the iconic font and CSS framework",
   "version": "4.7.0",
   "style": "css/font-awesome.css",
-  "keywords": ["font", "awesome", "fontawesome", "icon", "bootstrap"],
+  "keywords": [
+    "font",
+    "awesome",
+    "fontawesome",
+    "icon",
+    "bootstrap"
+  ],
   "homepage": "",
   "bugs": {
-    "url" : "http://github.com/ForkAwesome/Fork-Awesome/issues"
+    "url": "http://github.com/ForkAwesome/Fork-Awesome/issues"
   },
   "author": {
     "name": "Dave Gandy",
@@ -36,13 +42,15 @@
     }
   ],
   "license": "(OFL-1.1 AND MIT)",
-  "dependencies": {
-  },
+  "dependencies": {},
   "engines": {
     "node": ">=0.10.3"
   },
   "scripts": {
     "build": "bundle exec jekyll build",
     "dev": "bundle exec jekyll -w serve"
+  },
+  "devDependencies": {
+    "less-plugin-clean-css": "^1.5.1"
   }
 }

+ 3 - 2
scss/fork-awesome.scss

@@ -1,8 +1,9 @@
 /*!
- *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
- *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
+ *  Fork Awesome 0.4.7, 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)
  */
 
+
 @import "variables";
 @import "mixins";
 @import "path";

+ 2 - 2
src/Makefile

@@ -24,10 +24,10 @@ build:
 	@mkdir -p ${FA_CSS_DIRECTORY}
 
 	bundle exec lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN}
-	bundle exec lessc ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN}
+	bundle exec lessc --clean-css="--compatibility=ie8" ${FA_LESS_MODERN} > ${FA_CSS_MODERN_MIN}
 #	sass ${FA_SCSS_MODERN} ${FA_CSS_MODERN}
 
-	bundle exec lessc  ${SITE_LESS} > ${SITE_CSS}
+	bundle exec lessc --clean-css="--compatibility=ie8" ${SITE_LESS} > ${SITE_CSS}
 	cp -r ${FA_ROOT_DIRECTORY}/* ../
 	mv README.md-nobuild ../README.md
 	cd assets && mv fork-awesome fork-awesome-{{ site.forkawesome.version }} && zip -r9 fork-awesome-{{ site.forkawesome.version }}.zip fork-awesome-{{ site.forkawesome.version }} && mv fork-awesome-{{ site.forkawesome.version }} fork-awesome

+ 5 - 1
src/README.md-nobuild

@@ -76,6 +76,10 @@ Build the project and documentation:
 
     $ npm run build
 
-Or serve it on a local server on http://localhost:7998/Fork-Awesome/:
+Or serve it on a local server on (http://localhost:7998/Fork-Awesome/):
 
     $ npm run dev
+
+To deploy the project and documentation on GH pages:
+
+    $ jgd -n

+ 3 - 3
src/_includes/code/license.css

@@ -1,4 +1,4 @@
 /*!
- *  Font Awesome {{ site.fontawesome.version }} by @{{ site.fontawesome.author.twitter }} - {{ site.fontawesome.url }} - @{{ site.fontawesome.twitter }}
- *  License - {{ site.fontawesome.url }}/license (Font: {{ site.fontawesome.license.font.version }}, CSS: {{ site.fontawesome.license.code.version }})
- */
+ *  {{ site.forkawesome.name }} {{ site.forkawesome.version }}, originaly by {{ site.fontawesome.author.name }} - {{ site.forkawesome.url }}
+ *  License - {{ site.forkawesome.url }}/license (Font: {{ site.forkawesome.license.font.version }}, CSS: {{ site.forkawesome.license.code.version }})
+ */

+ 3 - 3
src/_includes/icons/new.html

@@ -1,14 +1,14 @@
 <section id="new">
-  <h2 class="page-header">{{ icons | version:site.fontawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}</h2>
+  <h2 class="page-header">{{ icons | version:site.forkawesome.minor_version | size }} New Icons in {{ site.forkawesome.minor_version }}</h2>
   {% if page.navbar_active != "icons" %}
     <div class="margin-botom-large">
-      You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.minor_version | size }} shiny new icons in version {{ site.fontawesome.minor_version }}.
+      You asked, {{ site.forkawesome.name }} delivers with {{ icons | version:site.forkawesome.minor_version | size }} shiny new icons in version {{ site.forkawesome.minor_version }}.
       Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
     </div>
   {% endif %}
 
   <div class="row fontawesome-icon-list">
-    {% assign icons_new = icons | expand_aliases | version:site.fontawesome.minor_version | sort_by:'class' %}
+    {% assign icons_new = icons | expand_aliases | version:site.forkawesome.minor_version | sort_by:'class' %}
 
     {% for icon in icons_new %}
       <div class="fa-hover col-md-3 col-sm-4"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="fa fa-{{ icon.class }}" aria-hidden="true"></i> <span class="sr-only">Example of </span>{{ icon.class }}{% if icon.alias_of %} <span class="text-muted">(alias)</span>{% endif %}</a></div>

+ 1 - 10
src/icons.html

@@ -5,20 +5,11 @@ navbar_active: icons
 relative_path: ../
 ---
 {% capture jumbotron_h1 %}<i class="fa fa-flag" aria-hidden="true"></i>&nbsp; The Icons{% endcapture %}
-{% capture jumbotron_p %}The complete set of {{ icons | size }} icons in Font Awesome {{ site.fontawesome.version }}{% endcapture %}
+{% capture jumbotron_p %}The complete set of {{ icons | size }} icons in {{ site.forkawesome.name }} {{ site.forkawesome.version }}{% endcapture %}
 
 {% include jumbotron.html %}
 
 <div class="container" data-view="search">
-  {% capture stripe_ad_content %}
-  <p class="lead">
-    You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.minor_version | size }} shiny new icons in version {{ site.fontawesome.minor_version }}.
-    Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
-    <!--The ever-expanding list of Font Awesome {{ site.fontawesome.version }} icons.-->
-    Need vectors or want to use on the desktop? Check the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.
-  </p>
-  {% endcapture %}
-
   <div class="row">
     <div class="col-sm-10">
       <section id="search">

Some files were not shown because too many files changed in this diff