From 36e5d0363f8ebf21da796d469264ef6c5690dbf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de> Date: Thu, 27 Jun 2019 10:37:56 +0200 Subject: [PATCH] Link correct session-id to demo session buttton --- .../content-delete.component.scss | 7 +++++++ .../delete-comment.component.html | 4 ++-- .../delete-comment.component.scss | 18 ++++++++++++++++++ .../room-delete/room-delete.component.html | 8 ++++---- .../room-delete/room-delete.component.scss | 17 +++++++++++++++++ .../shared/footer/footer.component.ts | 2 +- .../shared/login/login.component.scss | 5 +++-- 7 files changed, 52 insertions(+), 9 deletions(-) diff --git a/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss b/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss index e69de29bb..1a6363702 100644 --- a/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss +++ b/src/app/components/creator/_dialogs/content-delete/content-delete.component.scss @@ -0,0 +1,7 @@ +h3 { + color: var(--on-surface); +} + +p { + color: var(--on-surface); +} diff --git a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html index 6b88ae2f9..9b81130f0 100644 --- a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html +++ b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.html @@ -1,10 +1,10 @@ <h3>{{ 'room-page.sure' | translate }}</h3> <p>{{ 'room-page.really-delete-comments' | translate }}</p> <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px"> - <button mat-raised-button color="primary" (click)="close('abort')"> + <button mat-raised-button class="abort" (click)="close('abort')"> {{ 'content.abort' | translate }} </button> - <button mat-raised-button color="warn" (click)="close('delete')"> + <button mat-raised-button class="delete" (click)="close('delete')"> {{ 'content.delete' | translate }} </button> </div> diff --git a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss index e69de29bb..d2bb99f40 100644 --- a/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss +++ b/src/app/components/creator/_dialogs/delete-comment/delete-comment.component.scss @@ -0,0 +1,18 @@ +h3 { + color: var(--on-surface); +} + +p { + color: var(--on-surface); +} + +.delete { + background-color: var(--red); + color: var(--on-secondary); +} + +.abort { + background-color: var(--secondary); + color: var(--on-secondary); +} + diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html index 388fccfed..0edb8b68e 100644 --- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.html +++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.html @@ -1,10 +1,10 @@ <h3>{{ 'room-page.sure' | translate }}</h3> <p>{{ 'room-page.reallySession' | translate}}<strong>{{room.name}}</strong>{{ 'room-page.really2' | translate}}</p> <div fxLayout="row" fxLayoutAlign="center" fxLayoutGap="10px"> - <button mat-raised-button color="warn" (click)="dialogRef.close('delete')"> - {{ 'room-page.delete-room' | translate }} - </button> - <button mat-raised-button color="primary" (click)="onNoClick()"> + <button mat-raised-button class="abort" (click)="onNoClick()"> {{ 'room-page.abort' | translate }} </button> + <button mat-raised-button class="delete" (click)="dialogRef.close('delete')"> + {{ 'room-page.delete-room' | translate }} + </button> </div> diff --git a/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss b/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss index e69de29bb..ef5573e7d 100644 --- a/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss +++ b/src/app/components/creator/_dialogs/room-delete/room-delete.component.scss @@ -0,0 +1,17 @@ +h3 { + color: var(--on-surface); +} + +p { + color: var(--on-surface); +} + +.delete { + background-color: var(--red); + color: var(--on-secondary); +} + +.abort { + background-color: var(--secondary); + color: var(--on-secondary); +} diff --git a/src/app/components/shared/footer/footer.component.ts b/src/app/components/shared/footer/footer.component.ts index 3c77f549c..64d7807ea 100644 --- a/src/app/components/shared/footer/footer.component.ts +++ b/src/app/components/shared/footer/footer.component.ts @@ -20,7 +20,7 @@ export class FooterComponent implements OnInit { blogUrl = 'https://arsnova.thm.de/blog/'; dsgvoUrl = 'https://arsnova.thm.de/blog/datenschutzerklaerung/'; imprUrl = 'https://arsnova.thm.de/blog/impressum/'; - demoId = '33602981'; + demoId = '78844652'; room: Room; user: User; diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss index 26996c80c..6801891b5 100644 --- a/src/app/components/shared/login/login.component.scss +++ b/src/app/components/shared/login/login.component.scss @@ -1,12 +1,12 @@ .pwReset { padding-left: 0; - color: var(--primary); + color: var(--secondary); } .regButton { margin-top: 20px; padding: 0; - color: var(--primary); + color: var(--secondary); } .loginButton { @@ -17,6 +17,7 @@ p { font-size: small; margin: 30px 5px 0 30px; + color: var(--on-surface); } input:-webkit-autofill { -- GitLab