projects / working / Evergreen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: acbb375)
LP#1775466 ng-bootstrap update; self-hosted bs css
authorBill Erickson <berickxx@gmail.com>
Tue, 3 Jul 2018 17:09:42 +0000 (13:09 -0400)
committerBill Erickson <berickxx@gmail.com>
Wed, 5 Sep 2018 14:05:23 +0000 (10:05 -0400)
Signed-off-by: Bill Erickson <berickxx@gmail.com>
Open-ILS/src/eg2/package.json patch | blob | history
Open-ILS/src/eg2/src/index.html patch | blob | history
Open-ILS/src/eg2/src/styles.css patch | blob | history

diff --git a/Open-ILS/src/eg2/package.json b/Open-ILS/src/eg2/package.json
index cb745d2..bf6a870 100644 (file)
--- 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 ed5fa78..aee6bf8 100644 (file)
--- a/Open-ILS/src/eg2/src/index.html
+++ b/Open-ILS/src/eg2/src/index.html
@@ -4,22 +4,10 @@
   <meta charset="utf-8">
   <title i18n="Page Title">AngEG</title>
   <base href="/eg2">
-
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <!-- todo -->
-  <!-- see self-hosting options https://google.github.io/material-design-icons/#icon-font-for-the-web -->
+  <!-- see notes in styles.css regarding locally served fonts -->
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-  <!-- link to bootstrap manually for the time being.  With 
-        ng-bootstrap, we only need the CSS, not the JS -->
-  <link rel="stylesheet" crossorigin="anonymous"
-    href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" 
-    integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm">
-  <!-- lnk to local copy for dev on the go -->
-  <!--
-  <link rel="stylesheet" crossorigin="anonymous"
-    href="/css/bootstrap.min.css" 
-    -->
 </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 9376f65..b3aaba8 100644 (file)
--- 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.
Evergreen ILS