diff --git a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss index c8073db0e..d60d77eee 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/dataset-listing.component.scss @@ -29,6 +29,32 @@ margin-left: auto !important; } +::ng-deep .mat-ripple-element { + background-color: #2e74b649 !important; +} + +::ng-deep .mat-radio-container { + border-radius: 1em; + background: white; +} + +::ng-deep .mat-radio-button .mat-radio-outer-circle { + border: 1px solid #aaaaaa; +} + +::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { + border-color: #2e75b6; +} + +::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { + color: #2e75b6; + background-color: #2e75b6; +} + +.mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { + background-color: #2e74b649; +} + // .mat-table { // margin: 24px; // } diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss index a3687c77a..db19d7277 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.scss @@ -46,29 +46,3 @@ h4 { padding-top: 7px; color: #aaaaaa; } - -::ng-deep .mat-ripple-element { - background-color: #2e74b649 !important; -} - -::ng-deep .mat-radio-container { - border-radius: 1em; - background: white; -} - -::ng-deep .mat-radio-button .mat-radio-outer-circle { - border: 1px solid #aaaaaa; -} - -::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #2e75b6; -} - -::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #2e75b6; - background-color: #2e75b6; -} - -.mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { - background-color: #2e74b649; -} diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html index 2e3ca7661..fed53183f 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.html @@ -7,7 +7,7 @@
{{'DATASET-LISTING.SUBTITLE' | translate}}
diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss index 8cd5f2fd6..d62fd87ad 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.scss @@ -1,25 +1,60 @@ text-center { - text-align: center + text-align: center; } .header-image { - background: url('/assets/images/public-datasets-bg.png') no-repeat; - background-size: cover; - margin-top: 70px; - min-height: 15em; - position: relative; + background: url("/assets/images/public-datasets-bg.png") no-repeat; + background-size: cover; + margin-top: 70px; + min-height: 15em; + position: relative; } .header-text-container { - background: rgba(255,255,255,0.7); - position: absolute; - bottom: 0px; - padding-left: 5em; - padding-right: 10em; - padding-top: 2em; - padding-bottom: 2em; + background: rgba(255, 255, 255, 0.7); + position: absolute; + bottom: 0px; + padding-left: 5em; + padding-right: 10em; + padding-top: 2em; + padding-bottom: 2em; } .explore-dmp-content { - padding: 30px 15px; + padding: 30px 15px; +} + +::ng-deep .mat-paginator { + margin-top: 1em; +} + +::ng-deep .mat-paginator-container { + flex-direction: row-reverse !important; + justify-content: space-between !important; + background-color: #f6f6f6; + height: 30px; + min-height: 30px !important; +} + +::ng-deep .mat-paginator-page-size { + height: 43px; +} + +::ng-deep .mat-icon-button { + height: 30px !important; + font-size: 12px !important; +} + +::ng-deep .mat-paginator-range-label { + margin: 15px 32px 0 24px !important; +} + +::ng-deep .mat-paginator-range-actions { + width: 55% !important; + min-height: 43px !important; + justify-content: space-between; +} + +::ng-deep .mat-paginator-navigation-previous { + margin-left: auto !important; } diff --git a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts index 48fe40196..464664a8d 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts +++ b/dmp-frontend/src/app/ui/explore-dataset/explore-dataset-listing.component.ts @@ -31,7 +31,7 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI } ngOnInit() { - + this.refresh(); } refresh() { @@ -64,4 +64,4 @@ export class ExploreDatasetListingComponent extends BaseComponent implements OnI // } return defaultCriteria; } -} \ No newline at end of file +} diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html index 7f2274bab..a2442da07 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.html @@ -1,4 +1,66 @@ -{{ dataset.description }}
-{{dataset.description}}
+{{'DMP-LISTING.SUBTITLE' | translate}}