inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1543] Remove local copy of muli (#2335)

Browse Source 
Use http request to load the font
Add the Muli font in all the theme
Remove the overwritten font-family not necessary
This commit is contained in:
Eugenio Romano
2017-09-14 09:27:55 +01:00
committed by Denys Vuika
parent 54d575ff52
commit d9bd59833c
40 changed files with 6191 additions and 1889 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
demo-shell-ng2/app/theme.scss
View File

@@ -15,6 +15,11 @@
@include mat-core();
$custom-typography: mat-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif'
);
@include angular-material-typography($custom-typography);
$primary: mat-palette($alfresco-accent-orange);
$accent: mat-palette($alfresco-accent-purple);
$warn: mat-palette($alfresco-warn);

2
demo-shell-ng2/app/vendor.ts
View File

@@ -42,8 +42,6 @@ import 'material-design-icons/iconfont/material-icons.css';
import 'material-design-lite/dist/material.orange-blue.min.css';
import 'material-design-lite/material.js';
import '../public/css/muli-font.css';
import 'ng2-activiti-form/stencils/runtime.adf';
import 'ng2-activiti-form/stencils/runtime.ng1';