From c6ce420873bbdb64126d94579767bd3531760b22 Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Fri, 31 Aug 2018 19:05:07 +0200 Subject: [PATCH] Added scss variables --- src/app/shared/uploader/uploader.component.scss | 2 +- .../collection/submission-form-collection.component.scss | 2 +- .../sections/container/section-container.component.scss | 5 ++--- src/app/submission/sections/upload/file/file.component.scss | 2 +- src/styles/_custom_variables.scss | 1 + 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/shared/uploader/uploader.component.scss b/src/app/shared/uploader/uploader.component.scss index dd80a736ca..370c3ea280 100644 --- a/src/app/shared/uploader/uploader.component.scss +++ b/src/app/shared/uploader/uploader.component.scss @@ -10,7 +10,7 @@ } .ds-base-drop-zone p { - min-height: 42px; + min-height: $drop-zone-area-height; } .ds-document-drop-zone { diff --git a/src/app/submission/form/collection/submission-form-collection.component.scss b/src/app/submission/form/collection/submission-form-collection.component.scss index b72d04d3c9..f91f85677d 100644 --- a/src/app/submission/form/collection/submission-form-collection.component.scss +++ b/src/app/submission/form/collection/submission-form-collection.component.scss @@ -2,7 +2,7 @@ .scrollable-menu { height: auto; - max-height: 200px; + max-height: $dropdown-menu-max-height; overflow-x: hidden; } diff --git a/src/app/submission/sections/container/section-container.component.scss b/src/app/submission/sections/container/section-container.component.scss index f71765be88..ab1b9e0341 100644 --- a/src/app/submission/sections/container/section-container.component.scss +++ b/src/app/submission/sections/container/section-container.component.scss @@ -1,11 +1,10 @@ @import '../../../../styles/variables'; :host /deep/ .card { - margin-bottom: 0.5rem; + margin-bottom: $border-radius * 2; } .section-focus { - // box-shadow: $btn-focus-box-shadow; - border-radius: 0.25rem; + border-radius: $border-radius; box-shadow: $btn-focus-box-shadow; } diff --git a/src/app/submission/sections/upload/file/file.component.scss b/src/app/submission/sections/upload/file/file.component.scss index 754ce62835..ce67ef98df 100644 --- a/src/app/submission/sections/upload/file/file.component.scss +++ b/src/app/submission/sections/upload/file/file.component.scss @@ -2,7 +2,7 @@ .sticky-buttons { position: sticky; - top: 72px; + top: $dropdown-item-padding-x * 3; z-index: $submission-footer-z-index; background-color: rgba($white, .97); } diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index f6f68eaec1..1034998412 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -4,6 +4,7 @@ $button-height: $input-btn-padding-y * 2 + $input-btn-line-height + calculateRem $card-height-percentage:98%; $card-thumbnail-height:240px; $dropdown-menu-max-height: 200px; +$drop-zone-area-height: 42px; $drop-zone-area-z-index: 1025; $drop-zone-area-inner-z-index: 1021; $login-logo-height:72px;