Skip to content

Commit

Permalink
fix(tasks): color changing on drag
Browse files Browse the repository at this point in the history
  • Loading branch information
johannesjo committed Dec 21, 2018
1 parent 53f29a9 commit 5f64d83
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/app/tasks/task/task.component.html
Expand Up @@ -5,7 +5,7 @@
[class.isDone]="task.isDone"
[class.isAdditionalInfoOpen]="task._isAdditionalInfoOpen">

<div class="first-line">
<div class="first-line fg-standard">
<button mat-icon-button=""
class="check-done"
*ngIf="task.isDone"
Expand Down
10 changes: 9 additions & 1 deletion src/styles/themes.scss
@@ -1,6 +1,10 @@
@import '~@angular/material/theming';

@mixin color-helper($theme) {
$fg: map-get($theme, foreground);
$fgStandard: map-get($fg, text);

@debug $fgStandard;
$primary: map-get($theme, primary);
$accent: map-get($theme, accent);
$background: map-get($theme, background);
Expand Down Expand Up @@ -44,6 +48,10 @@
background-color: mat-color($primary, 800);
}

.fg-standard {
color: $fgStandard;
}

// for buttons
.mat-lighter {
color: mat-color($primary, default-contrast);
Expand Down Expand Up @@ -351,4 +359,4 @@ $pink-dark-theme: mat-dark-theme($pink-primary, $pink-accent, $pink-warn);
.pink.isDarkTheme {
@include angular-material-theme($pink-dark-theme);
@include color-helper($pink-dark-theme);
}
}

0 comments on commit 5f64d83

Please sign in to comment.