From ff686a33d03ab7b3d2d65ad6fb3a8bec86bd197b Mon Sep 17 00:00:00 2001 From: apapachristou Date: Wed, 8 May 2019 16:42:36 +0300 Subject: [PATCH] Paginator Returns --- .../listing/dataset-listing.component.scss | 35 +++++++++ .../ui/dmp/listing/dmp-listing.component.scss | 70 ++++++++--------- dmp-frontend/src/styles.scss | 77 +++++-------------- 3 files changed, 91 insertions(+), 91 deletions(-) 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 4ab0480b4..4e233f9f3 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 @@ -34,3 +34,38 @@ // h3 { // margin-top: 0px; // } + +::ng-deep .mat-paginator { + margin-top: auto; +} + +::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/dmp/listing/dmp-listing.component.scss b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss index f03235e1a..2c71ecd54 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/dmp-listing.component.scss @@ -1,3 +1,38 @@ +::ng-deep .mat-paginator { + margin-top: auto; +} + +::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; +} + // .listing { // .mat-card { // margin: 1em 0; @@ -8,38 +43,3 @@ // flex-direction: column; // } // } - -// ::ng-deep .mat-paginator { -// margin-top: auto; -// } - -// ::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/styles.scss b/dmp-frontend/src/styles.scss index 93b5a3bb8..33a35a6b9 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -48,13 +48,13 @@ $theme: mat-light-theme($primary, $accent); } .chip { - padding: 0.1em 1em; + padding: 0.1em 1em; border: 0.1em solid rgb(218, 227, 243); border-radius: 10em; background-color: rgb(236, 241, 249); - color: rgb(68, 114, 196); - text-transform: uppercase; - font-weight: 500; + color: rgb(68, 114, 196); + text-transform: uppercase; + font-weight: 500; } .squared-chip { @@ -76,8 +76,8 @@ $theme: mat-light-theme($primary, $accent); .info { background-color: #f6f6f6; - padding: 8px 15px; - margin-bottom: 15px; + padding: 8px 15px; + margin-bottom: 15px; } .info p { @@ -90,21 +90,21 @@ $theme: mat-light-theme($primary, $accent); margin-bottom: 0px; } -// .template-name { -// padding-left: 0px; -// border: 1px solid rgb(218, 227, 243); -// color: rgb(43, 104, 209); -// background-color: rgb(236, 241, 249); -// border-radius: 10em; -// justify-content: center; -// text-transform: uppercase; -// display: flex; -// width: 25em; -// height: 1.8em; -// margin-top: 15px; -// font-size: 13px; -// font-weight: 500; -// } + // .template-name { + // padding-left: 0px; + // border: 1px solid rgb(218, 227, 243); + // color: rgb(43, 104, 209); + // background-color: rgb(236, 241, 249); + // border-radius: 10em; + // justify-content: center; + // text-transform: uppercase; + // display: flex; + // width: 25em; + // height: 1.8em; + // margin-top: 15px; + // font-size: 13px; + // font-weight: 500; + // } .draft-bookmark { color: #e7e6e6; @@ -129,39 +129,4 @@ $theme: mat-light-theme($primary, $accent); display: flex; flex-direction: column; } - - ::ng-deep .mat-paginator { - margin-top: auto; - } - - ::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; - } }