[open-ils-commits] [GIT] Evergreen ILS branch master updated. aaff0777aef255cae35f1261fc2d2762ed565365

Mon Aug 5 15:30:52 EDT 2019

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  aaff0777aef255cae35f1261fc2d2762ed565365 (commit)
      from  b2f669fb161ff4bdba9ba2528241312d037503e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit aaff0777aef255cae35f1261fc2d2762ed565365
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed May 29 10:37:27 2019 -0400

    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 <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

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 @@
           </a>
           <div class="dropdown-divider"></div>
           <a href="/eg/staff/cat/bucket/record/view" class="dropdown-item">
-            <span class="material-icons">list_alt</span>
+            <span class="material-icons">list</span>
             <span i18n>Record Buckets</span>
           </a>
           <a href="/eg/staff/cat/bucket/copy/view" class="dropdown-item">
-            <span class="material-icons">list_alt</span>
+            <span class="material-icons">list</span>
             <span i18n>Item Buckets</span>
           </a>
           <div class="dropdown-divider"></div>
@@ -380,7 +380,7 @@
             <span i18n>Booking Administration</span>
           </a>
           <a class="dropdown-item" href="/eg/staff/reporter/legacy/main">
-            <span class="material-icons">insert_chart_outlined</span>
+            <span class="material-icons">insert_chart</span>
             <span i18n>Reports</span>
           </a>
         </div>
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 @@
   <base href="/eg2">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <!-- see notes in styles.css regarding locally served fonts -->
-  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 </head>
 <body>
   <eg-root></eg-root>
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.
- * /
-/*
- at import '~material-design-icons/iconfont/material-icons.css';
-*/
+/* Locally served material icon fonts  */
+ at import '~material-design-icons/iconfont/material-icons.css'; 
 
 /** BS default fonts are huge */
 body, .form-control, .btn, .input-group-text {

-----------------------------------------------------------------------

Summary of changes:
 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(-)


hooks/post-receive
-- 
Evergreen ILS
