From 3651d494af8d9328348d1d1b7bb692f0e0025a1e Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Tue, 3 Jul 2018 13:09:42 -0400 Subject: [PATCH] LP#1775466 ng-bootstrap update; self-hosted bs css Signed-off-by: Bill Erickson --- Open-ILS/src/eg2/package.json | 3 ++- Open-ILS/src/eg2/src/index.html | 14 +------------- Open-ILS/src/eg2/src/styles.css | 15 ++++++++++++--- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json index cb745d20af..bf6a870029 100644 --- a/Open-ILS/src/eg2/package.json +++ b/Open-ILS/src/eg2/package.json @@ -22,7 +22,8 @@ "@angular/platform-browser": "6.0.1", "@angular/platform-browser-dynamic": "6.0.1", "@angular/router": "6.0.1", - "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.5", + "@ng-bootstrap/ng-bootstrap": "^2.2.0", + "bootstrap-css-only": "^4.1.1", "core-js": "^2.4.1", "ngx-cookie": "^2.0.1", "rxjs": "^6.1.0", diff --git a/Open-ILS/src/eg2/src/index.html b/Open-ILS/src/eg2/src/index.html index ed5fa78845..aee6bf8f59 100644 --- a/Open-ILS/src/eg2/src/index.html +++ b/Open-ILS/src/eg2/src/index.html @@ -4,22 +4,10 @@ AngEG - - - + - - - - diff --git a/Open-ILS/src/eg2/src/styles.css b/Open-ILS/src/eg2/src/styles.css index 9376f6578d..b3aaba8082 100644 --- a/Open-ILS/src/eg2/src/styles.css +++ b/Open-ILS/src/eg2/src/styles.css @@ -1,10 +1,19 @@ /* You can add global styles to this file, and also import other style files */ -/** material design experiments -@import "~@angular/material/prebuilt-themes/indigo-pink.css"; +/* 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'; */ - /** BS default fonts are huge */ body, .form-control, .btn, .input-group-text { /* This more or less matches the font size of the angularjs client. -- 2.11.0