mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-07 10:04:11 +00:00
fix merge mistakes
This commit is contained in:
@@ -1,4 +1,15 @@
|
|||||||
@import '../../../../../src/app/+home-page/home-news/home-news.component';
|
@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 {
|
.jumbotron {
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
a {
|
||||||
|
color: $home-news-link-color;
|
||||||
|
|
||||||
|
@include hover {
|
||||||
|
color: $home-news-link-color;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@@ -1,3 +1,5 @@
|
|||||||
|
@import '../../../../src/app/+home-page/home-page.component';
|
||||||
|
|
||||||
div.background-image {
|
div.background-image {
|
||||||
color: white;
|
color: white;
|
||||||
background-color: $info;
|
background-color: $info;
|
||||||
|
Reference in New Issue
Block a user