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

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

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);

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';

View File

@@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/png" href="favicon-96x96.png" sizes="96x96">
<link href="https://fonts.googleapis.com/css?family=Muli" rel="stylesheet">
<!--[if IE]>
<script src=js/shim.min.js></script>

View File

@@ -1,126 +0,0 @@
@font-face {
font-family: "Muli";
src: url(../fonts/Muli-Light.ttf);
}
@font-face {
font-family: "Muli";
src: url(../fonts/Muli-LightItalic.ttf);
font-style: italic;
}
@font-face {
font-family: "Muli";
src: url(../fonts/Muli-Regular.ttf);
font-weight: bold;
}
@font-face {
font-family: "Muli";
src: url(../fonts/Muli-Italic.ttf);
font-weight: bold;
font-style: italic;
}
html, body {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
h1, h2 {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
h3, h4 {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
h5, h6 {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
margin: 24px 0 16px
}
blockquote {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
input {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--display-4, .mdl-typography--display-4-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--display-3, .mdl-typography--display-3-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--display-2, .mdl-typography--display-2-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--display-1, .mdl-typography--display-1-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--headline, .mdl-typography--headline-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--title, .mdl-typography--title-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--subhead, .mdl-typography--subhead-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--body-2-force-preferred-font, .mdl-typography--body-2-force-preferred-font-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--body-1-force-preferred-font, .mdl-typography--body-1-force-preferred-font-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-typography--caption-force-preferred-font {
font-family: 'Muli', "Helvetica", "Arial", sans-serif
}
.mdl-typography--caption-force-preferred-font-color-contrast, .mdl-typography--menu {
font-family: 'Muli', "Helvetica", "Arial", sans-serif
}
.mdl-typography--menu-color-contrast, .mdl-typography--button, .mdl-typography--button-color-contrast {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-badge[data-badge]:after {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-button {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-list__item {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-layout__title, .mdl-layout-title {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-snackbar {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
.mdl-snackbar__action {
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}