inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2026-04-16 22:24:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-1846] Fix IE11, add material typography, remove design lite (#2570)

Browse Source 
* IE11 vertical centering fix

* Material design way of typography

* Remove material design lite from demo shell
This commit is contained in:
Popovics András
2017-10-31 10:10:00 +00:00
committed by Eugenio Romano
parent 3240929dd3
commit 641c382711
17 changed files with 201 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
demo-shell-ng2/src/custom-style.scss
View File

@@ -16,12 +16,7 @@
@import '~@angular/material/theming';
@include mat-core();
$custom-typography: mat-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif'
);
@include angular-material-typography($custom-typography);
@include mat-core($alfresco-typography);
$primary: mat-palette($alfresco-accent-orange);
$accent: mat-palette($alfresco-accent-purple);

18
demo-shell-ng2/src/styles.scss
View File

@@ -1,12 +1,10 @@
.mat-form-field input.mat-input-element {
line-height: normal;
}
@import '~@angular/material/theming';
@import './custom-style.scss';
body, html {
height: 100%;
font-family: 'Muli', "Helvetica", "Arial", sans-serif !important;
}
body {
margin: 0;
}
margin: 0;
height: 100%;
font-size: mat-font-size($alfresco-typography, body-1);
font-family: mat-font-family($alfresco-typography);
line-height: mat-line-height($alfresco-typography, body-1);
}