MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

styling fixes

This commit is contained in:
Sofia Papacharalampous 2024-07-08 10:52:12 +03:00
parent a3c7fc13a8
commit 76d3b86174
6 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts
View File

@ -37,11 +37,11 @@ export class EnumUtils {
public getEnumValues<T>(T): Array<T> { public getEnumValues<T>(T): Array<T> {
//getting all numeric values //getting all numeric values
const numericValues: T[] = Object.keys(T).map(key => T[key]).filter(value => typeof (value) === 'number'); const numericValues: any = Object.keys(T).map(key => T[key]).filter(value => typeof (value) === 'number');
if (numericValues.length > 0) { return numericValues; } if (numericValues.length > 0) { return numericValues; }
//getting all string values //getting all string values
const stringValues: T[] = Object.keys(T).map(key => T[key]).filter(value => typeof (value) === 'string'); const stringValues: any = Object.keys(T).map(key => T[key]).filter(value => typeof (value) === 'string');
if (stringValues.length > 0) { return stringValues; } if (stringValues.length > 0) { return stringValues; }
return []; return [];

48
dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html
View File

@ -1,25 +1,33 @@
<div class="mt-3 pl-3 pr-3 pb-2 pt-1"> <!-- <div class="mt-3 pl-3 pr-3 pb-2 pt-1"> -->
<div class="row d-flex justify-content-between align-items-center"> <div style="padding: 0 1.5rem;">
<div class="col-auto pr-0"> <div class="row mt-1 justify-content-between align-items-center">
<button mat-icon-button class="col-auto" type="button" matTooltip="{{ 'DESCRIPTION-EDITOR.QUESTION.EXTENDED-DESCRIPTION.COPY-LINK' | translate }}" (click)="copyLink()"> <div class="col-auto">
<h3 class="mt-2" style="font-size: 18px; font-weight: 400;">{{'ANNOTATION-DIALOG.TITLE' | translate}}</h3>
</div>
<div *ngIf="threads?.size > 0" class="col-auto pl-0">
<button class="comments-count" mat-min-fab extended disabled>
<span>{{ annotationsCount }}ew43344</span>
</button>
</div>
<div class="col-auto pr-0 ml-auto dense-4">
<button mat-icon-button matTooltip="{{ 'DESCRIPTION-EDITOR.QUESTION.EXTENDED-DESCRIPTION.COPY-LINK' | translate }}" (click)="copyLink()">
<mat-icon>link</mat-icon> <mat-icon>link</mat-icon>
</button> </button>
</div> </div>
<div class="col-auto"> <div class="col-auto pl-0 dense-4" (click)="close()">
<h4 class="mt-2">{{'ANNOTATION-DIALOG.TITLE' | translate}}</h4> <button mat-icon-button>
</div> <mat-icon>close</mat-icon>
<div class="col-auto ml-auto" (click)="close()"> </button>
<mat-icon class="close-icon">close</mat-icon>
</div> </div>
</div> </div>
</div> </div>
<mat-dialog-content> <mat-dialog-content class="pt-1">
<div class="row"> <div class="row">
<!-- Create New Thread --> <!-- Create New Thread -->
<div class="col-12"> <div class="col-12">
<form [formGroup]="threadFormGroup"> <form [formGroup]="threadFormGroup">
<div class="row mt-2 mb-3"> <div class="row mt-2 mb-3">
<div class="col-12 mb-2"> <div class="col-12">
<mat-form-field appearance="outline" class="w-100"> <mat-form-field appearance="outline" class="w-100">
<mat-label>{{'ANNOTATION-DIALOG.THREADS.NEW-THREAD' | translate}}</mat-label> <mat-label>{{'ANNOTATION-DIALOG.THREADS.NEW-THREAD' | translate}}</mat-label>
<textarea matInput name="text" rows="2" formControlName="text" required></textarea> <textarea matInput name="text" rows="2" formControlName="text" required></textarea>
@ -46,27 +54,19 @@
</div> </div>
</form> </form>
</div> </div>
<div class="col-12 pt-2 gr-color" *ngIf="threads?.size > 0">
<div class="row">
<div class="col-auto">
<span>{{'ANNOTATION-DIALOG.TITLE' | translate}}</span>
<span class="comments-count">{{ annotationsCount }}</span>
</div>
</div>
</div>
<div class="col-12"> <div class="col-12">
<ng-container *ngFor="let thread of threads"> <ng-container *ngFor="let thread of threads">
<div class="row" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.Private"> <div class="row" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.Private">
<div class="col-auto ml-auto"> <div class="col-auto">
<div class="d-flex align-items-center" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.PRIVATE' | translate}}"> <div class="d-flex align-items-center" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.PRIVATE' | translate}}">
<mat-icon>visibility_off</mat-icon> <mat-icon class="material-icons-outlined">visibility_off</mat-icon>
<div class="ml-1 mt-1"> <div class="ml-1 mt-1">
{{getAnnotationProtectionType(thread)}} {{getAnnotationProtectionType(thread)}}
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="row ml-auto" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.EntityAccessors"> <!-- <div class="row" *ngIf="getParentAnnotation(thread).protectionType === annotationProtectionTypeEnum.EntityAccessors">
<div class="col-auto ml-auto"> <div class="col-auto ml-auto">
<div class="d-flex aling-items center" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.ENTITY-ACCESSORS' | translate}}"> <div class="d-flex aling-items center" matTooltip="{{'ANNOTATION-DIALOG.PROTECTION.ENTITY-ACCESSORS' | translate}}">
<mat-icon>public</mat-icon> <mat-icon>public</mat-icon>
@ -75,8 +75,8 @@
</span> </span>
</div> </div>
</div> </div>
</div> </div> -->
<div class="row mt-2 mb-2"> <div class="row mt-2 mb-3">
<!-- Parent Thread --> <!-- Parent Thread -->
<div class="col-12"> <div class="col-12">
<div class="container"> <div class="container">

17
dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.scss
View File

@ -64,15 +64,10 @@ $mat-card-header-size: 40px !default;
} }
.comments-count { .comments-count {
border-radius: 50%; background-color: var(--primary-color) !important;// #129D99;
background-color: #129D99; color: #FFFFFF !important;
color: #FFFFFF; min-width: 2rem;
margin-left: 0.5em; border-radius: 15px;
display: inline-block;
width: 40px;
height: 40px;
padding: 12px;
text-align: center;
} }
.account-icon-wrapper { .account-icon-wrapper {
@ -86,7 +81,8 @@ $mat-card-header-size: 40px !default;
} }
.comment-wrapper { .comment-wrapper {
background-color: #F5F5F5; border-radius: 4px;
border: .1rem solid #cecece54;
} }
.user { .user {
@ -112,3 +108,4 @@ $mat-card-header-size: 40px !default;
.selected { .selected {
background-color: #18488f3d; background-color: #18488f3d;
} }

2
dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html
View File

@ -17,7 +17,7 @@
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-auto"><span class="dmp-logo">{{ 'PLAN-OVERVIEW.TITLE' | translate }}</span></div> <div class="col-auto"><span class="dmp-logo">{{ 'PLAN-OVERVIEW.TITLE' | translate }}</span></div>
<div class="col-auto pr-0 d-flex"><span class="dmp-label">{{ dmp.label }}</span></div> <div class="col-auto pr-0 d-flex"><span class="dmp-label">{{ dmp.label }}</span></div>
<div class="col-auto pr-0"><span style="font-weight: 700;">.</span></div> <div class="col-auto pr-0 d-flex"><span class="mb-1" style="font-weight: 700;">.</span></div>
<div class="col-auto d-flex"><button mat-button [matMenuTriggerFor]="versions" style="border-radius: 100px; background-color: #eaeaea;"> <div class="col-auto d-flex"><button mat-button [matMenuTriggerFor]="versions" style="border-radius: 100px; background-color: #eaeaea;">
<div class="pl-2 pr-1 d-flex align-items-center">{{'PLAN-OVERVIEW.VERSION' | translate}} {{selectedDmpVersion?.version}} <mat-icon class="ml-1">arrow_drop_down</mat-icon></div> <div class="pl-2 pr-1 d-flex align-items-center">{{'PLAN-OVERVIEW.VERSION' | translate}} {{selectedDmpVersion?.version}} <mat-icon class="ml-1">arrow_drop_down</mat-icon></div>
</button></div> </button></div>

2
dmp-frontend/src/assets/i18n/en.json
View File

@ -1840,7 +1840,7 @@
}, },
"TYPES": { "TYPES": {
"ANNOTATION-PROTECTION-TYPE": { "ANNOTATION-PROTECTION-TYPE": {
"PRIVATE": "Hidden", "PRIVATE": "Private",
"ENTITY-ACCESSORS": "Visible" "ENTITY-ACCESSORS": "Visible"
}, },
"APP-ROLE": { "APP-ROLE": {

7
dmp-frontend/src/styles.scss
View File

@ -397,3 +397,10 @@ $mat-dark-theme: mat.m2-define-dark-theme((color: (primary: $mat-dark-theme-prim
@include mat.all-component-densities(-3); @include mat.all-component-densities(-3);
} }
.dense-4 {
@include mat.all-component-densities(-4);
}
.dense-10 {
@include mat.all-component-densities(-10);
}