Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

dmp-frontend/src/app/ui/admin/tenant-configuration/editor/default-user-locale/default-user-locale-editor.component.html

@@ -35,11 +35,11 @@
 		<div class="col-12">
 			<div class="row actions-row">
 				<div class="col"></div>
-				<div class="col-auto" *ngIf="editorModel.id"><button mat-raised-button color="primary" (click)="delete()">
+				<div class="col-auto" *ngIf="editorModel.id"><button class="normal-btn" (click)="delete()">
 						{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.RESET-TO-DEFAULT' | translate}}
 					</button>
 				</div>
-				<div class="col-auto"><button mat-raised-button color="primary" (click)="formSubmit()">
+				<div class="col-auto"><button class="normal-btn" (click)="formSubmit()">
 						{{'TENANT-CONFIGURATION-EDITOR.ACTIONS.SAVE' | translate}}
 					</button>
 				</div>

dmp-frontend/src/app/ui/admin/tenant-configuration/editor/tenant-configuration-editor.component.html

@@ -8,20 +8,25 @@
 				</div>
 			</div>
 
+			<div class="row">
+				<div class="col-12">	
 					<mat-card appearance="outlined">
 						<mat-card-header>
 							<mat-card-title>{{'TENANT-CONFIGURATION-EDITOR.TITLE' | translate}}</mat-card-title>
 						</mat-card-header>
 						<mat-card-content>
-					<div class="row">
+							<div class="row mt-3">
-						<mat-accordion class="col-12 headers-align">
+								<div class="col-12">
+									<mat-accordion class="headers-align">
 										<mat-expansion-panel>
 											<mat-expansion-panel-header>
 												<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.DEFAULT-USER-LOCALE.TITLE' | translate}}</mat-panel-title>
 												<mat-panel-description>{{'TENANT-CONFIGURATION-EDITOR.DEFAULT-USER-LOCALE.HINT' | translate}}</mat-panel-description>
 											</mat-expansion-panel-header>
 											<ng-template matExpansionPanelContent>
+												<div class="mt-3">
 													<app-tenant-configuration-default-user-locale-editor></app-tenant-configuration-default-user-locale-editor>
+												</div>
 											</ng-template>
 										</mat-expansion-panel>
 										<mat-expansion-panel>
@@ -33,6 +38,7 @@
 												<app-tenant-configuration-css-colors-editor></app-tenant-configuration-css-colors-editor>
 											</ng-template>
 										</mat-expansion-panel>
+
 										<mat-expansion-panel>
 											<mat-expansion-panel-header>
 												<mat-panel-title>{{'TENANT-CONFIGURATION-EDITOR.DEPOSIT-PLUGINS.TITLE' | translate}}</mat-panel-title>
@@ -63,8 +69,11 @@
 
 									</mat-accordion>
 								</div>
+							</div>
 						</mat-card-content>
 					</mat-card>
 				</div>
 			</div>
 		</div>
+	</div>
+</div>