🐛 Fix compatibility with some FontAwesome 4.x icons not displaying

Molkobain · May 6, 2019 · eedc077 · eedc077
1 parent 1559165
commit eedc077
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 4 deletions.
diff --git a/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css b/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css
@@ -0,0 +1,4 @@
+.fa {
+  font-family: FontAwesome !important;
+  /* Compatibility fix for old FA4 icons cohabiting with FA5 icons */
+}
diff --git a/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss b/dist/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss
@@ -0,0 +1,3 @@
+.fa{
+	font-family: FontAwesome !important; /* Compatibility fix for old FA4 icons cohabiting with FA5 icons */
+}
diff --git a/dist/molkobain-fontawesome5-pack/console/pageuiextension.class.inc.php b/dist/molkobain-fontawesome5-pack/console/pageuiextension.class.inc.php
@@ -27,6 +27,7 @@ public function GetNorthPaneHtml(iTopWebPage $oPage)
     {
         $sModuleVersion = utils::GetCompiledModuleVersion('molkobain-fontawesome5-pack');
         $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlModulesRoot() . 'molkobain-fontawesome5-pack/fontawesome-free-5.7.2-web/css/all.min.css?v=' . $sModuleVersion);
+        $oPage->add_saas('env-'.utils::GetCurrentEnvironment().'/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss');
     }
 
     /**

diff --git a/dist/molkobain-fontawesome5-pack/extension.xml b/dist/molkobain-fontawesome5-pack/extension.xml
@@ -5,9 +5,9 @@
 	<author><![CDATA[Guillaume Lajarige]]></author>
 	<label><![CDATA[Font Awesome 5]]></label>
 	<description><![CDATA[Use new icon sets for both portal & console.]]></description>
-	<version>1.1.0</version>
-	<release_date>2019-03-09</release_date>
-	<version_description><![CDATA[Update FontAwesome to v5.7.2]]></version_description>
+	<version>1.1.1</version>
+	<release_date>2019-05-06</release_date>
+	<version_description><![CDATA[Fix compatiblity with some FontAwesome 4.x icons]]></version_description>
 	<itop_version_min>2.4.0</itop_version_min>
 	<status>stable</status>
 	<mandatory>false</mandatory>

diff --git a/dist/molkobain-fontawesome5-pack/module.molkobain-fontawesome5-pack.php b/dist/molkobain-fontawesome5-pack/module.molkobain-fontawesome5-pack.php
@@ -14,7 +14,7 @@
 /** @noinspection PhpUnhandledExceptionInspection */
 SetupWebPage::AddModule(
 	__FILE__, // Path to the current file, all other file names are relative to the directory containing this file
-	'molkobain-fontawesome5-pack/1.1.0',
+	'molkobain-fontawesome5-pack/1.1.1',
 	array(
 		// Identification
 		//

diff --git a/dist/molkobain-fontawesome5-pack/portal/portaluiextension.class.inc.php b/dist/molkobain-fontawesome5-pack/portal/portaluiextension.class.inc.php
@@ -31,6 +31,7 @@ public function GetCSSFiles(Application $oApp)
 			$aReturn = array();
 
 			$aReturn[] = utils::GetAbsoluteUrlModulesRoot() . 'molkobain-fontawesome5-pack/fontawesome-free-5.7.2-web/css/all.min.css?v=' . utils::GetCompiledModuleVersion('molkobain-fontawesome5-pack');
+			$aReturn[] = utils::GetAbsoluteUrlModulesRoot() . 'molkobain-fontawesome5-pack/common/css/fontawesome5-pack.css?v=' . utils::GetCompiledModuleVersion('molkobain-fontawesome5-pack');
 
 			return $aReturn;
 		}
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,6 +27,7 @@ public function GetNorthPaneHtml(iTopWebPage $oPage) @@
         {
             $sModuleVersion = utils::GetCompiledModuleVersion('molkobain-fontawesome5-pack');
             $oPage->add_linked_stylesheet(utils::GetAbsoluteUrlModulesRoot() . 'molkobain-fontawesome5-pack/fontawesome-free-5.7.2-web/css/all.min.css?v=' . $sModuleVersion);
+            $oPage->add_saas('env-'.utils::GetCurrentEnvironment().'/molkobain-fontawesome5-pack/common/css/fontawesome5-pack.scss');
         }
         /**
@@ Expand Down @@