inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-31 17:38:48 +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
ng2-components/ng2-alfresco-core/styles/_theming.scss
View File

@@ -1,5 +1,6 @@
@import './mixins';
@import './variables';
@import './colors';
@import '~@angular/material/theming';
@import './colors';
@import './variables';
@import './mixins';
@import './typography';

19
ng2-components/ng2-alfresco-core/styles/_typography.scss Normal file
View File

@@ -0,0 +1,19 @@
@import '~@angular/material/theming';
$alfresco-typography: mat-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif',
$display-4: mat-typography-level(112px, 112px, 300),
$display-3: mat-typography-level(56px, 56px, 400),
$display-2: mat-typography-level(45px, 48px, 400),
$display-1: mat-typography-level(34px, 40px, 400),
$headline: mat-typography-level(24px, 32px, 400),
$title: mat-typography-level(20px, 32px, 500),
$subheading-2: mat-typography-level(16px, 28px, 400),
$subheading-1: mat-typography-level(15px, 24px, 400),
$body-2: mat-typography-level(14px, 24px, 500),
$body-1: mat-typography-level(14px, 20px, 400),
$caption: mat-typography-level(12px, 20px, 400),
$button: mat-typography-level(14px, 14px, 500),
// Line-height must be unit-less fraction of the font-size.
$input: mat-typography-level(16px, 1.25, 400)
);

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-blue-orange.scss
View File

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

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-blue-purple.scss
View File

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

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-cyan-orange.scss
View File

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

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-cyan-purple.scss
View File

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

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-green-orange.scss
View File

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

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-green-purple.scss
View File

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

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-indigo-pink.scss
View File

@@ -1,12 +1,7 @@
@import '../theming';
@import './all-theme';
$custom-typography: mat-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif'
);
@include angular-material-typography($custom-typography);
@include mat-core();
@include mat-core($alfresco-typography);
$primary: mat-palette($mat-indigo);
$accent: mat-palette($mat-pink, A200, A100, A400);

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-pink-bluegrey.scss
View File

@@ -1,12 +1,7 @@
@import '../theming';
@import './all-theme';
$custom-typography: mat-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif'
);
@include angular-material-typography($custom-typography);
@include mat-core();
@include mat-core($alfresco-typography);
$primary: mat-palette($mat-pink, 700, 500, 900);
$accent: mat-palette($mat-blue-grey, A200, A100, A400);

7
ng2-components/ng2-alfresco-core/styles/prebuilt/adf-purple-green.scss
View File

@@ -1,12 +1,7 @@
@import '../theming';
@import './all-theme';
$custom-typography: mat-typography-config(
$font-family: 'Muli, Roboto, "Helvetica Neue", sans-serif'
);
@include angular-material-typography($custom-typography);
@include mat-core();
@include mat-core($alfresco-typography);
$primary: mat-palette($mat-purple, 700, 500, 800);
$accent: mat-palette($mat-green, A200, A100, A400);