diff --git a/package.json b/package.json index 662b4b627f..f2bb074ff4 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,6 @@ "methods": "1.1.2", "morgan": "1.9.0", "ngx-pagination": "3.0.1", - "object-fit-images": "^3.2.3", "pem": "1.12.3", "reflect-metadata": "0.1.10", "rxjs": "5.4.3", diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html index 5dc717cf54..b1287212a3 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html @@ -3,10 +3,12 @@ -
+

{{object.name}}

{{object.shortDescription}}

- View +
+ View +
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.scss b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.scss index 946c8a6a31..51a7fc6a55 100644 --- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.scss +++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.scss @@ -1,2 +1,2 @@ @import '../../../../styles/variables'; -@import '../grid-card-styling'; + diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html index e4ea3dcb13..b6f4c5c5d9 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html @@ -4,9 +4,11 @@ -
+

{{object.name}}

{{object.shortDescription}}

- View +
+ View +
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.scss b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.scss index 946c8a6a31..51a7fc6a55 100644 --- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.scss +++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.scss @@ -1,2 +1,2 @@ @import '../../../../styles/variables'; -@import '../grid-card-styling'; + diff --git a/src/app/shared/object-grid/grid-card-styling.scss b/src/app/shared/object-grid/grid-card-styling.scss deleted file mode 100644 index 2fe199d1ce..0000000000 --- a/src/app/shared/object-grid/grid-card-styling.scss +++ /dev/null @@ -1,45 +0,0 @@ -@import '../../../styles/custom_variables'; - -.card-title{ - line-height: $line-height-base; - height:$headings-line-height; - font-size:$headings-font-size; - overflow: hidden; - text-overflow: ellipsis; -} - -.card-text { - overflow: hidden; - text-overflow: ellipsis; - line-height: $line-height-base; - margin-bottom:$card-block-margin-base*2; -} -.card-text.item-authors { - height: $line-height-base; -} -.card-text.item-abstract { - height: $content-line-height; -} - -.viewButton{ - display:table; - margin:auto; - width: $card-button-width; -} - -.card{ - margin-bottom: $card-block-margin-base *3; - height: $card-height-percentage; -} - -.card-img-top ::ng-deep img -{ - height: $card-thumbnail-height; - width: 100%; - object-fit: cover; -} - -.card-block{ - margin: $card-block-margin-base; -} - diff --git a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html index 3fae55088e..b8bacfaf2e 100644 --- a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html +++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.html @@ -4,7 +4,7 @@ -
+

{{object.findMetadata('dc.title')}}

@@ -16,6 +16,8 @@

{{object.findMetadata("dc.description.abstract") | dsTruncate:[200] }}

- View +
+ View +
diff --git a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.scss b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.scss index 946c8a6a31..51a7fc6a55 100644 --- a/src/app/shared/object-grid/item-grid-element/item-grid-element.component.scss +++ b/src/app/shared/object-grid/item-grid-element/item-grid-element.component.scss @@ -1,2 +1,2 @@ @import '../../../../styles/variables'; -@import '../grid-card-styling'; + diff --git a/src/app/shared/object-grid/object-grid-element/object-grid-element.component.scss b/src/app/shared/object-grid/object-grid-element/object-grid-element.component.scss index d299edd0ab..d4720c4a64 100644 --- a/src/app/shared/object-grid/object-grid-element/object-grid-element.component.scss +++ b/src/app/shared/object-grid/object-grid-element/object-grid-element.component.scss @@ -1,5 +1,4 @@ @import '../../../../styles/variables'; -@import '../grid-card-styling'; :host { display: block; margin-bottom: $spacer; diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html index ebcf240d28..32c3e9ec4f 100644 --- a/src/app/shared/object-grid/object-grid.component.html +++ b/src/app/shared/object-grid/object-grid.component.html @@ -10,8 +10,8 @@ (sortDirectionChange)="onSortDirectionChange($event)" (sortFieldChange)="onSortDirectionChange($event)" (paginationChange)="onPaginationChange($event)"> -
-
+
diff --git a/src/app/shared/object-grid/object-grid.component.scss b/src/app/shared/object-grid/object-grid.component.scss index 48e6526dff..c01dfbdc85 100644 --- a/src/app/shared/object-grid/object-grid.component.scss +++ b/src/app/shared/object-grid/object-grid.component.scss @@ -1 +1,23 @@ @import '../../../styles/variables'; + +ds-wrapper-grid-element ::ng-deep { + div.thumbnail > img { + height: $card-thumbnail-height; + width: 100%; + } + .card-title { + line-height: $headings-line-height; + height: ($headings-line-height*3) +em; + overflow: hidden; + text-overflow: ellipsis; + } + .item-abstract { + line-height: $line-height-base; + height: ($line-height-base*5)+em; + overflow: hidden; + text-overflow: ellipsis; + } + div.card { + margin-bottom: 20px; + } +} diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html index ae63924374..d6b1bfb5f4 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html @@ -3,10 +3,11 @@ -
+

{{dso.name}}

{{dso.shortDescription}}

- View - +
+ View +
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss index 2867dd78ac..1d0786105c 100644 --- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss +++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.scss @@ -1,2 +1 @@ @import '../../../../../styles/variables'; -@import '../../grid-card-styling'; diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html index 2707934c56..8ff6874bff 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html @@ -4,9 +4,11 @@ -
+

{{dso.name}}

{{dso.shortDescription}}

- View +
+ View +
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss index 2867dd78ac..bd63aa6a3a 100644 --- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss +++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.scss @@ -1,2 +1,2 @@ @import '../../../../../styles/variables'; -@import '../../grid-card-styling'; + diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html index be84039416..ce9324477f 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.html @@ -1,10 +1,10 @@
- + -
-

+
+

@@ -25,7 +25,9 @@

- View +
+ View +
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss index 2867dd78ac..bd63aa6a3a 100644 --- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss +++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item-search-result-grid-element.component.scss @@ -1,2 +1,2 @@ @import '../../../../../styles/variables'; -@import '../../grid-card-styling'; + diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.scss b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.scss index ebec5817e6..e8d681fb32 100644 --- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.scss +++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.scss @@ -1,5 +1,4 @@ @import '../../../../styles/variables'; - @import '../grid-card-styling'; :host { /deep/ em { font-weight: bold; diff --git a/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss index 946c8a6a31..51a7fc6a55 100644 --- a/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss +++ b/src/app/shared/object-grid/wrapper-grid-element/wrapper-grid-element.component.scss @@ -1,2 +1,2 @@ @import '../../../../styles/variables'; -@import '../grid-card-styling'; + diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 8c0dcae928..4dcc161cc4 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -2,3 +2,5 @@ $content-spacing: $spacer * 1.5; $button-height: $input-btn-padding-y * 2 + $input-btn-line-height + calculateRem($input-btn-border-width*2); $card-height-percentage:98%; +$card-thumbnail-height:240px; + diff --git a/yarn.lock b/yarn.lock index 4211b7228a..91b2a787e2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4804,10 +4804,6 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-fit-images@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/object-fit-images/-/object-fit-images-3.2.3.tgz#4089f6d0070a3b5563d3c1ab6f1b28d61331f0ac" - object-keys@^1.0.8: version "1.0.11" resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"