From f86a4476d686b1151ff88a998231e611804fd177 Mon Sep 17 00:00:00 2001 From: Klaus Quibeldey-Cirkel <klaus.quibeldey-cirkel@mni.thm.de> Date: Sat, 28 Dec 2019 14:39:27 +0100 Subject: [PATCH] Equalize the Footer dialogues --- .../data-protection.component.html | 9 +++-- .../demo-video/demo-video.component.html | 2 +- .../demo-video/demo-video.component.scss | 4 --- .../_dialogs/imprint/imprint.component.html | 8 ++--- .../shared/footer/footer.component.ts | 36 +++++++++---------- .../data-protection/data-protection-de.ts | 5 +-- 6 files changed, 30 insertions(+), 34 deletions(-) diff --git a/src/app/components/home/_dialogs/data-protection/data-protection.component.html b/src/app/components/home/_dialogs/data-protection/data-protection.component.html index 554fa850b..7c799b54b 100644 --- a/src/app/components/home/_dialogs/data-protection/data-protection.component.html +++ b/src/app/components/home/_dialogs/data-protection/data-protection.component.html @@ -7,11 +7,10 @@ <app-data-protection-en *ngIf="currentLang=='en'"></app-data-protection-en> <app-data-protection-de *ngIf="currentLang=='de'"></app-data-protection-de> - - <app-dialog-action-buttons - buttonsLabelSection="imprint" - [cancelButtonClickAction]="buildConfirmActionCallback()"> - </app-dialog-action-buttons> </mat-dialog-content> + <app-dialog-action-buttons + buttonsLabelSection="imprint" + [cancelButtonClickAction]="buildConfirmActionCallback()"> + </app-dialog-action-buttons> </div> diff --git a/src/app/components/home/_dialogs/demo-video/demo-video.component.html b/src/app/components/home/_dialogs/demo-video/demo-video.component.html index 5d5445fc9..2ea877f45 100644 --- a/src/app/components/home/_dialogs/demo-video/demo-video.component.html +++ b/src/app/components/home/_dialogs/demo-video/demo-video.component.html @@ -9,7 +9,7 @@ </ng-container> </div> <!--frag.jetz--> -<h2 tabindex="0" class="modal oldtypo-h2" mat-dialog-title >{{ 'introduction.title' | translate }}</h2> +<h2 tabindex="0" class="modal oldtypo-h2" mat-dialog-title>{{ 'introduction.title' | translate }}</h2> <mat-divider></mat-divider> <mat-dialog-content> <div id="setFocus" class="intro-text" tabindex="0"> diff --git a/src/app/components/home/_dialogs/demo-video/demo-video.component.scss b/src/app/components/home/_dialogs/demo-video/demo-video.component.scss index 6cae8ff94..cc8ad0480 100644 --- a/src/app/components/home/_dialogs/demo-video/demo-video.component.scss +++ b/src/app/components/home/_dialogs/demo-video/demo-video.component.scss @@ -1,7 +1,3 @@ -h2 { - padding-top: 20px; -} - p { word-break: break-word; -ms-hyphens: auto; diff --git a/src/app/components/home/_dialogs/imprint/imprint.component.html b/src/app/components/home/_dialogs/imprint/imprint.component.html index 0cb746f1f..55f850718 100644 --- a/src/app/components/home/_dialogs/imprint/imprint.component.html +++ b/src/app/components/home/_dialogs/imprint/imprint.component.html @@ -4,8 +4,8 @@ <mat-dialog-content tabindex="0"> <app-imprint-en *ngIf="currentLang=='en'"></app-imprint-en> <app-imprint-de *ngIf="currentLang=='de'"></app-imprint-de> - <app-dialog-action-buttons - buttonsLabelSection="imprint" - [cancelButtonClickAction]="buildDeclineActionCallback()"> - </app-dialog-action-buttons> </mat-dialog-content> +<app-dialog-action-buttons + buttonsLabelSection="imprint" + [cancelButtonClickAction]="buildDeclineActionCallback()"> +</app-dialog-action-buttons> diff --git a/src/app/components/shared/footer/footer.component.ts b/src/app/components/shared/footer/footer.component.ts index 8ec754474..90d0b6f21 100644 --- a/src/app/components/shared/footer/footer.component.ts +++ b/src/app/components/shared/footer/footer.component.ts @@ -1,21 +1,21 @@ -import { LanguageService } from './../../../services/util/language.service'; -import { Component, OnInit } from '@angular/core'; -import { NotificationService } from '../../../services/util/notification.service'; -import { Router } from '@angular/router'; -import { MatDialog } from '@angular/material'; -import { TranslateService } from '@ngx-translate/core'; -import { AuthenticationService } from '../../../services/http/authentication.service'; -import { User } from '../../../models/user'; -import { Room } from '../../../models/room'; -import { DemoVideoComponent } from '../../home/_dialogs/demo-video/demo-video.component'; -import { ThemeService } from '../../../../theme/theme.service'; -import { CookiesComponent } from '../../home/_dialogs/cookies/cookies.component'; -import { ImprintComponent } from '../../home/_dialogs/imprint/imprint.component'; -import { HelpPageComponent } from '../_dialogs/help-page/help-page.component'; -import { DataProtectionComponent } from '../../home/_dialogs/data-protection/data-protection.component'; -import { Theme } from '../../../../theme/Theme'; -import { OverlayComponent } from '../../home/_dialogs/overlay/overlay.component'; -import { AppComponent } from '../../../app.component'; +import {LanguageService} from './../../../services/util/language.service'; +import {Component, OnInit} from '@angular/core'; +import {NotificationService} from '../../../services/util/notification.service'; +import {Router} from '@angular/router'; +import {MatDialog} from '@angular/material'; +import {TranslateService} from '@ngx-translate/core'; +import {AuthenticationService} from '../../../services/http/authentication.service'; +import {User} from '../../../models/user'; +import {Room} from '../../../models/room'; +import {DemoVideoComponent} from '../../home/_dialogs/demo-video/demo-video.component'; +import {ThemeService} from '../../../../theme/theme.service'; +import {CookiesComponent} from '../../home/_dialogs/cookies/cookies.component'; +import {ImprintComponent} from '../../home/_dialogs/imprint/imprint.component'; +import {HelpPageComponent} from '../_dialogs/help-page/help-page.component'; +import {DataProtectionComponent} from '../../home/_dialogs/data-protection/data-protection.component'; +import {Theme} from '../../../../theme/Theme'; +import {OverlayComponent} from '../../home/_dialogs/overlay/overlay.component'; +import {AppComponent} from '../../../app.component'; @Component({ selector: 'app-footer', diff --git a/src/assets/i18n/data-protection/data-protection-de.ts b/src/assets/i18n/data-protection/data-protection-de.ts index 37016a18b..1099448e1 100644 --- a/src/assets/i18n/data-protection/data-protection-de.ts +++ b/src/assets/i18n/data-protection/data-protection-de.ts @@ -1,4 +1,4 @@ -import { Component } from '@angular/core'; +import {Component} from '@angular/core'; @Component({ selector: 'app-data-protection-de', @@ -6,4 +6,5 @@ import { Component } from '@angular/core'; styleUrls: ['./data-protection.scss'] }) -export class DataProtectionDeComponent {} +export class DataProtectionDeComponent { +} -- GitLab