Skip to content
Snippets Groups Projects
Commit e80e1fa3 authored by Mickaël FERNANDEZ's avatar Mickaël FERNANDEZ
Browse files

Merge branch 'next_version' into 272-rapports

parents 924ed6d5 74154d3a
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
_install/dependencies.json
+ 4
− 4
View file @ e80e1fa3
conf/app.struct.ts
+ 8
− 8
View file @ e80e1fa3
conf/modules-components.ts
+ 2
− 6
View file @ e80e1fa3
...@@ -17,20 +17,16 @@ ...@@ -17,20 +17,16 @@
* import { * import {
* oModules as oGTFModules, * oModules as oGTFModules,
* oModulesComponents as oGTFModulesComponents, * oModulesComponents as oGTFModulesComponents,
* oWkListComponents as oGTFWkListComponents
* } from './gtf/gtf.exports'; * } from './gtf/gtf.exports';
* *
* export const oModules = { ...oGTFModules }; * export const oModules = { ...oGTFModules };
* export const oModulesComponents = { ...oGTFModulesComponents }; * export const oModulesComponents = { ...oGTFModulesComponents };
* export const oWkListComponents = { ...oGTFWkListComponents };
*/ */
import { import {
oVmapModules, oVmapModules,
oVmapModulesComponents, oVmapModulesComponents,
oVmapWkListComponents
} from './vmap/vmap.exports'; } from './vmap/vmap.exports';
export const oModules = { ...oVmapModules }; export const oModules = { ...oVmapModules };
export const oModulesComponents = { ...oVmapModulesComponents }; export const oModulesComponents = { ...oVmapModulesComponents };
export const oWkListComponents = { ...oVmapWkListComponents };
\ No newline at end of file
conf/style.scss
+ 3
− 3
View file @ e80e1fa3
...@@ -13,16 +13,16 @@ ...@@ -13,16 +13,16 @@
@import 'src/modules/vmap/styles/vmap.scss'; @import 'src/modules/vmap/styles/vmap.scss';
// Icones Font Awesome // Icones Font Awesome
$icomoon-font-path: "src/assets/icons/font-awesome/fonts"; $icomoon-font-path: "~src/assets/icons/font-awesome/fonts";
$icomoon-font-family: "font-awesome"; $icomoon-font-family: "font-awesome";
@import 'src/assets/icons/font-awesome/style.scss'; @import 'src/assets/icons/font-awesome/style.scss';
// Icones Vitis // Icones Vitis
$icomoon-font-path: "src/assets/icons/vitis/fonts"; $icomoon-font-path: "~src/assets/icons/vitis/fonts";
$icomoon-font-family: "vitis"; $icomoon-font-family: "vitis";
@import 'src/assets/icons/vitis/style.scss'; @import 'src/assets/icons/vitis/style.scss';
// Icones Vmap // Icones Vmap
$icomoon-font-path: "src/modules/vmap/icons/vmap/fonts"; $icomoon-font-path: "~src/modules/vmap/icons/vmap/fonts";
$icomoon-font-family: "vmap"; $icomoon-font-family: "vmap";
@import 'src/modules/vmap/icons/vmap/style.scss'; @import 'src/modules/vmap/icons/vmap/style.scss';
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment