#982 peaceful cooperation of Fontawesome 5 and Fontawesome 4

TheCoder4eu · Aug 11, 2018 · 95a6b6c · 95a6b6c
1 parent 8092623
commit 95a6b6c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/main/java/net/bootsfaces/listeners/InternalFALink.java b/src/main/java/net/bootsfaces/listeners/InternalFALink.java
@@ -60,19 +60,19 @@ public void encodeBegin(FacesContext fc) throws IOException {
 				+ "/css/font-awesome.min.css";
 
 		ResponseWriter responseWriter = fc.getResponseWriter();
-		if (version.contains("4")) {
-			if (needsVersion4) {
-				responseWriter.append("<link type=\"text/css\" rel=\"stylesheet\" href=\"" + FONTAWESOME_CDN_URL
-						+ "\" crossorigin=\"anonymous\"/>");
-			}
-		}
 		if (version.contains("5")) {
 			responseWriter.append(
 					"<link type=\"text/css\" rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.2.0/css/all.css\" crossorigin=\"anonymous\"/>");
 			responseWriter.append(
 					"<link type=\"text/css\" rel=\"stylesheet\" href=\"https://use.fontawesome.com/releases/v5.2.0/css/solid.css\" crossorigin=\"anonymous\"/>");
 
 		}
+		if (version.contains("4")) {
+			if (needsVersion4) {
+				responseWriter.append("<link type=\"text/css\" rel=\"stylesheet\" href=\"" + FONTAWESOME_CDN_URL
+						+ "\" crossorigin=\"anonymous\"/>");
+			}
+		}
 	}
 
 	@Override