From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 14 Oct 2018 20:57:38 +0000 (+0100)
Subject: Replace icons with font-awesome icons
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cb582f11dfcaea06450345863162775c8d74f779;p=ipfire.org.git

Replace icons with font-awesome icons

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

diff --git a/.gitmodules b/.gitmodules
index 51c389df..fc43f8b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,6 +5,6 @@
 	path = src/fonts
 	url = https://github.com/google/fonts.git
 
-[submodule "src/open-iconic"]
-	path = src/open-iconic
-	url = https://github.com/iconic/open-iconic.git
+[submodule "src/font-awesome"]
+	path = src/font-awesome
+	url = https://github.com/FortAwesome/Font-Awesome.git
diff --git a/Makefile.am b/Makefile.am
index afc86076..9586aea2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -213,11 +213,21 @@ static_fonts_DATA = \
 	src/fonts/ofl/mukta/Mukta-Regular.ttf \
 	src/fonts/ofl/mukta/Mukta-SemiBold.ttf \
 	\
-	src/open-iconic/font/fonts/open-iconic.eot \
-	src/open-iconic/font/fonts/open-iconic.otf \
-	src/open-iconic/font/fonts/open-iconic.svg \
-	src/open-iconic/font/fonts/open-iconic.ttf \
-	src/open-iconic/font/fonts/open-iconic.woff
+	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
 
 static_fontsdir = $(staticdir)/fonts
 
diff --git a/src/font-awesome b/src/font-awesome
new file mode 160000
index 00000000..559a780f
--- /dev/null
+++ b/src/font-awesome
@@ -0,0 +1 @@
+Subproject commit 559a780f29c9a7efe08835c5ff3d05f57e4389a3
diff --git a/src/open-iconic b/src/open-iconic
deleted file mode 160000
index 1d1e8885..00000000
--- a/src/open-iconic
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d1e8885c5031874b32f4e480e371ce2b1c24144
diff --git a/src/scss/_fonts.scss b/src/scss/_fonts.scss
index 99830cd3..00220893 100644
--- a/src/scss/_fonts.scss
+++ b/src/scss/_fonts.scss
@@ -51,6 +51,3 @@
 	src: local("Mukta Bold"), local("Mukta-Bold"), url(fonts/Mukta-Bold.ttf) format("truetype");
 	unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;
 }
-
-// Include icon fonts
-@import "../open-iconic/font/css/open-iconic-bootstrap.scss";
diff --git a/src/scss/_icons.scss b/src/scss/_icons.scss
index 1b4550a4..da310c8e 100644
--- a/src/scss/_icons.scss
+++ b/src/scss/_icons.scss
@@ -1,3 +1,13 @@
+// Font Awesome
+$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";
+
 // Icons
 .icon {
 	width: 1.5rem;
diff --git a/src/scss/_variables.scss b/src/scss/_variables.scss
index 7c520f15..bb98e0b5 100644
--- a/src/scss/_variables.scss
+++ b/src/scss/_variables.scss
@@ -1,6 +1,3 @@
-// Paths
-$icon-font-path:			"fonts/";
-
 /*
 	Colours
 */