Merge pull request #7292 from ProcessMaker/feature/FOUR-18869-A

FOUR-18869: The SlideShow have problems with icons used like Fonts
ProcessMaker · Aug 28, 2024 · 45cfe16 · 45cfe16
2 parents 80c571c + 87740bd
commit 45cfe16
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/ProcessMaker/Jobs/CompileSass.php b/ProcessMaker/Jobs/CompileSass.php
@@ -90,6 +90,7 @@ private function fixPathsInGeneratedAppCss()
         $file = str_replace('public/css/precompiled/poppins/500.css', 'css/precompiled/poppins/500.css', $file);
         $file = str_replace('url("../webfonts/', 'url("/fonts/', $file);
         $file = str_replace('url("../fonts/', 'url("/fonts/', $file);
+        $file = str_replace('url("processmaker-font', 'url("/fonts/processmaker-font', $file);        
         $file = str_replace('url("fonts/', 'url("/fonts/', $file);
         $file = str_replace('content: /; }', 'content: "/"; }', $file);
         $re = '/(content:\s)\\\\\"(\\\\[0-9abcdef]+)\\\\\"/m';

diff --git a/resources/sass/app.scss b/resources/sass/app.scss
@@ -15,7 +15,7 @@
 @import '../../public/css/precompiled/npm-font-open-sans/open-sans.scss';
 @import "../../public/css/precompiled/poppins/300.css";
 @import "../../public/css/precompiled/poppins/500.css";
-@import "../fonts/pm-font/processmaker-font.css";
+@import "../fonts/pm-font/processmaker-font.scss";
 
 $form-control-border-color: #b6bfc6;
 $form-control-border-radius: 2px;