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

3 files changed, 14 insertions, 14 deletions

diff --git a/build/assets/font-awesome/font/FontAwesome.otf b/build/assets/font-awesome/font/FontAwesome.otf
index 4978a6170..368429238 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/core.less b/build/assets/font-awesome/less/core.less
index 548085f81..1ef7e2235 100644
--- a/build/assets/font-awesome/less/core.less
+++ b/build/assets/font-awesome/less/core.less
@@ -23,7 +23,7 @@
 a {
   [class^="icon-"],
   [class*=" icon-"] {
-    &, &:before { display: inline; }
+    display: inline;
   }
 }
 
@@ -41,19 +41,18 @@ a {
   }
 }
 
-ul.icons-ul {
+.icons-ul {
+  margin-left: @icons-li-width;
   list-style-type: none;
-  text-indent: -10/14em;
-  margin-left: 30/14em;
-
-  > li {
-    .icon-li {
-      width: 2/14em;
-      display: inline-block;
-      text-align: right;
-      padding-right: 8/14em;
-    }
-    a .icon-li:before { display: inline-block; }
+
+  > li { position: relative; }
+
+  .icon-li {
+    position: absolute;
+    left: -@icons-li-width;
+    width: @icons-li-width;
+    text-align: center;
+    line-height: inherit;
   }
 }
 
diff --git a/build/assets/font-awesome/less/variables.less b/build/assets/font-awesome/less/variables.less
index a20cf81be..4d5271896 100644
--- a/build/assets/font-awesome/less/variables.less
+++ b/build/assets/font-awesome/less/variables.less
@@ -10,7 +10,8 @@
 @iconMuted:          #eee;
 @iconLight:          #fff;
 @iconDark:           #333;
+@icons-li-width:     30/14em;
 
 {% for icon in icons %}
-@{{ icon.id }}: "\{{ icon.unicode }}";
+  @{{ icon.id }}: "\{{ icon.unicode }}";
 {% endfor %}