From 013e0916f5213289fe86b36c287a3c74ea32e5a3 Mon Sep 17 00:00:00 2001
From: annampak <annampak@hotmail.com>
Date: Wed, 20 Dec 2017 14:23:44 +0200
Subject: [PATCH] dataset style

---
 .../editor/dataset-editor.component.html      | 31 ++++++++++---------
 .../datasets/datasets-criteria.component.css  |  0
 .../datasets/datasets-criteria.component.html |  6 ++--
 .../datasets/datasets-criteria.component.scss | 10 ++++++
 .../datasets/datasets-criteria.component.ts   |  2 +-
 5 files changed, 30 insertions(+), 19 deletions(-)
 delete mode 100644 dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.css
 create mode 100644 dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.scss

diff --git a/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html
index 015a8a8da..4ee4ab353 100644
--- a/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html
+++ b/dmp-frontend/src/app/datasets/editor/dataset-editor.component.html
@@ -6,18 +6,19 @@
             <mat-card-content>
 
                 <mat-form-field>
-                    <input matInput placeholder="{{'DATASET-EDITOR.FIELDS.NAME' | translate}}" type="text" name="label" formControlName="label" required>
+                    <input matInput placeholder="{{'DATASET-EDITOR.FIELDS.NAME' | translate}}" type="text" name="label" formControlName="label"
+                        required>
                     <mat-error *ngIf="formGroup.get('label').errors?.backendError">{{baseErrorModel.label}}</mat-error>
                     <mat-error *ngIf="formGroup.get('label').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
                 </mat-form-field>
 
                 <mat-form-field>
-                    <input matInput placeholder="{{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}" type="text" name="profile" formControlName="profile"
-                        required>
+                    <input matInput placeholder="{{'DATASET-EDITOR.FIELDS.PROFILE' | translate}}" type="text" formControlName="profile" required>
                     <mat-error *ngIf="formGroup.get('profile').errors?.backendError">{{baseErrorModel.profile}}</mat-error>
                     <mat-error *ngIf="formGroup.get('profile').errors?.required">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
                 </mat-form-field>
 
+
                 <mat-form-field>
                     <input matInput placeholder="{{'DATASET-EDITOR.FIELDS.URI' | translate}}" type="text" name="uri" formControlName="uri" required>
                     <mat-error *ngIf="formGroup.get('uri').errors?.backendError">{{baseErrorModel.uri}}</mat-error>
@@ -85,18 +86,18 @@
                 </td-chips>
 
                 <td-chips color="accent" [items]="filteredServices" formControlName="services" placeholder="{{'DATASET-EDITOR.FIELDS.SERVICES' | translate}}"
-                (inputChange)="filteredServices($event)" requireMatch>
-                <ng-template td-chip let-chip="chip">
-                    <div class="tc-grey-100 bgc-teal-700" td-chip-avatar>{{chip.label.substring(0, 1).toUpperCase()}}</div>
-                    {{chip.name}}
-                </ng-template>
-                <ng-template td-autocomplete-option let-option="option">
-                    <div layout="row" layout-align="start center">
-                        {{option.name}}
-                    </div>
-                </ng-template>
-                <mat-progress-bar [style.height.px]="2" *ngIf="filteringResearchersAsync" mode="indeterminate"></mat-progress-bar>
-            </td-chips>
+                    (inputChange)="filteredServices($event)" requireMatch>
+                    <ng-template td-chip let-chip="chip">
+                        <div class="tc-grey-100 bgc-teal-700" td-chip-avatar>{{chip.label.substring(0, 1).toUpperCase()}}</div>
+                        {{chip.name}}
+                    </ng-template>
+                    <ng-template td-autocomplete-option let-option="option">
+                        <div layout="row" layout-align="start center">
+                            {{option.name}}
+                        </div>
+                    </ng-template>
+                    <mat-progress-bar [style.height.px]="2" *ngIf="filteringResearchersAsync" mode="indeterminate"></mat-progress-bar>
+                </td-chips>
 
                 <div layout="row" class="full-width text-right" align="end">
                     <button mat-raised-button color="primary" (click)="cancel()" type="button">{{'DATASET-EDITOR.ACTIONS.CANCEL' | translate}}</button>
diff --git a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.css b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.css
deleted file mode 100644
index e69de29bb..000000000
diff --git a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html
index ba29fd80e..139fa0fce 100644
--- a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html
+++ b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.html
@@ -1,4 +1,4 @@
-<form class="form-criteria">
+<form class="dataset-criteria">
 	<mat-card class="mat-card">
 		<div class="row">
 			<!-- <div class="col-sm-6 col-md-2">
@@ -15,14 +15,14 @@
 					<mat-datepicker #periodStartPicker></mat-datepicker>
 				</mat-form-field>
 			</div> -->
-			<div class="col-sm-6 col-md-2">
+			<div class="col-md-6">
 				<mat-form-field>
 					<input matInput placeholder=" {{'CRITERIA.PROJECTS.LIKE'| translate}}" name="datasetCriteriaName" [(ngModel)]="criteria.like"
 					 (ngModelChange)="controlModified()">
 					<mat-error *ngIf="baseErrorModel?.name">{{baseErrorModel['Criteria.like']}}</mat-error>
 				</mat-form-field>
 			</div>
-			<div class="col-sm-6 col-md-2">
+			<div class="col-md-6">
 				<mat-form-field>
 					<mat-select placeholder=" {{'CRITERIA.DATA-SETS.STATUS'| translate}}" name="datasetCriteriastatus" [(ngModel)]="criteria.status"
 					 (ngModelChange)="controlModified()">
diff --git a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.scss b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.scss
new file mode 100644
index 000000000..4b97c8cfa
--- /dev/null
+++ b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.scss
@@ -0,0 +1,10 @@
+.dataset-criteria {
+	mat-form-field {
+		padding-bottom: 5px;
+		width: 100%;
+	}
+
+	mat-card {
+		padding-bottom: 0px;
+	}
+}
diff --git a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.ts b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.ts
index 04bbcfe40..fa15a6b09 100644
--- a/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.ts
+++ b/dmp-frontend/src/app/shared/components/criteria/datasets/datasets-criteria.component.ts
@@ -10,7 +10,7 @@ import { DatasetCriteria } from '../../../../models/criteria/dataset/DatasetCrit
 @Component({
 	selector: 'app-datasets-criteria-component',
 	templateUrl: './datasets-criteria.component.html',
-	styleUrls: ['./datasets-criteria.component.css'],
+	styleUrls: ['./datasets-criteria.component.scss'],
 	providers: [
 	]
 })