diff --git a/_config.yml b/_config.yml
index 18129a1fc..d4099d787 100644
--- a/_config.yml
+++ b/_config.yml
@@ -15,8 +15,8 @@ include: [_*.scss]
# used in building icon pages
icon_meta: src/icons.yml
-icon_layout: icon.html # Relative to _layouts directory
-icon_destination: icon # Relative to destination
+icon_layout: redirect.html # Relative to _layouts directory
+icon_destination: icon # Relative to destination
fontawesome:
version: 4.7.0
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 000000000..cee2ee568
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,5 @@
+{
+ "name": "font-awesome",
+ "version": "4.7.0",
+ "lockfileVersion": 1
+}
diff --git a/src/_layouts/redirect.html b/src/_layouts/redirect.html
new file mode 100644
index 000000000..822cad328
--- /dev/null
+++ b/src/_layouts/redirect.html
@@ -0,0 +1,11 @@
+
+
+
+ Redirecting…
+
+
+
+
Redirecting…
+ Click here if you are not redirected.
+
+
diff --git a/src/_plugins/icon_page_generator.rb b/src/_plugins/icon_page_generator.rb
index 32b7cd428..f84f49667 100644
--- a/src/_plugins/icon_page_generator.rb
+++ b/src/_plugins/icon_page_generator.rb
@@ -2,6 +2,7 @@
# Create individual pages for each icon in the FontAwesome set
require 'yaml'
+require 'json'
module Jekyll
@@ -10,19 +11,17 @@ module Jekyll
##
# Take a single icon and render a page for it.
- def initialize(site, base, dir, icon)
+ def initialize(site, base, dir, old_icon_name, new_icon_name, new_icon_style)
@site = site
@base = base
@dir = dir
- @name = "#{icon.id}.html"
- @icon = icon
+ @name = "#{old_icon_name}.html"
self.process(@name)
self.read_yaml(File.join(base, site.config['layouts']), site.config['icon_layout'])
- self.data['icon'] = icon
- self.data['title'] = "fa-#{icon.id}: " + self.data['title_suffix']
+ self.data['redirect_to'] = "https://fontawesome.com/icons/#{new_icon_name}?style=#{new_icon_style}"
end
end
@@ -35,8 +34,35 @@ module Jekyll
safe true
def generate(site)
+ styles = {
+ 'fas' => 'solid',
+ 'far' => 'regular',
+ 'fal' => 'light',
+ 'fab' => 'brands'
+ }
+
+ shims = JSON.load(File.open(File.join(site.source, 'shims.json')))
+
+ lookup = shims.inject({}) do |acc, shim|
+ old_name = shim[0]
+ new_prefix = shim[1] || 'fas'
+ new_name = shim[2] || old_name
+
+ acc[shim[0]] = { new_name: new_name, style: styles[new_prefix] }
+
+ acc
+ end
+
site.icons.each do |icon|
- site.pages << IconPage.new(site, site.source, site.config['icon_destination'], icon)
+ if lookup.has_key? icon.id
+ new_icon_name = lookup[icon.id][:new_name]
+ new_icon_style = lookup[icon.id][:style]
+ else
+ new_icon_name = icon.id
+ new_icon_style = "solid"
+ end
+
+ site.pages << IconPage.new(site, site.source, site.config['icon_destination'], icon.id, new_icon_name, new_icon_style)
end
end
diff --git a/src/accessibility.html b/src/accessibility.html
index f201921ab..0fd654b1f 100644
--- a/src/accessibility.html
+++ b/src/accessibility.html
@@ -1,39 +1,4 @@
---
-layout: base
-title: Font Awesome & Accessibility
-navbar_active: accessibility
-view_class: v-accessibility
-relative_path: ../
+layout: redirect
+redirect_to: https://fontawesome.com/how-to-use/accessibility
---
-{% capture jumbotron_h1 %} Accessibility{% endcapture %}
-{% capture jumbotron_p %}Make your icons awesome for all of your users{% endcapture %}
-
-{% include jumbotron.html %}
-
-
-
-
-
-
- Icons are symbols that can convey a ton of information and really help people comprehend directions, signs, and interfaces. It's important that we create and use them so that they can reach the largest amount of people possible.
-
-
-
- {% include accessibility/background.html %}
-
-
-
-
-
- Using Font Awesome with Acessibility in mind
-
-
- {% include accessibility/accessibility-facdn.html %}
-
-
- or
-
-
- {% include accessibility/accessibility-manual.html %}
- {% include accessibility/other.html %}
-
- Print this page to PDF for the complete set of vectors. Or to use on the desktop, install FontAwesome.otf, set it as the font in your application, and copy and paste the icons (not the unicode) directly from this page into your designs.
-
diff --git a/src/community.html b/src/community.html
index be6877b97..d42f2a75a 100644
--- a/src/community.html
+++ b/src/community.html
@@ -1,34 +1,4 @@
---
-layout: base
-title: The Font Awesome Community
-navbar_active: community
-relative_path: ../
+layout: redirect
+redirect_to: https://fontawesome.com/how-to-use/community
---
-{% capture jumbotron_h1 %} Community{% endcapture %}
-{% capture jumbotron_p %}Lots of ways to get involved with Font Awesome{% endcapture %}
-
-{% include jumbotron.html %}
-{% include stripe-social.html %}
-
-
- {% endcapture %}
- {% include stripe-ad.html %}
-
- {% include community/getting-support.html %}
- {% include community/requesting-new-icons.html %}
- {% include community/reporting-bugs.html %}
- {% include community/submitting-pull-requests.html %}
- {% include community/project-milestones.html %}
-
- {% include thanks-to.html %}
- {% include tell-me-thanks.html %}
-
diff --git a/src/design.html b/src/design.html
index 9c5830d74..9cd244158 100644
--- a/src/design.html
+++ b/src/design.html
@@ -1 +1,4 @@
-
+---
+layout: redirect
+redirect_to: https://fontawesome.com/cheatsheet
+---
diff --git a/src/examples.html b/src/examples.html
index 9f14ef11b..83ffa0614 100644
--- a/src/examples.html
+++ b/src/examples.html
@@ -1,43 +1,4 @@
---
-layout: base
-title: Font Awesome Examples
-navbar_active: examples
-relative_path: ../
+layout: redirect
+redirect_to: https://fontawesome.com/how-to-use
---
-{% capture jumbotron_h1 %} Examples{% endcapture %}
-{% capture jumbotron_p %}Lots of easy ways to use Font Awesome{% endcapture %}
-
-{% include jumbotron.html %}
-{% include stripe-social.html %}
-
-
- {% capture stripe_ad_content %}
-
- After you get up and running, you can place Font Awesome icons just about
- anywhere with the <i> tag.
- Some examples appreciatively re-used from the Bootstrap documentation.
-
- We create new embed codes for each website so you can quickly upgrade and change your preferences all without ever pushing code. To do this, we need an email
- address so we know which embed codes are yours and so you can come back and manage them.
-
-
-
-
-
-
Icons on your site. Fast.
-
Don't mess with files locally or in production. You'll get all of Font Awesome's {{ icons| size }} icons plus CSS toolkit - all optimized for speed and no hassle.
-
-
-
-
Super-simple upgrades
-
Since each site gets a unique embed code, you can easily upgrade to the latest version of Font Awesome, all without pushing any code. Easy peasy.
-
-
-
-
Auto accessibility support
-
Font Awesome CDN helps you automate accessibility support more easily so your icons work for the most people possible. Read up on our accessibility best practices.
-
-
-
-
Async your icons
-
Want to speed up your page loads? So do we. Have your icons load in the background so your site loads faster.
-
-
-
-
-
- or
-
-
-
-
- Download & Customize
- Easy
-
-
-
-
-
- Want to manage and host Font Awesome assets yourself? You can
- download,
- customize, and use the icons and default styling manually. Both CSS and CSS Preprocessor (Sass and Less) formats are included.
Copy the entire font-awesome directory into your project.
-
- In the <head> of your html, reference the location to your font-awesome.min.css.
-{% highlight html %}
-
-{% endhighlight %}
-
-
Check out the examples to start using Font Awesome!
-
-
-
-
-
Using Sass or Less
-
-
Use this method to customize Font Awesome {{ site.fontawesome.version }} using Less or Sass.
-
-
Copy the font-awesome/ directory into your project.
-
- Open your project's font-awesome/less/variables.less or font-awesome/scss/_variables.scss and edit the @fa-font-path or $fa-font-path
- variable to point to your font directory.
-{% highlight scss %}
-@fa-font-path: "../font";
-{% endhighlight %}
-
The font path is relative from your compiled CSS directory.
-
-
Re-compile your Less or Sass if using a static compiler. Otherwise, you should be good to go.
-
Check out the examples to start using Font Awesome!
In order to provide the best possible experience to old and buggy browsers, Font Awesome uses CSS browser hacks in several places to target special CSS to certain browser versions in order to work around bugs in the browsers themselves. These hacks understandably cause CSS validators to complain that they are invalid. In a couple places, we also use bleeding-edge CSS features that aren't yet fully standardized, but these are used purely for progressive enhancement.
-
These validation warnings don't matter in practice since the non-hacky portion of our CSS does fully validate and the hacky portions don't interfere with the proper functioning of the non-hacky portion, hence why we deliberately ignore these particular warnings.
IE8 has some issues with @font-face when combined with :before.
- Font Awesome uses that combination. If a page is cached, and loaded without the mouse over the window
- (i.e. hit the refresh button or load something in an iframe) then the page gets rendered before the font loads.
- Hovering over the page (body) will show some of the icons and hovering over the remaining icons will show those as well.
- See issue #954 for details.
- If you need IE7 support, you have my condolences. Really. Font Awesome {{ site.fontawesome.version }}
- doesn't support IE7, but an older version does. You'll need to check out the
- 3.2.1 instructions for using IE7. Then go complain to
- whoever decided your project needs IE7 support.
-
-
-{% include modals/download.html %}
diff --git a/src/icons.html b/src/icons.html
index 37b7871df..a9f641e36 100644
--- a/src/icons.html
+++ b/src/icons.html
@@ -1,97 +1,4 @@
---
-layout: base
-title: Font Awesome Icons
-navbar_active: icons
-relative_path: ../
+layout: redirect
+redirect_to: https://fontawesome.com/icons
---
-{% capture jumbotron_h1 %} The Icons{% endcapture %}
-{% capture jumbotron_p %}The complete set of {{ icons | size }} icons in Font Awesome {{ site.fontawesome.version }}{% endcapture %}
-
-{% include jumbotron.html %}
-
-
- {% capture stripe_ad_content %}
-
- 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? Here's how.
-
- Need vectors or want to use on the desktop? Check the cheatsheet.
-
- {% include icons/new.html %}
- {% include icons/web-application.html %}
- {% include icons/accessibility.html %}
- {% include icons/hand.html %}
- {% include icons/transportation.html %}
- {% include icons/gender.html %}
- {% include icons/file-type.html %}
- {% include icons/spinner.html %}
- {% include icons/form-control.html %}
- {% include icons/payment.html %}
- {% include icons/chart.html %}
- {% include icons/currency.html %}
- {% include icons/text-editor.html %}
- {% include icons/directional.html %}
- {% include icons/video-player.html %}
- {% include icons/brand.html %}
- {% include icons/medical.html %}
-
-
-
-
diff --git a/src/index.html b/src/index.html
index af1f6297d..3da236aec 100644
--- a/src/index.html
+++ b/src/index.html
@@ -1,24 +1,4 @@
---
-layout: base
-title: Font Awesome, the iconic font and CSS toolkit
-navbar_active: home
-relative_path: ./
+layout: redirect
+redirect_to: https://fontawesome.com
---
-
-{% include jumbotron-carousel.html %}
-{% include stripe-social.html %}
-
-
- {% capture stripe_ad_content %}
-
- Font Awesome gives you scalable vector icons that can instantly be customized — size, color, drop shadow,
- and anything that can be done with the power of CSS.
-
- {% endcapture %}
- {% include stripe-ad.html %}
-
- {% include why.html %}
- {% include thanks-to.html %}
-
-
-{% include modals/download.html %}
diff --git a/src/license.html b/src/license.html
index 1cceb0493..65164c9e8 100644
--- a/src/license.html
+++ b/src/license.html
@@ -1,72 +1,4 @@
---
-layout: base
-title: Font Awesome License
-navbar_active: license
-relative_path: ../
+layout: redirect
+redirect_to: https://fontawesome.com/license
---
-{% capture jumbotron_h1 %} License{% endcapture %}
-{% capture jumbotron_p %}The full details of how Font Awesome is licensed{% endcapture %}
-
-{% include jumbotron.html %}
-{% include stripe-social.html %}
-
-
- {% capture stripe_ad_content %}
-
- Font Awesome is fully open source and is GPL friendly. You can use it for commercial projects, open source
- projects, or really just about whatever you want.
-
- {% include products/rock-paper-scissors-lizard-spock-tee.html %}
-
-
- {% include products/white-logo-tee.html %}
-
-
- {% include products/camera-retro-tee.html %}
-
-
- {% include products/old-skool-tee.html %}
-
-
- {% include products/classics-tee.html %}
-
-
- {% include products/green-logo-tee.html %}
-
-
- {% include products/cta-suggestions.html %}
-
-
-
-
-
-
-
-
About Font Awesome Products
-
- There might be times where you want to insert a bit of Font Awesome in the real world. That's why we're trying out some schwag. We hope you enjoy our icons and their fun spirit out in the wild and appreciate the support you're showing and giving by doing so. You're putting the Awesome in Font Awesome!
-
-
-
-
-
Shipping, Tracking, & Refunding Orders
-
- All of our products are managed through Amazon. Shipping rates and schedules are managed through their storefront. You'll be able to track your placed orders and contact Amazon's responsive support about refunds, issues, or questions. Ratings and feedback are always welcome either on the product page or directly to us.
-
- Thanks for signing up!
- We'll send you email updates on new Font Awesome releases, icons, and other stuff that we're working on.
- We won't spam you. Scout's honor!
-
-
-
What's next?
-
- Want to see what we're working on next? Check out Fort Awesome! We're making it easy to put the perfect icons
- on your website. Pick from gorgeous, comprehensive icon sets or copy and paste your own vector icons.
-
diff --git a/src/whats-new.html b/src/whats-new.html
index fd3a3cf63..9ff96d1f2 100644
--- a/src/whats-new.html
+++ b/src/whats-new.html
@@ -1,43 +1,4 @@
---
-layout: base
-title: What's New
-navbar_active: whats-new
-relative_path: ../
+layout: redirect
+redirect_to: https://fontawesome.com/updates
---
-{% capture jumbotron_h1 %} What's New{% endcapture %}
-{% capture jumbotron_p %}What's New in the latest version — Font Awesome {{ site.fontawesome.minor_version }}{% endcapture %}
-
-{% include jumbotron.html %}
-{% include stripe-social.html %}
-
-
- {% capture stripe_ad_content %}
-
- Font Awesome is always getting a little awesome-er. So here's what's new in the latest version, Font Awesome
- {{ site.fontawesome.minor_version }}. Have some ideas for new features?
- Help contribute.
-