From 33ea9ce2ed281e83552981e624e347e343ecfadc Mon Sep 17 00:00:00 2001 From: apapachristou Date: Mon, 3 Aug 2020 12:35:34 +0300 Subject: [PATCH] Some style changes on filters dialog --- .../dataset-criteria-dialog.component.scss | 8 + .../dataset-criteria-dialog.component.ts | 1 + .../criteria/dataset-criteria.component.scss | 12 +- .../criteria/dmp-criteria.component.scss | 14 +- .../explore-dataset-filters.component.scss | 3 +- .../explore-dmp-filters.component.scss | 3 +- .../criteria/grant-criteria.component.scss | 176 +++++++++--------- 7 files changed, 128 insertions(+), 89 deletions(-) create mode 100644 dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.scss diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.scss b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.scss new file mode 100644 index 000000000..1d5108761 --- /dev/null +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.scss @@ -0,0 +1,8 @@ +::ng-deep .mat-form-field-wrapper { + background-color: white !important; + padding-bottom: 0 !important; +} + +::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { + padding: 0.3rem 0rem 0.6rem 0rem !important; +} diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts index 29f9f212b..13d01f247 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria-dialogue/dataset-criteria-dialog.component.ts @@ -7,6 +7,7 @@ import { DatasetCriteria } from '@app/core/query/dataset/dataset-criteria'; @Component({ selector: 'dataset-criteria-dialog-component', templateUrl: './dataset-criteria-dialog.component.html', + styleUrls: ['./dataset-criteria-dialog.component.scss'] }) export class DatasetCriteriaDialogComponent implements OnInit { diff --git a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss index 9154b4ca5..e94acdcec 100644 --- a/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dataset/listing/criteria/dataset-criteria.component.scss @@ -21,7 +21,8 @@ .filters-title { width: 93px; - color: #089dbb; + // color: #089dbb; + color: #23bcba; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -32,3 +33,12 @@ .style-icon { color: #adadad; } + +::ng-deep .search-form .mat-form-field-wrapper { + background-color: white !important; + padding-bottom: 0 !important; +} + +::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { + padding: 0.3rem 0rem 0.6rem 0rem !important; +} diff --git a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss index 7d2c18ab2..8198a3f04 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/criteria/dmp-criteria.component.scss @@ -28,8 +28,6 @@ margin-bottom: 12px; } - - .filters { border: 1px solid #e4e4e4; border-radius: 5px; @@ -37,7 +35,8 @@ .filters-title { width: 93px; - color: #089dbb; + // color: #089dbb; + color: #23bcba; background-color: white; padding: 0px 20px; margin-top: -10px; @@ -110,3 +109,12 @@ .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { background-color: #2e74b649; } + +::ng-deep .mat-form-field-wrapper { + background-color: white !important; + padding-bottom: 0 !important; +} + +::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { + padding: 0.3rem 0rem 0.6rem 0rem !important; +} diff --git a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss index b3f5e80d5..d59ca2f65 100644 --- a/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dataset/filters/explore-dataset-filters.component.scss @@ -31,7 +31,8 @@ .filters-title { width: 90px; - color: #089dbb; + // color: #089dbb; + color: #23bcba; background-color: white; padding: 0px 20px; margin-top: -10px; diff --git a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss index 0bceec0ed..c1cd0df9a 100644 --- a/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss +++ b/dmp-frontend/src/app/ui/explore-dmp/dmp-explore-filters/explore-dmp-filters.component.scss @@ -31,7 +31,8 @@ .filters-title { width: 93px; - color: #089dbb; + // color: #089dbb; + color: #23bcba; background-color: white; padding: 0px 20px; margin-top: -10px; diff --git a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss index 107230090..d4e4c18ab 100644 --- a/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss +++ b/dmp-frontend/src/app/ui/grant/listing/criteria/grant-criteria.component.scss @@ -1,61 +1,62 @@ .dmp-criteria { - mat-form-field { - padding-bottom: 5px; - width: 100%; - } - - mat-card { - padding-bottom: 0px; - } - - .hidden { - display: none; - } - - .uploadButton { - float: right; - } + mat-form-field { + padding-bottom: 5px; + width: 100%; } - .search ::ng-deep.mat-form-field-infix { - margin-left: 1em; + mat-card { + padding-bottom: 0px; } - .filter-category { - background-color: #f6f6f6; - margin: 5px 0px; + .hidden { + display: none; } - .category-title { - color: black; - // color: #089dbb; - margin-top: 8px; - margin-bottom: 12px; + .uploadButton { + float: right; } +} - .import { - margin: 10px; - padding: 0px; - } +.search ::ng-deep.mat-form-field-infix { + margin-left: 1em; +} - .filters { - border: 1px solid #e4e4e4; - border-radius: 5px; - } +.filter-category { + background-color: #f6f6f6; + margin: 5px 0px; +} - .filters-title { - width: 90px; - color: #089dbb; - background-color: white; - padding: 0px 20px; - margin-top: -10px; - margin-left: 20px; - text-transform: uppercase; - } +.category-title { + color: black; + // color: #089dbb; + margin-top: 8px; + margin-bottom: 12px; +} - .style-icon { - color: #adadad; - } +.import { + margin: 10px; + padding: 0px; +} + +.filters { + border: 1px solid #e4e4e4; + border-radius: 5px; +} + +.filters-title { + width: 90px; + // color: #089dbb; + color: #23bcba; + background-color: white; + padding: 0px 20px; + margin-top: -10px; + margin-left: 20px; + text-transform: uppercase; +} + +.style-icon { + color: #adadad; +} // ::ng-deep .mat-checkbox-inner-container { // background: white; @@ -73,48 +74,57 @@ // background-color: #00b29f !important; // } - ::ng-deep .mat-checkbox { - background-color: #f6f6f6 !important; - } +::ng-deep .mat-checkbox { + background-color: #f6f6f6 !important; +} - ::ng-deep .mat-checkbox .mat-checkbox-frame { - border: 1px solid #aaaaaa; - } +::ng-deep .mat-checkbox .mat-checkbox-frame { + border: 1px solid #aaaaaa; +} - ::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background, - .mat-checkbox-indeterminate.mat-accent .mat-checkbox-background, - .mat-accent .mat-pseudo-checkbox-checked, - .mat-accent .mat-pseudo-checkbox-indeterminate, - .mat-pseudo-checkbox-checked, - .mat-pseudo-checkbox-indeterminate { - background-color: #00b29f; - } +::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background, +.mat-checkbox-indeterminate.mat-accent .mat-checkbox-background, +.mat-accent .mat-pseudo-checkbox-checked, +.mat-accent .mat-pseudo-checkbox-indeterminate, +.mat-pseudo-checkbox-checked, +.mat-pseudo-checkbox-indeterminate { + background-color: #00b29f; +} - ::ng-deep .mat-ripple-element { - background-color: #2e74b649 !important; - } +::ng-deep .mat-ripple-element { + background-color: #2e74b649 !important; +} - ::ng-deep .mat-radio-container { - border-radius: 1em; - background: white; - } +::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-radio-outer-circle { + border: 1px solid #aaaaaa; +} - ::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { - border-color: #777777; - // border-color: #00b29f; - } +::ng-deep .mat-radio-button.mat-accent.mat-radio-checked .mat-radio-outer-circle { + border-color: #777777; + // border-color: #00b29f; +} - ::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { - color: #777777; - background-color: #777777; - // color: #00b29f; - // background-color: #00b29f; - } +::ng-deep .mat-radio-button.mat-accent .mat-radio-inner-circle { + color: #777777; + background-color: #777777; + // color: #00b29f; + // background-color: #00b29f; +} - .mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { - background-color: #2e74b649; - } +.mat-radio-button.mat-accent .mat-radio-ripple .mat-ripple-element { + background-color: #2e74b649; +} + +::ng-deep .search-form .mat-form-field-wrapper { + background-color: white !important; + padding-bottom: 0 !important; +} + +::ng-deep .mat-form-field-appearance-outline .mat-form-field-infix { + padding: 0.3rem 0rem 0.6rem 0rem !important; +}