compile in material-icons for offline compatibility

olinux · Oct 7, 2018 · e7e6595 · e7e6595
1 parent 970eca7
commit e7e6595
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 8 deletions.
diff --git a/featureMigration.md b/featureMigration.md
@@ -22,8 +22,8 @@ Here's the current feature migration overview:
 | Offline support|✔|✔||
 | Toggling between map providers & layers|✔|✔||
 | Rotate sign / text|✔|✔||
-| GeoAdmin support|✔|✕|with registered clients and quota available only|
-| GeoAdmin extra layers (e.g. satellite)|✔|✕| with registered clients and quota available only|
+| GeoAdmin support|✔|✕|with registered clients and quota available only - currently not supporting openlayers 5.2.0|
+| GeoAdmin extra layers (e.g. satellite)|✔|✕| with registered clients and quota available only - currently not supporting openlayers 5.2.0|
 | Filter by category|✔|✕||
 | Take screenshot|✔|✕||
 | Layout "beautification"|✔|✕|Improvements in style - alignment of symbols, etc.|
diff --git a/zskarte2/angular.json b/zskarte2/angular.json
@@ -23,7 +23,8 @@
               "src/assets"
             ],
             "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "node_modules/material-design-icons/iconfont/material-icons.css"
             ],
             "scripts": []
           },
@@ -72,7 +73,8 @@
             "tsConfig": "src/tsconfig.spec.json",
             "karmaConfig": "src/karma.conf.js",
             "styles": [
-              "src/styles.css"
+              "src/styles.css",
+              "node_modules/material-design-icons/iconfont/material-icons.css"
             ],
             "scripts": [],
             "assets": [

diff --git a/zskarte2/package-lock.json b/zskarte2/package-lock.json
diff --git a/zskarte2/package.json b/zskarte2/package.json
@@ -24,6 +24,7 @@
     "@angular/router": "^6.1.0",
     "core-js": "^2.5.4",
     "hammerjs": "^2.0.8",
+    "material-design-icons": "^3.0.1",
     "ol": "^5.2.0",
     "rxjs": "~6.2.0",
     "zone.js": "~0.8.26"

diff --git a/zskarte2/src/app/selected-feature/selected-feature.component.css b/zskarte2/src/app/selected-feature/selected-feature.component.css
@@ -19,4 +19,8 @@
 .buttonPanel{
     margin-top:0.5em;
     text-align: center;
+}
+
+.label{
+    text-align:center;
 }
diff --git a/zskarte2/src/app/selected-feature/selected-feature.component.html b/zskarte2/src/app/selected-feature/selected-feature.component.html
@@ -1,8 +1,8 @@
 <mat-card class="selection" *ngIf="selectedSignature!=null">
     <mat-card-content>
         <div class="imgwrapper" *ngIf="selectedSignature.src!=null"><img [src]="getImageUrl(selectedSignature.src)"/></div>
-        <div *ngIf="selectedSignature.de!=null">{{selectedSignature.de}}</div>
-        <div *ngIf="selectedSignature.text!=null">{{selectedSignature.text}}</div>
+        <div *ngIf="selectedSignature.de!=null" class="label">{{selectedSignature.de}}</div>
+        <div *ngIf="selectedSignature.text!=null" class="label">{{selectedSignature.text}}</div>
         <div class="buttonPanel">
             Rotieren:
         <mat-slider

diff --git a/zskarte2/src/index.html b/zskarte2/src/index.html
@@ -26,8 +26,6 @@
   <script>document.write('<base href="' + document.location + '" />');</script>
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <link rel="icon" type="image/x-icon" href="favicon.ico">
-  <link rel="stylesheet" href="https://cdn.rawgit.com/openlayers/openlayers.github.io/master/en/v5.1.3/css/ol.css" type="text/css">
-  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
   <style>html, body { margin: 0; }</style>
 </head>
 <body>