From aaff0777aef255cae35f1261fc2d2762ed565365 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 29 May 2019 10:37:27 -0400 Subject: [PATCH] LP1830912 Locally servered material icons Adds the material-icons NPM package and teaches the Angular code to import the icons at build time instead of fetching the icons from the Google servers. Two existing icons were swapped with alternate icons to avoid odd spacing issues with the locally served versions. Note 'npm install' is required to pick up the new icons package. Signed-off-by: Bill Erickson Signed-off-by: Galen Charlton --- Open-ILS/src/eg2/package.json | 1 + Open-ILS/src/eg2/src/app/staff/nav.component.html | 6 +++--- Open-ILS/src/eg2/src/index.html | 2 -- Open-ILS/src/eg2/src/styles.css | 12 ++---------- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json index ca6da588fa..cbc8f27db7 100644 --- a/Open-ILS/src/eg2/package.json +++ b/Open-ILS/src/eg2/package.json @@ -28,6 +28,7 @@ "bootstrap-css-only": "^4.2.1", "core-js": "^2.6.9", "file-saver": "^2.0.2", + "material-design-icons": "^3.0.1", "ngx-cookie": "^4.1.2", "rxjs": "^6.5.2", "zone.js": "^0.8.29" diff --git a/Open-ILS/src/eg2/src/app/staff/nav.component.html b/Open-ILS/src/eg2/src/app/staff/nav.component.html index b60e19a454..99c1a27ff9 100644 --- a/Open-ILS/src/eg2/src/app/staff/nav.component.html +++ b/Open-ILS/src/eg2/src/app/staff/nav.component.html @@ -170,11 +170,11 @@ @@ -380,7 +380,7 @@ Booking Administration diff --git a/Open-ILS/src/eg2/src/index.html b/Open-ILS/src/eg2/src/index.html index f705dba34e..9ecb4c51fb 100644 --- a/Open-ILS/src/eg2/src/index.html +++ b/Open-ILS/src/eg2/src/index.html @@ -6,8 +6,6 @@ - - diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index 5819e336ba..4d28583fde 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -3,16 +3,8 @@ /* bootstrap CSS only -- JS bits come from ng-bootstrap */ @import '~bootstrap-css-only/css/bootstrap.min.css'; -/* Locally served material icon fonts. - * Note when I first tested these after installing the fonts - * via: npm install --save material-design-icons - * some of the icons exhibited odd behavior, adding a lot of - * excess space to the left or right. It only affected certain - * icons. More research needed. - * / -/* -@import '~material-design-icons/iconfont/material-icons.css'; -*/ +/* Locally served material icon fonts */ +@import '~material-design-icons/iconfont/material-icons.css'; /** BS default fonts are huge */ body, .form-control, .btn, .input-group-text { -- 2.11.0