diff --git a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts index 91ef4ada0..bd9d0df24 100644 --- a/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts +++ b/dmp-frontend/src/app/core/services/utilities/enum-utils.service.ts @@ -37,11 +37,11 @@ export class EnumUtils { public getEnumValues(T): Array { //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; } //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; } return []; diff --git a/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html b/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html index fb6435e39..dc34ca405 100644 --- a/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html +++ b/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.html @@ -1,25 +1,33 @@ -
-
-
- +
+
+
-
-

{{'ANNOTATION-DIALOG.TITLE' | translate}}

-
-
- close +
+
- +
-
+
{{'ANNOTATION-DIALOG.THREADS.NEW-THREAD' | translate}} @@ -46,27 +54,19 @@
-
-
-
- {{'ANNOTATION-DIALOG.TITLE' | translate}} - {{ annotationsCount }} -
-
-
-
+
- visibility_off + visibility_off
{{getAnnotationProtectionType(thread)}}
-
+ +
diff --git a/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.scss b/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.scss index 85522c335..81284ea70 100644 --- a/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.scss +++ b/dmp-frontend/src/app/ui/annotations/annotation-dialog-component/annotation-dialog.component.scss @@ -64,15 +64,10 @@ $mat-card-header-size: 40px !default; } .comments-count { - border-radius: 50%; - background-color: #129D99; - color: #FFFFFF; - margin-left: 0.5em; - display: inline-block; - width: 40px; - height: 40px; - padding: 12px; - text-align: center; + background-color: var(--primary-color) !important;// #129D99; + color: #FFFFFF !important; + min-width: 2rem; + border-radius: 15px; } .account-icon-wrapper { @@ -86,7 +81,8 @@ $mat-card-header-size: 40px !default; } .comment-wrapper { - background-color: #F5F5F5; + border-radius: 4px; + border: .1rem solid #cecece54; } .user { @@ -111,4 +107,5 @@ $mat-card-header-size: 40px !default; .selected { background-color: #18488f3d; -} \ No newline at end of file +} + diff --git a/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html index 890ea27a6..9f60bda4f 100644 --- a/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html +++ b/dmp-frontend/src/app/ui/plan/overview/plan-overview.component.html @@ -17,7 +17,7 @@
{{ dmp.label }}
-
.
+
.
diff --git a/dmp-frontend/src/assets/i18n/en.json b/dmp-frontend/src/assets/i18n/en.json index b7c93e80a..ee8fbdeab 100644 --- a/dmp-frontend/src/assets/i18n/en.json +++ b/dmp-frontend/src/assets/i18n/en.json @@ -1840,7 +1840,7 @@ }, "TYPES": { "ANNOTATION-PROTECTION-TYPE": { - "PRIVATE": "Hidden", + "PRIVATE": "Private", "ENTITY-ACCESSORS": "Visible" }, "APP-ROLE": { diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index b202014ea..29adc1e40 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -397,3 +397,10 @@ $mat-dark-theme: mat.m2-define-dark-theme((color: (primary: $mat-dark-theme-prim @include mat.all-component-densities(-3); } +.dense-4 { + @include mat.all-component-densities(-4); +} + +.dense-10 { + @include mat.all-component-densities(-10); +}