From 0e217ea2a7de69e34d63687b0abbed205c34618e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Sun, 23 Jun 2019 16:47:30 +0200
Subject: [PATCH] Fix room-list-view
---
.../shared/room-list/room-list.component.html | 2 +-
.../shared/room-list/room-list.component.scss | 17 +++++++++--------
src/theme/dark-theme/darkTheme.const.ts | 2 +-
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/app/components/shared/room-list/room-list.component.html b/src/app/components/shared/room-list/room-list.component.html
index ca95f9072..ba9f14fad 100644
--- a/src/app/components/shared/room-list/room-list.component.html
+++ b/src/app/components/shared/room-list/room-list.component.html
@@ -13,7 +13,7 @@
</mat-expansion-panel>
<mat-expansion-panel *ngFor="let room of rooms" class="matPanel">
<mat-expansion-panel-header class="matPanelListHeader">
- <button mat-mini-fab routerLink="/{{ baseUrl }}/room/{{ room.shortId }}" (click)="setCurrentRoom(room.shortId)">
+ <button mat-flat-button routerLink="/{{ baseUrl }}/room/{{ room.shortId }}" (click)="setCurrentRoom(room.shortId)">
<mat-icon>input</mat-icon>
</button>
<mat-panel-title class="panelTitle">
diff --git a/src/app/components/shared/room-list/room-list.component.scss b/src/app/components/shared/room-list/room-list.component.scss
index 66f62efcb..a1526bc77 100644
--- a/src/app/components/shared/room-list/room-list.component.scss
+++ b/src/app/components/shared/room-list/room-list.component.scss
@@ -1,6 +1,7 @@
button {
margin-right: 10px;
- color: var(--primary);
+ background-color: var(--secondary);
+ color: var(--on-secondary);
}
.mat-expansion-panel-header-description {
@@ -10,19 +11,19 @@ button {
.matPanel {
- background-color: var(--grey);
+ background-color: var(--primary-variant);
margin-bottom: 5px;
- color: black!important;
+ color: var(--on-surface)!important;
}
#matPanelHeader {
- background-color: var(--grey-light);
+ background-color: var(--primary-variant);
margin-bottom: 5px;
- color: white;
+ color: var(--on-surface);
}
.matPanelListHeader {
- background-color: var(--grey) !important;
+ background-color: var(--primary-variant) !important;
}
mat-panel-title {
@@ -33,12 +34,12 @@ mat-panel-title {
.headerTitle {
width: 8%;
- color: var(--on-background)!important;
+ color: var(--on-surface)!important;
}
.panelTitle {
width: 8%;
- color: black!important;
+ color: var(--on-surface)!important;
}
diff --git a/src/theme/dark-theme/darkTheme.const.ts b/src/theme/dark-theme/darkTheme.const.ts
index ed12749df..dca8535d2 100644
--- a/src/theme/dark-theme/darkTheme.const.ts
+++ b/src/theme/dark-theme/darkTheme.const.ts
@@ -1,7 +1,7 @@
export const dark = {
'--primary' : '#bb86fc',
- '--primary-variant': '#3700b3',
+ '--primary-variant': '#616161',
'--secondary': '#03dac6',
'--secondary-variant': '#6f74dd',
--
GitLab