From ff410a4954b9d9dc3cf70bc152185b3cbd203b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emanuel=20Sch=C3=BCtze?= Date: Fri, 1 Mar 2019 14:28:49 +0100 Subject: [PATCH] Minor projector css/wording changes --- .../slide-container/slide-container.component.ts | 1 - .../projector-list/projector-list.component.scss | 1 + client/src/app/slides/all-slide-configurations.ts | 6 +++--- client/src/assets/styles/projector.scss | 8 ++++++-- client/src/styles.scss | 3 +++ 5 files changed, 13 insertions(+), 6 deletions(-) diff --git a/client/src/app/shared/components/slide-container/slide-container.component.ts b/client/src/app/shared/components/slide-container/slide-container.component.ts index 94b7057f0..c7894675e 100644 --- a/client/src/app/shared/components/slide-container/slide-container.component.ts +++ b/client/src/app/shared/components/slide-container/slide-container.component.ts @@ -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; } } diff --git a/client/src/app/site/projector/components/projector-list/projector-list.component.scss b/client/src/app/site/projector/components/projector-list/projector-list.component.scss index bd0d0e2c1..7501de850 100644 --- a/client/src/app/site/projector/components/projector-list/projector-list.component.scss +++ b/client/src/app/site/projector/components/projector-list/projector-list.component.scss @@ -10,6 +10,7 @@ .projector { width: 320px; color: black; + border: 1px solid lightgrey; } form { diff --git a/client/src/app/slides/all-slide-configurations.ts b/client/src/app/slides/all-slide-configurations.ts index d4cb6c53e..862eb0c76 100644 --- a/client/src/app/slides/all-slide-configurations.ts +++ b/client/src/app/slides/all-slide-configurations.ts @@ -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; } }, { diff --git a/client/src/assets/styles/projector.scss b/client/src/assets/styles/projector.scss index 329d60283..eb0ac392f 100644 --- a/client/src/assets/styles/projector.scss +++ b/client/src/assets/styles/projector.scss @@ -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; } diff --git a/client/src/styles.scss b/client/src/styles.scss index a546c5bee..4718026df 100644 --- a/client/src/styles.scss +++ b/client/src/styles.scss @@ -191,6 +191,9 @@ mat-card { width: 100%; } } +.projector-card .mat-form-field-infix { + width: 320px; +} // Shared table definitions %os-table {