From adaffa122156dc41edd6108de449e087ac2fa3fd Mon Sep 17 00:00:00 2001 From: RIHTARSIC Joze <joze.rihtarsic@ext.ec.europa.eu> Date: Tue, 18 Apr 2023 08:21:42 +0200 Subject: [PATCH] Implement resource document administration --- .../resource-document-panel.component.html | 24 +++++++++++-------- .../src/assets/stylesheets/codeMirror.css | 2 +- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html index 22ea7fb89..93637a389 100644 --- a/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html +++ b/smp-angular/src/app/edit/edit-resources/resource-document-panel/resource-document-panel.component.html @@ -16,15 +16,6 @@ <mat-icon>add_circle</mat-icon> <span>Generate</span> </button> - <button id="saveResource_id" mat-raised-button - color="primary" - matTooltip="Validate resource" - [disabled]="saveButtonDisabled" - (click)="onSaveButtonClicked()" - > - <mat-icon>save</mat-icon> - <span>Save</span> - </button> </mat-toolbar-row> </mat-toolbar> <div [formGroup]="resourceForm" style="width: 100%; display: flex; flex-direction: row; "> @@ -77,12 +68,25 @@ </mat-select> </mat-form-field> </div> - <div style="flex: 2;align-self: stretch; flex-direction: column;"> + <div style="display:block; overflow: auto;flex: 2;align-self: stretch; flex-direction: column;background-color: #FCFCFCBB; border: ridge 3px #b0bec5"> <ngx-codemirror #codemirror formControlName="payload" [options]="codemirrorOptions" ngDefaultControl ></ngx-codemirror> </div> + <mat-toolbar class="mat-elevation-z2" style="flex-grow: 0"> + <mat-toolbar-row> + <button id="saveResource_id" mat-raised-button + color="primary" + matTooltip="Validate resource" + [disabled]="saveButtonDisabled" + (click)="onSaveButtonClicked()" + > + <mat-icon>save</mat-icon> + <span>Save</span> + </button> + </mat-toolbar-row> + </mat-toolbar> </div> </div> diff --git a/smp-angular/src/assets/stylesheets/codeMirror.css b/smp-angular/src/assets/stylesheets/codeMirror.css index fd1bd8055..22bc92bb4 100644 --- a/smp-angular/src/assets/stylesheets/codeMirror.css +++ b/smp-angular/src/assets/stylesheets/codeMirror.css @@ -152,7 +152,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;} .CodeMirror { position: relative; overflow: hidden; - background: white; + background: transparent; } .CodeMirror-scroll { -- GitLab