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

Merge pull request #4983 from tsiegleauq/mobile-edit-button

Browse Source 
Adds the correct icon to the mobile action button
This commit is contained in:
Emanuel Schütze 2019-09-05 15:12:39 +02:00 committed by GitHub
commit be77723b55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/app/shared/components/head-bar/head-bar.component.html
View File

@ -66,10 +66,10 @@
(click)="sendMainEvent()" (click)="sendMainEvent()"
matTooltip="{{ mainActionTooltip | translate }}" matTooltip="{{ mainActionTooltip | translate }}"
> >
<mat-icon *ngIf="mainButtonIcon === 'add_circle'; else mainIconBlock"> <mat-icon *ngIf="mainButtonIcon === 'add_circle'">
add add
</mat-icon> </mat-icon>
<mat-icon *ngIf="mainButtonIcon !== 'add_circle'">
{{ mainButtonIcon }}
</mat-icon>
</button> </button>
<ng-template #mainIconBlock>
{{ mainButtonIcon }}
</ng-template>

1
client/src/app/site/topics/components/topic-detail/topic-detail.component.html
View File

@ -101,6 +101,7 @@
</mat-card> </mat-card>
<mat-menu #topicExtraMenu="matMenu"> <mat-menu #topicExtraMenu="matMenu">
<os-projector-button [object]="topic" [menuItem]="true"></os-projector-button>
<os-speaker-button [object]="topic" [menuItem]="true"></os-speaker-button> <os-speaker-button [object]="topic" [menuItem]="true"></os-speaker-button>
<div> <div>
<mat-divider></mat-divider> <mat-divider></mat-divider>