Merge pull request #4446 from emanuelschuetze/projector-h1

Minor projector css changes
This commit is contained in:
Emanuel Schütze 2019-03-01 15:13:21 +01:00 committed by GitHub
commit 4366f753f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 6 deletions

View File

@ -186,7 +186,6 @@ export class SlideContainerComponent extends BaseComponent {
*/
private setProjectorForComponent(): void {
if (this.slideRef && this.slideRef.instance) {
console.log(this.projector);
this.slideRef.instance.projector = this.projector;
}
}

View File

@ -10,6 +10,7 @@
.projector {
width: 320px;
color: black;
border: 1px solid lightgrey;
}
form {

View File

@ -55,11 +55,11 @@ export const allSlidesDynamicConfiguration: (SlideDynamicConfiguration & Slide)[
viewModelStore: ViewModelStoreService
) => {
const item = viewModelStore.get('agenda/item', element.id);
let title = translate.instant('List of speakers');
if (item) {
const title = translate.instant('List of speakers for');
return title + ' ' + item.getTitle();
title = title + ' (' + item.getTitle() + ')';
}
return translate.instant('List of speakers');
return title;
}
},
{

View File

@ -5,9 +5,15 @@
.material-icons {
font-family: 'Material Icons';
}
h1 {
font-size: 1.8em;
font-weight: 500;
line-height: 1.1em;
}
h2 {
line-height: 40px;
font-weight: normal;
}
h3 {
@ -20,8 +26,6 @@
margin-bottom: 40px;
h1 {
font-size: 1.8em;
line-height: 1.1em;
margin-bottom: 0;
padding-bottom: 0;
}

View File

@ -191,6 +191,9 @@ mat-card {
width: 100%;
}
}
.projector-card .mat-form-field-infix {
width: 320px;
}
// Shared table definitions
%os-table {