ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4318 from GabrielInTheWorld/3921

Browse Source 
Adds a new IconFont-set
This commit is contained in:
Emanuel Schütze 2019-02-12 19:40:30 +01:00 committed by GitHub
commit 2364e5a17a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
client/angular.json
View File

@ -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",

2
client/package.json
View File

@ -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",

3
client/src/app/shared/components/sorting-list/sorting-list.component.html
View File

@ -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()} -->

2
client/src/app/site/agenda/components/agenda-list/agenda-list.component.html
View File

@ -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>

2
client/src/app/site/assignments/assignments.config.ts
View File

@ -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'
}

2
client/src/app/site/motions/components/motion-list/motion-list.component.html
View File

@ -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>

2
client/src/app/site/motions/components/statute-paragraph-list/statute-paragraph-list.component.html
View File

@ -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>

2
client/src/app/site/projector/components/projector-detail/projector-detail.component.html
View File

@ -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>

4
client/src/app/site/users/components/user-list/user-list.component.html
View File

@ -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>

3
client/src/styles.scss
View File

@ -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 {