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

Merge remote-tracking branch 'remotes/origin/master' into dynamic_forms

Browse Source 
# Conflicts:
#	resources/i18n/en.json
#	src/app/core/cache/response-cache.models.ts
#	src/app/core/data/request.models.ts
#	src/app/shared/shared.module.ts
#	src/styles/_custom_variables.scss
This commit is contained in:
Giuseppe Digilio
2018-07-12 14:56:57 +02:00
parent 6e68297107 44e58e1282
commit 10d90e4325
133 changed files with 6196 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/styles/_custom_variables.scss
View File

@@ -6,4 +6,6 @@ $card-thumbnail-height:240px;
$dropdown-menu-max-height: 200px;
$drop-zone-area-z-index: 1025;
$drop-zone-area-inner-z-index: 1021;
$login-logo-height:72px;
$login-logo-width:72px;