From d9bd59833c7bf22fc32dee06151b9f76af4786f8 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Thu, 14 Sep 2017 09:27:55 +0100 Subject: [PATCH] [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 --- demo-shell-ng2/app/theme.scss | 5 + demo-shell-ng2/app/vendor.ts | 2 - demo-shell-ng2/index.html | 1 + demo-shell-ng2/public/css/muli-font.css | 126 --- demo-shell-ng2/public/fonts/Muli-Italic.ttf | Bin 51184 -> 0 bytes demo-shell-ng2/public/fonts/Muli-Light.ttf | Bin 60660 -> 0 bytes .../public/fonts/Muli-LightItalic.ttf | Bin 50688 -> 0 bytes demo-shell-ng2/public/fonts/Muli-Regular.ttf | Bin 56260 -> 0 bytes .../config/prebuilt/adf-blue-orange.scss | 5 + .../config/prebuilt/adf-blue-purple.scss | 5 + .../config/prebuilt/adf-cyan-orange.scss | 5 + .../config/prebuilt/adf-cyan-purple.scss | 5 + .../config/prebuilt/adf-green-orange.scss | 5 + .../config/prebuilt/adf-green-purple.scss | 5 + .../config/prebuilt/adf-indigo-pink.scss | 5 + .../config/prebuilt/adf-pink-bluegrey.scss | 5 + .../config/prebuilt/adf-purple-green.scss | 5 + .../widgets/people/people.widget.scss | 1 - .../process-attachment-list.component.scss | 5 +- .../src/components/processlist.component.css | 1 - .../components/comment-list.component.scss | 4 - .../src/components/comments.component.css | 3 +- .../components/people-search.component.scss | 5 - .../src/components/people.component.scss | 9 - .../src/components/start-task.component.scss | 2 - .../task-attachment-list.component.scss | 5 +- .../src/components/tasklist.component.css | 3 +- .../prebuilt-themes/adf-blue-orange.css | 873 ++++++++++++++---- .../prebuilt-themes/adf-blue-purple.css | 873 ++++++++++++++---- .../prebuilt-themes/adf-cyan-orange.css | 873 ++++++++++++++---- .../prebuilt-themes/adf-cyan-purple.css | 873 ++++++++++++++---- .../prebuilt-themes/adf-green-orange.css | 873 ++++++++++++++---- .../prebuilt-themes/adf-green-purple.css | 873 ++++++++++++++---- .../prebuilt-themes/adf-indigo-pink.css | 873 ++++++++++++++---- .../prebuilt-themes/adf-pink-bluegrey.css | 871 +++++++++++++---- .../prebuilt-themes/adf-purple-green.css | 871 +++++++++++++---- .../breadcrumb/breadcrumb.component.scss | 1 - .../content-node-selector.component.scss | 4 - .../components/document-list.component.scss | 4 - .../src/components/search.component.scss | 1 - 40 files changed, 6191 insertions(+), 1889 deletions(-) delete mode 100644 demo-shell-ng2/public/css/muli-font.css delete mode 100755 demo-shell-ng2/public/fonts/Muli-Italic.ttf delete mode 100755 demo-shell-ng2/public/fonts/Muli-Light.ttf delete mode 100755 demo-shell-ng2/public/fonts/Muli-LightItalic.ttf delete mode 100755 demo-shell-ng2/public/fonts/Muli-Regular.ttf diff --git a/demo-shell-ng2/app/theme.scss b/demo-shell-ng2/app/theme.scss index 5b41ff3b6e..afe0b34b12 100644 --- a/demo-shell-ng2/app/theme.scss +++ b/demo-shell-ng2/app/theme.scss @@ -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); diff --git a/demo-shell-ng2/app/vendor.ts b/demo-shell-ng2/app/vendor.ts index 6a4f03e0d1..8f5a61e124 100644 --- a/demo-shell-ng2/app/vendor.ts +++ b/demo-shell-ng2/app/vendor.ts @@ -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'; diff --git a/demo-shell-ng2/index.html b/demo-shell-ng2/index.html index 162b46c3ae..bfddacb509 100644 --- a/demo-shell-ng2/index.html +++ b/demo-shell-ng2/index.html @@ -6,6 +6,7 @@ +