From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 17 Oct 2019 14:09:33 +0000 (+0100)
Subject: Update font-awesome to 5.11.2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd257f511429dac0b009c5a537461c21eb4b24a0;p=ipfire.org.git

Update font-awesome to 5.11.2

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/Makefile.am b/Makefile.am
index f7b40a67..d51e3c6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -877,21 +877,21 @@ static_fonts_DATA = \
 	src/fonts/ofl/mukta/Mukta-Regular.ttf \
 	src/fonts/ofl/mukta/Mukta-SemiBold.ttf \
 	\
-	src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.eot \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.svg \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.ttf \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-brands-400.woff2 \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.eot \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.svg \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.ttf \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-regular-400.woff2 \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.eot \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.svg \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.ttf \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff \
-	src/font-awesome/web-fonts-with-css/webfonts/fa-solid-900.woff2 \
+	src/font-awesome/webfonts/fa-brands-400.eot \
+	src/font-awesome/webfonts/fa-brands-400.svg \
+	src/font-awesome/webfonts/fa-brands-400.ttf \
+	src/font-awesome/webfonts/fa-brands-400.woff \
+	src/font-awesome/webfonts/fa-brands-400.woff2 \
+	src/font-awesome/webfonts/fa-regular-400.eot \
+	src/font-awesome/webfonts/fa-regular-400.svg \
+	src/font-awesome/webfonts/fa-regular-400.ttf \
+	src/font-awesome/webfonts/fa-regular-400.woff \
+	src/font-awesome/webfonts/fa-regular-400.woff2 \
+	src/font-awesome/webfonts/fa-solid-900.eot \
+	src/font-awesome/webfonts/fa-solid-900.svg \
+	src/font-awesome/webfonts/fa-solid-900.ttf \
+	src/font-awesome/webfonts/fa-solid-900.woff \
+	src/font-awesome/webfonts/fa-solid-900.woff2 \
 	\
 	src/payment-font/fonts/paymentfont-webfont.eot \
 	src/payment-font/fonts/paymentfont-webfont.svg \
diff --git a/src/font-awesome b/src/font-awesome
index 559a780f..e8bec4b3 160000
--- a/src/font-awesome
+++ b/src/font-awesome
@@ -1 +1 @@
-Subproject commit 559a780f29c9a7efe08835c5ff3d05f57e4389a3
+Subproject commit e8bec4b362ca23832aed6087be398c998da27cf4
diff --git a/src/scss/_icons.scss b/src/scss/_icons.scss
index eee20595..4fc42067 100644
--- a/src/scss/_icons.scss
+++ b/src/scss/_icons.scss
@@ -3,10 +3,10 @@ $fa-font-path:				"fonts";
 
 $fa-font-base-size:			$font-size-base;
 
-@import "../font-awesome/web-fonts-with-css/scss/fontawesome";
-@import "../font-awesome/web-fonts-with-css/scss/solid";
-@import "../font-awesome/web-fonts-with-css/scss/regular";
-@import "../font-awesome/web-fonts-with-css/scss/brands";
+@import "../font-awesome/scss/fontawesome";
+@import "../font-awesome/scss/solid";
+@import "../font-awesome/scss/regular";
+@import "../font-awesome/scss/brands";
 
 // PaymentFont