Merge branch 'master' into w2p-54472_Create-community-and-collection-pages

Conflicts:
	resources/i18n/en.json
	src/app/+community-page/community-page.component.html
	src/app/+community-page/community-page.module.ts
	src/app/core/auth/server-auth.service.ts
	src/app/core/core.module.ts
	src/app/core/index/index.effects.ts
	src/app/core/index/index.reducer.spec.ts
	src/app/core/index/index.reducer.ts
	src/app/header/header.component.spec.ts
This commit is contained in:
lotte
2018-12-20 15:59:23 +01:00
136 changed files with 5374 additions and 1958 deletions

View File

@@ -8,6 +8,9 @@
.dspace-logo-container {
margin: 10px 20px 0px 20px;
.display-3 {
word-break: break-word;
}
}
.dspace-logo-container img {