hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-45621_filter-facets-ui

Browse Source 
Conflicts:
	src/app/+search-page/search-page.component.html
	src/app/+search-page/search-page.component.spec.ts
	src/app/+search-page/search-page.component.ts
	src/app/+search-page/search-results/search-results.component.html
	src/app/+search-page/search-service/search.service.ts
	src/app/shared/search-form/search-form.component.html
	src/app/shared/shared.module.ts
This commit is contained in:
Lotte Hofstede
2017-11-08 16:08:59 +01:00
parent 91f4ee6ed1 41ac403553
commit 1ff29621af
79 changed files with 1899 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/animations/fade.ts
View File

@@ -1,4 +1,4 @@
import { animate, state, transition, trigger, style, keyframes } from '@angular/animations';
import { animate, style, transition, trigger } from '@angular/animations';
const fadeEnter = transition(':enter', [
style({ opacity: 0 }),