Merge branch 'master' into community-and-collection-forms

Conflicts:
	src/app/core/data/item-data.service.spec.ts
	src/app/core/data/item-data.service.ts
	src/app/core/shared/operators.spec.ts
	src/app/core/shared/operators.ts
	src/app/shared/shared.module.ts
This commit is contained in:
lotte
2019-01-22 08:34:51 +01:00
51 changed files with 2212 additions and 36 deletions

View File

@@ -1,9 +1,7 @@
<div class="jumbotron jumbotron-fluid">
<div class="container">
<div class="d-flex">
<div class="dspace-logo-container">
<img src="assets/images/dspace-logo.png" />
</div>
<div class="d-flex flex-wrap">
<img class="mr-4 dspace-logo" src="assets/images/dspace-logo.svg" alt="" />
<div>
<h1 class="display-3">Welcome to DSpace</h1>
<p class="lead">DSpace is an open source software platform that enables organisations to:</p>

View File

@@ -6,14 +6,11 @@
margin-bottom: -$content-spacing;
}
.dspace-logo-container {
margin: 10px 20px 0px 20px;
.display-3 {
word-break: break-word;
}
.display-3 {
word-break: break-word;
}
.dspace-logo-container img {
max-height: 110px;
max-width: 110px;
.dspace-logo {
height: 110px;
width: 110px;
}