From 5135b261f5fa4c9e34b548dba38862537917cf7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de> Date: Thu, 9 May 2019 19:38:11 +0200 Subject: [PATCH] Fixed theme manager --- .../content-choice-creator.component.scss | 6 +- .../content-likert-creator.component.scss | 4 +- .../content-list/content-list.component.scss | 2 +- .../content-presentation.component.scss | 4 +- .../room-creator-page.component.scss | 4 +- .../room-participant-page.component.scss | 4 +- .../statistic-help.component.scss | 8 +-- .../comment-list/comment-list.component.scss | 4 +- .../shared/comment/comment.component.html | 10 +-- .../shared/comment/comment.component.scss | 30 ++++----- .../shared/footer/footer.component.scss | 10 +-- .../list-statistic.component.scss | 24 +++---- .../shared/room-list/room-list.component.scss | 10 +-- .../shared/statistic/statistic.component.scss | 12 +++- .../statistics-page.component.scss | 2 +- src/theme/dark-Theme/_dark-theme.scss | 2 +- src/theme/dark-Theme/darkTheme.const.ts | 62 ++++++------------- src/theme/default-Theme/_form.scss | 2 +- src/theme/default-Theme/defaultTheme.const.ts | 57 ++++++----------- 19 files changed, 109 insertions(+), 148 deletions(-) diff --git a/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss b/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss index 56542683d..3d1670d1e 100644 --- a/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss +++ b/src/app/components/creator/content-choice-creator/content-choice-creator.component.scss @@ -3,15 +3,15 @@ form > button { } mat-header-cell { - background-color: var(--content-creator-cell); + background-color: var(--background-2); } mat-row { - background-color: var(--content-creator-row); + background-color: var(--primary); } .mat-checkbox { - color: var(--text-1) !important; + color: var(--text-3) !important; } .addIcon { diff --git a/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss b/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss index 21391e600..ccd1c0a31 100644 --- a/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss +++ b/src/app/components/creator/content-likert-creator/content-likert-creator.component.scss @@ -3,9 +3,9 @@ form > button { } mat-header-cell { - background-color: var(--content-creator-cell); + background-color: var(--background-2); } mat-cell { - background-color: var(--content-creator-row); + background-color: var(--primary); } diff --git a/src/app/components/creator/content-list/content-list.component.scss b/src/app/components/creator/content-list/content-list.component.scss index cdfb5ca97..a452212da 100644 --- a/src/app/components/creator/content-list/content-list.component.scss +++ b/src/app/components/creator/content-list/content-list.component.scss @@ -1,7 +1,7 @@ mat-card { width: 800px; max-width: 90%; - background-color: var(--content-mat-card)!important; + background-color: var(--card)!important; } mat-card-content > :first-child { diff --git a/src/app/components/creator/content-presentation/content-presentation.component.scss b/src/app/components/creator/content-presentation/content-presentation.component.scss index 9db9db9e9..902425126 100644 --- a/src/app/components/creator/content-presentation/content-presentation.component.scss +++ b/src/app/components/creator/content-presentation/content-presentation.component.scss @@ -11,12 +11,12 @@ mat-card { width: 800px; max-width: 90%; margin-top: 20px; - background-color: var(--content-mat-card); + background-color: var(--card); } h3 { font-size: 150%; - color: var(--content-prasentation-header); + color: var(--text-3); } h4 { diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.scss b/src/app/components/creator/room-creator-page/room-creator-page.component.scss index 24ace0566..736f57612 100644 --- a/src/app/components/creator/room-creator-page/room-creator-page.component.scss +++ b/src/app/components/creator/room-creator-page/room-creator-page.component.scss @@ -2,7 +2,7 @@ mat-card { width: 800px; - background-color: var(--content-mat-card)!important; + background-color: var(--card)!important; } mat-card-content > :first-child { @@ -93,6 +93,6 @@ mat-grid-tile { } mat-expansion-panel { - background-color: var(--content-mat-card)!important; + background-color: var(--card)!important; min-width: 200px; } diff --git a/src/app/components/participant/room-participant-page/room-participant-page.component.scss b/src/app/components/participant/room-participant-page/room-participant-page.component.scss index 6af9047c4..69002181e 100644 --- a/src/app/components/participant/room-participant-page/room-participant-page.component.scss +++ b/src/app/components/participant/room-participant-page/room-participant-page.component.scss @@ -3,7 +3,7 @@ mat-card { width: 100%; max-width: 800px; - background-color: var(--content-mat-card)!important; + background-color: var(--card)!important; } mat-card-content>:first-child { @@ -67,7 +67,7 @@ mat-card-subtitle { } mat-expansion-panel { - background-color: var(--content-mat-card)!important; + background-color: var(--card)!important; min-width: 200px; } diff --git a/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss b/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss index d1ebb3266..a8bc1a483 100644 --- a/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss +++ b/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss @@ -1,17 +1,17 @@ .positiveC { - background-color: var(--positiveC); + background-color: var(--green); } .negativeC { - background-color: var(--negativeC); + background-color: var(--red); } .okayC { - background-color: var(--okayC); + background-color: var(--yellow); } .emptyC { - background-color: var(--emptyC); + background-color: var(--grey); } mat-chip { diff --git a/src/app/components/shared/comment-list/comment-list.component.scss b/src/app/components/shared/comment-list/comment-list.component.scss index fe7da5996..838f23a98 100644 --- a/src/app/components/shared/comment-list/comment-list.component.scss +++ b/src/app/components/shared/comment-list/comment-list.component.scss @@ -17,7 +17,7 @@ input { box-sizing: border-box; padding: 0 10px 0 5px; width: 50%; - background-color: var(--input-search-cl); + background-color: var(--light); border: none; outline: none; min-height: 60px; @@ -27,7 +27,7 @@ input { #search-container { border-radius: 5px; - background-color: var(--input-search-cl); + background-color: var(--light); margin-bottom: 10px; } diff --git a/src/app/components/shared/comment/comment.component.html b/src/app/components/shared/comment/comment.component.html index 8b4c59b3f..a6146daea 100644 --- a/src/app/components/shared/comment/comment.component.html +++ b/src/app/components/shared/comment/comment.component.html @@ -11,13 +11,13 @@ </ng-template> </div> <button mat-icon-button *ngIf="comment.correct || !isStudent" [disabled]="isStudent" (click)="setCorrect(comment)" [matTooltip]="comment.correct ? 'Unmark as correct' : 'Mark as correct'"> - <mat-icon [ngClass]="{true : 'correct-icon', false: 'incorrect-icon'}[comment.correct]">check_circle</mat-icon> + <mat-icon [ngClass]="{true : 'correct-icon', false: 'not-marked'}[comment.correct]">check_circle</mat-icon> </button> <button mat-icon-button *ngIf="comment.favorite || !isStudent" [disabled]="isStudent" (click)="setFavorite(comment)" [matTooltip]="comment.favorite ? 'Mark as not favorite' : 'Mark as favorite'"> - <mat-icon [ngClass]="{true: 'favorite-icon', false: 'not-favorite-icon'}[comment.favorite]">favorite_border</mat-icon> + <mat-icon [ngClass]="{true: 'favorite-icon', false: 'not-marked'}[comment.favorite]">favorite_border</mat-icon> </button> <button mat-icon-button [disabled]="isStudent" (click)="setRead(comment)" [matTooltip]="comment.read ? 'Mark as unread' : 'Mark as read'"> - <mat-icon class="icon" [ngClass]="{true: 'read-icon', false: 'unread-icon'}[comment.read]">visibility</mat-icon> + <mat-icon class="icon" [ngClass]="{true: 'read-icon', false: 'not-marked'}[comment.read]">visibility</mat-icon> </button> </div> <div fxLayout="row"> @@ -25,11 +25,11 @@ <span class="fill-remaining-space" (click)="openPresentDialog(comment)"></span> <div fxLayout="column" (tap)="startAnimation('rubberBand')" [@rubberBand]="animationState" (@rubberBand.done)="resetAnimationState()"> <button mat-icon-button [disabled]="!isStudent" (click)="voteUp(comment)" > - <mat-icon class="voting-icon" [ngClass]="{'upvoted' : hasVoted === 1}">keyboard_arrow_up</mat-icon> + <mat-icon class="voting-icon" [ngClass]="{'upVoted' : hasVoted === 1}">keyboard_arrow_up</mat-icon> </button> <h2>{{comment.score}}</h2> <button mat-icon-button [disabled]="!isStudent" (click)="voteDown(comment)"> - <mat-icon class="voting-icon" [ngClass]="{'downvoted' : hasVoted === -1}">keyboard_arrow_down</mat-icon> + <mat-icon class="voting-icon" [ngClass]="{'downVoted' : hasVoted === -1}">keyboard_arrow_down</mat-icon> </button> </div> </div> diff --git a/src/app/components/shared/comment/comment.component.scss b/src/app/components/shared/comment/comment.component.scss index 79f526e69..cda2a043d 100644 --- a/src/app/components/shared/comment/comment.component.scss +++ b/src/app/components/shared/comment/comment.component.scss @@ -1,6 +1,6 @@ #comment-card { margin-bottom: 20px; - background-color: var(--comment-mat-card); + background-color: var(--background-2); cursor: pointer; padding-bottom: 10px; padding-top: 10px; @@ -19,36 +19,28 @@ mat-card-content > :first-child { line-height: 100% !important; } -.upvoted { - color: var(--upvoted); +.upVoted { + color: var(--green); } -.downvoted { - color: var(--downvoted); +.downVoted { + color: var(--red); } -.incorrect-icon { - color: var(--incorrect-icon); +.not-marked { + color: var(--grey); } .correct-icon { - color: var(--correct-icon); + color: var(--green); } .read-icon { - color: var(--read-icon); -} - -.unread-icon { - color: var(--unread-icon); + color: var(--blue); } .favorite-icon { - color: var(--favorite-icon); -} - -.not-favorite-icon { - color: var(--not-favorite-icon); + color: var(--yellow); } h2 { @@ -85,7 +77,7 @@ h2 { } .highlighted { - background-color: var(--highlighted-comment)!important; + background-color: var(--highlighted)!important; transition: background-color 1s linear; } diff --git a/src/app/components/shared/footer/footer.component.scss b/src/app/components/shared/footer/footer.component.scss index e29995fb2..12f631a96 100644 --- a/src/app/components/shared/footer/footer.component.scss +++ b/src/app/components/shared/footer/footer.component.scss @@ -3,22 +3,22 @@ footer { } #footer-toolbar { - background-color: var(--footer-bg-color); + background-color: var(--grey-light); height: auto; &:first-child { - padding-left: 0px; + padding-left: 0; } &:last-child { - padding-right: 0px; + padding-right: 0; } } -button { +.mat-button { min-height: 28px; font-size: 12px; - color: var(--footer-button); + color: var(--text-1); } mat-icon { diff --git a/src/app/components/shared/list-statistic/list-statistic.component.scss b/src/app/components/shared/list-statistic/list-statistic.component.scss index 599e0af8d..9b037ced3 100644 --- a/src/app/components/shared/list-statistic/list-statistic.component.scss +++ b/src/app/components/shared/list-statistic/list-statistic.component.scss @@ -25,50 +25,50 @@ table { mat-header-cell { color: black!important; - background-color: var(--list-st-hCell-bg); + background-color: var(--grey); } mat-cell { color: black!important; - background-color: var(--list-st-mCell-bg); + background-color: var(--grey-light); } mat-toolbar { height: 20px; - background-color: var(--statistic-bg-color)!important; + background-color: var(--card)!important; } .positiveC { - background-color: var(--positiveC); + background-color: var(--green); } .negativeC { - background-color: var(--negativeC); + background-color: var(--red); } .okayC { - background-color: var(--okayC); + background-color: var(--red); } .positiveP { - background-color: var(--positiveP) !important; + background-color: var(--green)!important; } .negativeP { - background-color: var(--negativeP) !important; + background-color: var(--red)!important; } .okayP { - background-color: var(--okayP) !important; + background-color: var(--yellow)!important; } .emptyC { - color: var(--emptyC-color); - background: var(--emptyC-color); + color: var(--grey)!important; + background: var(--grey); pointer-events: none; } .emptyCC { - background: var(--emptyCC) ; + background: var(--grey) ; pointer-events: none; } 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 e4ea44271..18633b2de 100644 --- a/src/app/components/shared/room-list/room-list.component.scss +++ b/src/app/components/shared/room-list/room-list.component.scss @@ -9,19 +9,19 @@ button { .matPanel { - background-color: var(--room-list-mPanel); + background-color: var(--grey); margin-bottom: 5px; color: black!important; } #matPanelHeader { - background-color: var(--background-2); + background-color: var(--grey-light); margin-bottom: 5px; color: white; } .matPanelListHeader { - background-color: var(--room-list-mPLHeader) !important; + background-color: var(--grey) !important; } mat-panel-title { @@ -46,6 +46,6 @@ mat-card-title { } #no-sessions-card { - background-color: var(--room-list-card-bg); - color: var(--room-list-card-color); + background-color: var(--grey); + color: var(--primary); } diff --git a/src/app/components/shared/statistic/statistic.component.scss b/src/app/components/shared/statistic/statistic.component.scss index 080ec42e7..b3d28b344 100644 --- a/src/app/components/shared/statistic/statistic.component.scss +++ b/src/app/components/shared/statistic/statistic.component.scss @@ -1,12 +1,12 @@ mat-card { width: 800px; max-width: 90%; - background-color: var(--statistic-bg-color) !important; + background-color: var(--card)!important; } mat-toolbar { height: 15px; - background-color: var(--statistic-bg-color); + background-color: var(--card)!important; } .mat-icon-button { @@ -21,3 +21,11 @@ mat-icon { width: 40px; line-height: 100%!important; } + +h4 { + color: var(--text-1); +} + +mat-list-item { + color: var(--text-1)!important; +} diff --git a/src/app/components/shared/statistics-page/statistics-page.component.scss b/src/app/components/shared/statistics-page/statistics-page.component.scss index e4ffb24f3..632a4b0da 100644 --- a/src/app/components/shared/statistics-page/statistics-page.component.scss +++ b/src/app/components/shared/statistics-page/statistics-page.component.scss @@ -2,7 +2,7 @@ mat-card { width: 800px; max-width: 90%; min-height: 300px; - background-color: var(--statistic-bg-color) !important; + background-color: var(--card)!important; } h2 { diff --git a/src/theme/dark-Theme/_dark-theme.scss b/src/theme/dark-Theme/_dark-theme.scss index 6c6f5d72a..052a6d3e6 100644 --- a/src/theme/dark-Theme/_dark-theme.scss +++ b/src/theme/dark-Theme/_dark-theme.scss @@ -32,7 +32,7 @@ mat-form-field.input-block { $dark-primary: mat-palette($mat-blue-gray, 800); -$dark-accent: mat-palette($mat-blue-gray, 500); +$dark-accent: mat-palette($mat-orange, 200); $dark-warn: mat-palette($mat-red, A200); $dark-theme: mat-dark-theme($dark-primary, $dark-accent, $dark-warn); diff --git a/src/theme/dark-Theme/darkTheme.const.ts b/src/theme/dark-Theme/darkTheme.const.ts index bc8f4cc93..e12644992 100644 --- a/src/theme/dark-Theme/darkTheme.const.ts +++ b/src/theme/dark-Theme/darkTheme.const.ts @@ -1,46 +1,24 @@ export const dark = { + '--primary' : '#37474F', - '--background': '#616161', // app.component.scss - '--background-2': '#9E9E9E', + '--light': '#455a64', + + '--accent': '#FFE0B2', + + '--background': '#616161', + '--background-2': '#757575', + '--card': '#bdbdbd', + + '--green': '#AED581', + '--red': '#FF8A65', + '--yellow': '#FFD54F', + '--blue': '#1E88E5', + '--grey': '#E0E0E0', + '--grey-light': '#9E9E9E', - '--content-creator-cell': '#546e7a', // creator/content-choice-creator.component.scss & creator/content-likert-creator.component.scss - '--content-creator-row': '#9e9e9e', // creator/content-choice-creator.component.scss & creator/content-likert-creator.component.scss - '--content-mat-card': '#bdbdbd', // creator/content-list.component.scss & creator/content-presentation.component.scss - // & creator/room-creator-page.component.scss & room-participant-page.component.scss - '--content-prasentation-header': '#26a69a', // creator/content-presentation.component.scss - '--positiveC': '#AED581', // shared/_dialogs/statistic-help.component.scss - '--negativeC': '#FF8A65', // shared/_dialogs/statistic-help.component.scss - '--okayC': '#FFD54F', // shared/_dialogs/statistic-help.component.scss - '--emptyC': '#E0E0E0', // shared/_dialogs/statistic-help.component.scss - '--comment-mat-card': '#546e7a', // shared/comment.component.scss - '--upvoted': '#66bb6a', // shared/comment.component.scss - '--downvoted': '#FF8A65', // shared/comment.component.scss - '--incorrect-icon': '#c8e6c9', // shared/comment.component.scss - '--correct-icon': '#66bb6a', // shared/comment.component.scss - '--read-icon': '#1e88e5', // shared/comment.component.scss - '--unread-icon': '#e3f2fd', // shared/comment.component.scss - '--favorite-icon': '#fdd835', // shared/comment.component.scss - '--not-favorite-icon': '#fffde7', // shared/comment.component.scss - '--input-search-cl': '#e0e0e0', // shared/comment-list.component.scss - '--footer-bg-color': '#9e9e9e', // shared/footer.component.scss - '--footer-button': '#80cbc4', // shared/footer.component.scss - '--list-st-hCell': '#4db6ac', // shared/list-statistic.component.scss - '--list-st-hCell-bg': '#e0e0e0', // shared/list-statistic.component.scss - '--list-st-mCell-bg': '#E0E0E0', // shared/list-statistic.component.scss - '--list-st-toolbar-bg': '#fff8e1', // shared/list-statistic.component.scss - '--positiveP': '#AED581', // shared/list-statistic.component.scss - '--negativeP': '#FF8A65', // shared/list-statistic.component.scss - '--okayP': '#FFB74D', // shared/list-statistic.component.scss - '--emptyC-color': '#E0E0E0', // shared/list-statistic.component.scss - '--emptyCC': '#E0E0E0', // shared/list-statistic.component.scss - '--room-list-mPanel': '#cfd8dc', // shared/room-list.component.scss - '--room-list-mPLHeader': '#cfd8dc', // shared/room-list.component.scss - '--room-list-card-bg': '#455a64', // shared/room-list.component.scss - '--statistic-bg-color' : '#bdbdbd', // shared/statistic.component.scss & shared/statistics-page.component.scss - '--text-1': '#37474f', // could be used for all texts - '--text-2': '#004d40', // could be used for all texts - '--text-3': '#78909c', // could be used for all texts - '--dialog-bg': '#78909c', - 'stats-ok': '#FFB74D', - '--highlighted-comment' : '#005F63' + '--text-1': '#37474f', + '--text-2': '#004d40', + '--text-3': '#78909c', + '--dialog': '#78909c', + '--highlighted' : '#005F63' }; diff --git a/src/theme/default-Theme/_form.scss b/src/theme/default-Theme/_form.scss index f8516dc9b..bd6b5901d 100644 --- a/src/theme/default-Theme/_form.scss +++ b/src/theme/default-Theme/_form.scss @@ -7,7 +7,7 @@ mat-form-field.input-block { } .mat-dialog-container { - background-color: var(--dialog-bg); + background-color: var(--dialog); } .mat-tab-header { diff --git a/src/theme/default-Theme/defaultTheme.const.ts b/src/theme/default-Theme/defaultTheme.const.ts index e37c02cf7..b12428a94 100644 --- a/src/theme/default-Theme/defaultTheme.const.ts +++ b/src/theme/default-Theme/defaultTheme.const.ts @@ -1,41 +1,24 @@ export const defaultTheme = { - '--primary' : '#4DB6AC', // several components - '--background': '#B2DFDB', // app.component.scss + + '--primary' : '#4DB6AC', + '--light': '#80cbc4', + + '--accent': '#FFE0B2', + + '--background': '#B2DFDB', '--background-2': '#BBDEFB', + '--card': '#fff8e1', + + '--green': '#AED581', + '--red': '#FF8A65', + '--yellow': '#FFD54F', + '--blue': '#1E88E5', + '--grey': '#BDBDBD', + '--grey-light': '#EEEEEE', - '--content-creator-cell': '#FFE0B2', // creator/content-choice-creator.component.scss & creator/content-likert-creator.component.scss - '--content-creator-row': '#ffecb3', // creator/content-choice-creator.component.scss & creator/content-likert-creator.component.scss - '--content-mat-card': '#fff8e1', // creator/content-list.component.scss & creator/content-presentation.component.scss - // & creator/room-creator-page.component.scss & room-participant-page.component.scss - '--content-prasentation-header': '#26a69a', // creator/content-presentation.component.scss - '--positiveC': '#AED581', // shared/_dialogs/statistic-help.component.scss - '--negativeC': '#FF8A65', // shared/_dialogs/statistic-help.component.scss - '--okayC': '#FFD54F', // shared/_dialogs/statistic-help.component.scss - '--emptyC': '#E0E0E0', // shared/_dialogs/statistic-help.component.scss - '--comment-mat-card': '#4dd0e1', // shared/comment.component.scss - '--upvoted': '#66bb6a', // shared/comment.component.scss - '--downvoted': '#FF8A65', // shared/comment.component.scss - '--incorrect-icon': '#c8e6c9', // shared/comment.component.scss - '--correct-icon': '#66bb6a', // shared/comment.component.scss - '--read-icon': '#1e88e5', // shared/comment.component.scss - '--unread-icon': '#e3f2fd', // shared/comment.component.scss - '--favorite-icon': '#fdd835', // shared/comment.component.scss - '--not-favorite-icon': '#fffde7', // shared/comment.component.scss - '--input-search-cl': '#80cbc4', // shared/comment-list.component.scss - '--footer-bg-color': 'rgb(240, 240, 240)', // shared/footer.component.scss - '--footer-button': '#80cbc4', // shared/footer.component.scss - '--list-st-hCell-bg': '#e0e0e0', // shared/list-statistic.component.scss !!!!!!!!!!!! - '--list-st-mCell-bg': '#E0E0E0', // shared/list-statistic.component.scss !!!!!!!!!!!! - '--list-st-toolbar-bg': '#fff8e1', // shared/list-statistic.component.scss - '--positiveP': '#AED581', // shared/list-statistic.component.scss - '--negativeP': '#FF8A65 ', // shared/list-statistic.component.scss - '--okayP': '#FFB74D', // shared/list-statistic.component.scss - '--emptyC-color': '#E0E0E0', // shared/list-statistic.component.scss - '--emptyCC': '#E0E0E0', // shared/list-statistic.component.scss - '--room-list-mPanel': '#cfd8dc', // shared/room-list.component.scss - '--room-list-mPLHeader': '#cfd8dc', // shared/room-list.component.scss - '--room-list-card-bg': '#cfd8dc', // shared/room-list.component.scss - '--statistic-bg-color': '#fff8e1', // shared/statistic.component.scss & shared/statistics-page.component.scss - '--dialog-bg': '#e0f2f1', - '--highlighted-comment' : '#FFE082' + '--text-1': '#37474f', // could be used for all texts !!!!!!!!!!1 + '--text-2': '#004d40', // could be used for all texts !!!!!!11111 + '--text-3': '#37474f', // could be used for all texts !!!!!!!!!1 + '--dialog': '#B2DFDB', + '--highlighted' : '#FFE082' }; -- GitLab