fix merge mistakes

This commit is contained in:
Art Lowel
2019-05-30 10:12:37 +02:00
parent eca6aa9b04
commit 32e7b7a3b4
2 changed files with 14 additions and 1 deletions

View File

@@ -1,4 +1,15 @@
@import '../../../../../src/app/+home-page/home-news/home-news.component';
$home-news-link-color: $green !default;
$home-news-link-color: darken($home-news-link-color, 15%) !default;
.jumbotron {
background-color: transparent;
background-color: transparent;
}
a {
color: $home-news-link-color;
@include hover {
color: $home-news-link-color;
}
}

View File

@@ -1,3 +1,5 @@
@import '../../../../src/app/+home-page/home-page.component';
div.background-image {
color: white;
background-color: $info;