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'
This commit is contained in:
parent
f3452d8904
commit
63989b2b29
@ -27,8 +27,7 @@
|
|||||||
"src/manifest.json"
|
"src/manifest.json"
|
||||||
],
|
],
|
||||||
"styles": [
|
"styles": [
|
||||||
"src/styles.scss",
|
"src/styles.scss"
|
||||||
"node_modules/material-design-icons/iconfont/material-icons.css"
|
|
||||||
],
|
],
|
||||||
"scripts": [
|
"scripts": [
|
||||||
"node_modules/tinymce/tinymce.min.js",
|
"node_modules/tinymce/tinymce.min.js",
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
"core-js": "^2.6.3",
|
"core-js": "^2.6.3",
|
||||||
"css-element-queries": "^1.1.1",
|
"css-element-queries": "^1.1.1",
|
||||||
"file-saver": "^2.0.0",
|
"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",
|
"ng-pick-datetime": "^7.0.0",
|
||||||
"ngx-file-drop": "^5.0.2",
|
"ngx-file-drop": "^5.0.2",
|
||||||
"ngx-mat-select-search": "^1.5.2",
|
"ngx-mat-select-search": "^1.5.2",
|
||||||
|
@ -1,8 +1,7 @@
|
|||||||
<div cdkDropList class="list" (cdkDropListDropped)="drop($event)">
|
<div cdkDropList class="list" (cdkDropListDropped)="drop($event)">
|
||||||
<div class="box line" *ngFor="let item of array; let i = index" cdkDrag>
|
<div class="box line" *ngFor="let item of array; let i = index" cdkDrag>
|
||||||
<div class="section-one" cdkDragHandle>
|
<div class="section-one" cdkDragHandle>
|
||||||
<!-- TODO: drag_indicator after icon update -->
|
<mat-icon>drag_indicator</mat-icon>
|
||||||
<mat-icon>unfold_more</mat-icon>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="section-two">
|
<div class="section-two">
|
||||||
<!-- {number}. {item.toString()} -->
|
<!-- {number}. {item.toString()} -->
|
||||||
|
@ -132,7 +132,7 @@
|
|||||||
</button>
|
</button>
|
||||||
<!-- Import -->
|
<!-- Import -->
|
||||||
<button mat-menu-item *osPerms="'agenda.can_manage'" routerLink="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> ...</span>
|
<span translate>Import</span><span> ...</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -18,7 +18,7 @@ export const AssignmentsAppConfig: AppConfig = {
|
|||||||
{
|
{
|
||||||
route: '/assignments',
|
route: '/assignments',
|
||||||
displayName: 'Elections',
|
displayName: 'Elections',
|
||||||
icon: 'poll', // TODO not yet available: 'how_to_vote',
|
icon: 'how_to_vote',
|
||||||
weight: 400,
|
weight: 400,
|
||||||
permission: 'assignments.can_see'
|
permission: 'assignments.can_see'
|
||||||
}
|
}
|
||||||
|
@ -185,7 +185,7 @@
|
|||||||
<span translate>Export</span>
|
<span translate>Export</span>
|
||||||
</button>
|
</button>
|
||||||
<button mat-menu-item routerLink="import">
|
<button mat-menu-item routerLink="import">
|
||||||
<mat-icon>save_alt</mat-icon>
|
<mat-icon>cloud_upload</mat-icon>
|
||||||
<span translate>Import</span>
|
<span translate>Import</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
|
@ -115,7 +115,7 @@
|
|||||||
<span translate>Export as CSV</span>
|
<span translate>Export as CSV</span>
|
||||||
</button>
|
</button>
|
||||||
<button mat-menu-item *osPerms="'motions.can_manage'" routerLink="import">
|
<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> ...</span>
|
<span translate>Import</span><span> ...</span>
|
||||||
</button>
|
</button>
|
||||||
</mat-menu>
|
</mat-menu>
|
||||||
|
@ -136,7 +136,7 @@
|
|||||||
<div cdkDropList class="drop-list" (cdkDropListDropped)="onSortingChange($event)">
|
<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="list-entry" *ngFor="let element of projector.elements_preview; let i = index" cdkDrag>
|
||||||
<div class="drag-handle" cdkDragHandle>
|
<div class="drag-handle" cdkDragHandle>
|
||||||
<mat-icon>unfold_more</mat-icon>
|
<mat-icon>drag_indicator</mat-icon>
|
||||||
</div>
|
</div>
|
||||||
<div class="name">
|
<div class="name">
|
||||||
{{ i+1 }}. <span>{{ getElementDescription(element) }}</span>
|
{{ i+1 }}. <span>{{ getElementDescription(element) }}</span>
|
||||||
|
@ -122,7 +122,7 @@
|
|||||||
</button>
|
</button>
|
||||||
|
|
||||||
<button mat-menu-item *osPerms="'users.can_manage'" routerLink="import">
|
<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> ...</span>
|
<span translate>Import</span><span> ...</span>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -152,7 +152,7 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button mat-menu-item *osPerms="'users.can_manage'" routerLink="import">
|
<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> ...</span>
|
<span translate>Import</span><span> ...</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
|
|
||||||
/** fonts */
|
/** fonts */
|
||||||
@import './assets/styles/fonts.scss';
|
@import './assets/styles/fonts.scss';
|
||||||
|
@import '~material-icon-font/dist/Material-Icons.css';
|
||||||
|
|
||||||
/** Mix the component-related style-rules */
|
/** Mix the component-related style-rules */
|
||||||
@mixin openslides-components-theme($theme) {
|
@mixin openslides-components-theme($theme) {
|
||||||
@ -51,7 +52,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
mat-icon {
|
mat-icon {
|
||||||
font-family: MaterialIcons-Regular;
|
font-family: 'Material Icons Baseline';
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
|
Loading…
Reference in New Issue
Block a user