From 63989b2b295692c277399cf37d7433d3c4e05222 Mon Sep 17 00:00:00 2001
From: GabrielMeyer <meyergabriel@live.de>
Date: Tue, 12 Feb 2019 13:30:02 +0100
Subject: [PATCH] Adds a new IconFont-set

Fixes #3921
Added a new set of icons and removed the old one. The new one can used just like the old one.

Changed old improper icons to new ones

- The 'save_alt'-icons are replaced by 'cloud_upload'
- The icon in the navigation for assignments is replaced by 'how_to_vote'
- The drag&drop icon 'unfold_more' is replaced by 'drag_indicator'
---
 client/angular.json                                           | 3 +--
 client/package.json                                           | 2 +-
 .../components/sorting-list/sorting-list.component.html       | 3 +--
 .../agenda/components/agenda-list/agenda-list.component.html  | 2 +-
 client/src/app/site/assignments/assignments.config.ts         | 2 +-
 .../motions/components/motion-list/motion-list.component.html | 2 +-
 .../statute-paragraph-list.component.html                     | 2 +-
 .../projector-detail/projector-detail.component.html          | 2 +-
 .../site/users/components/user-list/user-list.component.html  | 4 ++--
 client/src/styles.scss                                        | 3 ++-
 10 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/client/angular.json b/client/angular.json
index 3251ca8bf..3230021a5 100644
--- a/client/angular.json
+++ b/client/angular.json
@@ -27,8 +27,7 @@
                             "src/manifest.json"
                         ],
                         "styles": [
-                            "src/styles.scss",
-                            "node_modules/material-design-icons/iconfont/material-icons.css"
+                            "src/styles.scss"
                         ],
                         "scripts": [
                             "node_modules/tinymce/tinymce.min.js",
diff --git a/client/package.json b/client/package.json
index 81fe7b6ea..40e1e0044 100644
--- a/client/package.json
+++ b/client/package.json
@@ -45,7 +45,7 @@
         "core-js": "^2.6.3",
         "css-element-queries": "^1.1.1",
         "file-saver": "^2.0.0",
-        "material-design-icons": "^3.0.1",
+        "material-icon-font": "git+https://github.com/petergng/materialIconFont.git",
         "ng-pick-datetime": "^7.0.0",
         "ngx-file-drop": "^5.0.2",
         "ngx-mat-select-search": "^1.5.2",
diff --git a/client/src/app/shared/components/sorting-list/sorting-list.component.html b/client/src/app/shared/components/sorting-list/sorting-list.component.html
index db84d4b0f..b1429f91b 100644
--- a/client/src/app/shared/components/sorting-list/sorting-list.component.html
+++ b/client/src/app/shared/components/sorting-list/sorting-list.component.html
@@ -1,8 +1,7 @@
 <div cdkDropList class="list" (cdkDropListDropped)="drop($event)">
     <div class="box line" *ngFor="let item of array; let i = index" cdkDrag>
         <div class="section-one" cdkDragHandle>
-            <!-- TODO: drag_indicator after icon update -->
-            <mat-icon>unfold_more</mat-icon>
+            <mat-icon>drag_indicator</mat-icon>
         </div>
         <div class="section-two">
             <!-- {number}. {item.toString()} -->
diff --git a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
index 9986e60f7..f3ee1263a 100644
--- a/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
+++ b/client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
@@ -132,7 +132,7 @@
         </button>
         <!-- Import -->
         <button mat-menu-item *osPerms="'agenda.can_manage'" routerLink="import">
-            <mat-icon>save_alt</mat-icon>
+            <mat-icon>cloud_upload</mat-icon>
             <span translate>Import</span><span>&nbsp;...</span>
         </button>
     </div>
diff --git a/client/src/app/site/assignments/assignments.config.ts b/client/src/app/site/assignments/assignments.config.ts
index a82b10690..4e26b2ef1 100644
--- a/client/src/app/site/assignments/assignments.config.ts
+++ b/client/src/app/site/assignments/assignments.config.ts
@@ -18,7 +18,7 @@ export const AssignmentsAppConfig: AppConfig = {
         {
             route: '/assignments',
             displayName: 'Elections',
-            icon: 'poll', // TODO not yet available: 'how_to_vote',
+            icon: 'how_to_vote',
             weight: 400,
             permission: 'assignments.can_see'
         }
diff --git a/client/src/app/site/motions/components/motion-list/motion-list.component.html b/client/src/app/site/motions/components/motion-list/motion-list.component.html
index 00345fe4f..8d9c8dd17 100644
--- a/client/src/app/site/motions/components/motion-list/motion-list.component.html
+++ b/client/src/app/site/motions/components/motion-list/motion-list.component.html
@@ -185,7 +185,7 @@
                 <span translate>Export</span>
             </button>
             <button mat-menu-item routerLink="import">
-                <mat-icon>save_alt</mat-icon>
+                <mat-icon>cloud_upload</mat-icon>
                 <span translate>Import</span>
             </button>
         </div>
diff --git a/client/src/app/site/motions/components/statute-paragraph-list/statute-paragraph-list.component.html b/client/src/app/site/motions/components/statute-paragraph-list/statute-paragraph-list.component.html
index f54c4ba73..162db0445 100644
--- a/client/src/app/site/motions/components/statute-paragraph-list/statute-paragraph-list.component.html
+++ b/client/src/app/site/motions/components/statute-paragraph-list/statute-paragraph-list.component.html
@@ -115,7 +115,7 @@
         <span translate>Export as CSV</span>
     </button>
     <button mat-menu-item *osPerms="'motions.can_manage'" routerLink="import">
-        <mat-icon>save_alt</mat-icon>
+        <mat-icon>cloud_upload</mat-icon>
         <span translate>Import</span><span>&nbsp;...</span>
     </button>
 </mat-menu>
diff --git a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
index c45dd9efa..4b867af34 100644
--- a/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
+++ b/client/src/app/site/projector/components/projector-detail/projector-detail.component.html
@@ -136,7 +136,7 @@
             <div cdkDropList class="drop-list" (cdkDropListDropped)="onSortingChange($event)">
                 <div class="list-entry" *ngFor="let element of projector.elements_preview; let i = index" cdkDrag>
                     <div class="drag-handle" cdkDragHandle>
-                        <mat-icon>unfold_more</mat-icon>
+                        <mat-icon>drag_indicator</mat-icon>
                     </div>
                     <div class="name">
                         {{ i+1 }}.&nbsp;<span>{{ getElementDescription(element) }}</span>
diff --git a/client/src/app/site/users/components/user-list/user-list.component.html b/client/src/app/site/users/components/user-list/user-list.component.html
index aede9fc84..fb27fa1d7 100644
--- a/client/src/app/site/users/components/user-list/user-list.component.html
+++ b/client/src/app/site/users/components/user-list/user-list.component.html
@@ -122,7 +122,7 @@
             </button>
 
             <button mat-menu-item *osPerms="'users.can_manage'" routerLink="import">
-                <mat-icon>save_alt</mat-icon>
+                <mat-icon>cloud_upload</mat-icon>
                 <span translate>Import</span><span>&nbsp;...</span>
             </button>
         </div>
@@ -152,7 +152,7 @@
                 </div>
 
                 <button mat-menu-item *osPerms="'users.can_manage'" routerLink="import">
-                    <mat-icon>save_alt</mat-icon>
+                    <mat-icon>cloud_upload</mat-icon>
                     <span translate>Import</span><span>&nbsp;...</span>
                 </button>
 
diff --git a/client/src/styles.scss b/client/src/styles.scss
index 799968c87..00181aa9a 100644
--- a/client/src/styles.scss
+++ b/client/src/styles.scss
@@ -13,6 +13,7 @@
 
 /** fonts */
 @import './assets/styles/fonts.scss';
+@import '~material-icon-font/dist/Material-Icons.css';
 
 /** Mix the component-related style-rules */
 @mixin openslides-components-theme($theme) {
@@ -51,7 +52,7 @@
 }
 
 mat-icon {
-    font-family: MaterialIcons-Regular;
+    font-family: 'Material Icons Baseline';
 }
 
 body {