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

Merge pull request #5067 from emanuelschuetze/styles

Browse Source 
Set h4 font-size. Added tooltips for projector controls.
This commit is contained in:
Emanuel Schütze 2019-10-05 10:42:39 +02:00 committed by GitHub
commit 4a8362deaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,16 +15,19 @@
</a> </a>
<!-- Controls under the projector preview --> <!-- Controls under the projector preview -->
<div *osPerms="'core.can_manage_projector'" class="control-group projector-controls"> <div *osPerms="'core.can_manage_projector'" class="control-group projector-controls">
<!-- scale up -->
<button type="button" mat-icon-button (click)="scale(scrollScaleDirection.Up)">
<mat-icon>zoom_in</mat-icon>
</button>
<!-- scale down --> <!-- scale down -->
<button type="button" mat-icon-button (click)="scale(scrollScaleDirection.Down)"> <button type="button" mat-icon-button (click)="scale(scrollScaleDirection.Down)"
matTooltip="{{ 'Zoom out' | translate }}">
<mat-icon>zoom_out</mat-icon> <mat-icon>zoom_out</mat-icon>
</button> </button>
<!-- scale up -->
<button type="button" mat-icon-button (click)="scale(scrollScaleDirection.Up)"
matTooltip="{{ 'Zoom in' | translate }}">
<mat-icon>zoom_in</mat-icon>
</button>
<!-- reset button --> <!-- reset button -->
<button type="button" mat-icon-button (click)="scale(scrollScaleDirection.Reset)"> <button type="button" mat-icon-button (click)="scale(scrollScaleDirection.Reset)"
matTooltip="{{ 'Reset' | translate }}">
<mat-icon>refresh</mat-icon> <mat-icon>refresh</mat-icon>
</button> </button>
<!-- scaling indicator --> <!-- scaling indicator -->
@ -70,7 +73,8 @@
<mat-icon>arrow_downward</mat-icon> <mat-icon>arrow_downward</mat-icon>
</button> </button>
<!-- reset button --> <!-- reset button -->
<button type="button" mat-icon-button (click)="scroll(scrollScaleDirection.Reset)"> <button type="button" mat-icon-button (click)="scroll(scrollScaleDirection.Reset)"
matTooltip="{{ 'Reset' | translate }}">
<mat-icon>refresh</mat-icon> <mat-icon>refresh</mat-icon>
</button> </button>
<!-- scroll indicator --> <!-- scroll indicator -->

2
client/src/styles.scss
View File

@ -247,7 +247,7 @@ h3 {
h4 { h4 {
font-weight: 400; font-weight: 400;
font-size: 12px; font-size: 100%;
margin-bottom: 5px; margin-bottom: 5px;
.mat-icon-button mat-icon { .mat-icon-button mat-icon {