Merge remote-tracking branch 'origin/3.2.0-wip' into 3.2.0-wip

Conflicts:
	build/assets/font-awesome/css/font-awesome.css
	build/assets/font-awesome/less/icons.less
	build/assets/font-awesome/less/variables.less
	package.json

4 files changed, 10 insertions, 10 deletions

diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf
index 32dd8b1cd..4978a6170 100644
--- a/build/assets/font-awesome/font/FontAwesome.otf
+++ b/build/assets/font-awesome/font/FontAwesome.otf
diff --git a/build/assets/font-awesome/less/icons.less b/build/assets/font-awesome/less/icons.less
index 0bbac5557..a8e3f6871 100644
--- a/build/assets/font-awesome/less/icons.less
+++ b/build/assets/font-awesome/less/icons.less
@@ -4,11 +4,12 @@
    readers do not read off random characters that represent icons */
 {% for icon in icons %}
 .icon-{{ icon.id }}:before {
-  content: @icon-{{ icon.id }}
+  content: @{{ icon.id }};
 }
 {% for alias in icon.aliases %}
+// {{ icon.name }} alias
 .icon-{{ alias }}:before {
-  content: @icon-{{ icon.id }}
+  content: @{{ icon.id }};
 }
 {% endfor %}
 {% endfor %}
diff --git a/build/assets/font-awesome/less/path.less b/build/assets/font-awesome/less/path.less
index 8162d7900..bda49e198 100644
--- a/build/assets/font-awesome/less/path.less
+++ b/build/assets/font-awesome/less/path.less
@@ -3,12 +3,12 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
-    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
-    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
-    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
-//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
+//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=@{FontAwesomeVersion}');
+//  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=@{FontAwesomeVersion}') format('embedded-opentype'),
+//    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=@{FontAwesomeVersion}') format('woff'),
+//    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=@{FontAwesomeVersion}') format('truetype'),
+//    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=@{FontAwesomeVersion}') format('svg');
+  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype'); // used when developing fonts
 
   font-weight: normal;
   font-style: normal;
diff --git a/build/assets/font-awesome/less/variables.less b/build/assets/font-awesome/less/variables.less
index 435f05a35..fb14160fb 100644
--- a/build/assets/font-awesome/less/variables.less
+++ b/build/assets/font-awesome/less/variables.less
@@ -11,7 +11,6 @@
 @iconLight:          #fff;
 @iconDark:           #333;
 
-
 {% for icon in icons %}
-@icon-{{ icon.id }}: "\{{ icon.unicode }}";
+@{{ icon.id }}: "\{{ icon.unicode }}";
 {% endfor %}