rename our css to prevent conflict

julienmru · Aug 13, 2019 · dce10cf · dce10cf
1 parent 36160fa
commit dce10cf
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git a/css/prive.scss → css/makicatta-prive.scss b/css/prive.scss → css/makicatta-prive.scss
diff --git a/css/public.scss → css/makicatta-public.scss b/css/public.scss → css/makicatta-public.scss
diff --git a/inc/pipelines.php b/inc/pipelines.php
@@ -59,7 +59,7 @@ function makicatta_formulaire_traiter($flux, $data = null) {
 
 	function makicatta_insert_head($flux){
 		if (defined('MAKICATTA_INSERT_BOOTSTRAP') && MAKICATTA_INSERT_BOOTSTRAP && find_in_path('lib/ContentBuilder/contentbuilder/contentbuilder.min.js')) {
-			$flux .= '<link rel="stylesheet" type="text/css" href="'.timestamp(direction_css(scss_select_css('css/public.css'))).'" />';
+			$flux .= '<link rel="stylesheet" type="text/css" href="'.timestamp(direction_css(scss_select_css('css/makicatta-public.css'))).'" />';
 		}
 		return $flux;
 	}
diff --git a/prive/squelettes/inclure/head.html b/prive/squelettes/inclure/head.html
@@ -49,7 +49,7 @@
 
 [(#REM) Makicatta CSS + JS]
 [<link rel="stylesheet" type="text/css" href="(#CHEMIN{lib/adminlte/plugins/select2/css/select2.min.css}|timestamp|url_absolue)" />]
-[<link rel="stylesheet" type="text/css" href="(#CSS{css/prive.css}|timestamp|url_absolue)" />]
+[<link rel="stylesheet" type="text/css" href="(#CSS{css/makicatta-prive.css}|timestamp|url_absolue)" />]
 [<script type="text/javascript" src="(#CHEMIN{js/makicatta.js}|timestamp|url_absolue)"></script>]
 [(#REM) AdminLTE JS]
 [<script type="text/javascript" src="(#CHEMIN{lib/adminlte/dist/js/adminlte.min.js}|timestamp)"></script>]