From 0d4f3f8720ede9a80bf63536ef081e243c801dc5 Mon Sep 17 00:00:00 2001 From: Sofia Papacharalampous Date: Tue, 21 May 2024 15:49:20 +0300 Subject: [PATCH] clean up font-family --- .../app/ui/dashboard/dashboard.component.scss | 51 -------------- .../ui/dashboard/drafts/drafts.component.css | 49 ------------- .../recent-edited-activity.component.css | 70 ------------------- ...edited-description-activity.component.scss | 70 ------------------- .../recent-edited-dmp-activity.component.css | 56 --------------- .../editor/description-editor.component.scss | 1 - .../description-listing-item.component.scss | 9 +-- .../dmp-listing-item.component.scss | 4 -- .../reference-field.component.html | 14 ++-- .../reference-field.component.scss | 4 +- .../sidebar-footer.component.css | 1 - .../src/app/ui/sidebar/sidebar.component.css | 2 - dmp-frontend/src/assets/css/demo.css | 3 - dmp-frontend/src/styles.scss | 2 +- 14 files changed, 14 insertions(+), 322 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss index 0ccc87c62..ebc9ca405 100644 --- a/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/dashboard.component.scss @@ -96,7 +96,6 @@ .personal-usage { text-align: left; font-weight: 300; - font-family: "Roboto", sans-serif; font-size: 1.25rem; letter-spacing: 0px; color: #212121; @@ -127,7 +126,6 @@ text-align: left; text-decoration: underline; font-weight: 300; - font-family: "Roboto", sans-serif; font-size: 1rem; letter-spacing: 0px; color: var(--primary-color-2); @@ -137,7 +135,6 @@ .link-disabled { text-align: left; font-weight: 300; - font-family: "Roboto", sans-serif; font-size: 1rem; letter-spacing: 0px; color: #212121; @@ -147,7 +144,6 @@ .latest-activity-title { text-align: left; font-weight: 300; - font-family: "Roboto", sans-serif; font-size: 1.25rem; letter-spacing: 0px; color: #212121; @@ -186,16 +182,6 @@ input[type="text"] { padding-left: 15px; } -.edited-date { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - line-height: 2.4; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; -} - .dmp-label { background: var(--primary-color) 0% 0% no-repeat padding-box; border-radius: 4px 0px; @@ -220,43 +206,6 @@ input[type="text"] { font-weight: 400; } -.dmp-title, -.dataset-title { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - // opacity: 0.81; - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #212121; -} - -.dataset-subtitle, -.dmp-subtitle { - display: flex; - flex-direction: row; - text-align: left; - font-weight: 400; - font-family: "Roboto", sans-serif; - font-size: 0.875rem; - opacity: 1; - align-items: center; - color: #848484; -} - -.dmp-title-draft, -.dataset-title-draft { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - // opacity: 0.81; - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #f16868; -} - .icon-align { display: inline-flex; vertical-align: middle; diff --git a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css index 2ae47a234..e04ff07f7 100644 --- a/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css +++ b/dmp-frontend/src/app/ui/dashboard/drafts/drafts.component.css @@ -1,14 +1,3 @@ -.latest-activity-title { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - font-size: 1.25rem; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; - padding-bottom: 1.2rem; -} - .dmp-card, .dataset-card { min-width: 712px; @@ -39,7 +28,6 @@ input[type="text"] { .edited-date { text-align: left; font-weight: 300; - font-family: "Roboto", sans-serif; line-height: 2.4; letter-spacing: 0px; color: #212121; @@ -69,43 +57,6 @@ input[type="text"] { font-weight: 400; } -.dmp-title, -.dataset-title { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - /* opacity: 0.81; */ - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #212121; -} - -.dataset-subtitle, -.dmp-subtitle { - display: flex; - flex-direction: row; - text-align: left; - font-weight: 400; - font-family: "Roboto", sans-serif; - font-size: 0.875rem; - opacity: 1; - align-items: center; - color: #848484; -} - -.dmp-title-draft, -.dataset-title-draft { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - /* opacity: 0.81; */ - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #f16868; -} - .icon-align { display: inline-flex; vertical-align: middle; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css index d39318901..98c7999f0 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.css @@ -1,26 +1,3 @@ -.latest-activity-title { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - font-size: 1.25rem; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; - padding-bottom: 1.2rem; -} - -.dmp-card, -.dataset-card { - min-width: 712px; - /* min-height: 308px; */ - background: #ffffff 0% 0% no-repeat padding-box; - box-shadow: 0px 3px 6px #0000001a; - border-radius: 4px; - opacity: 1; - margin-top: 2.43rem; - margin-bottom: 1rem; -} - .remove-border-bottom ::ng-deep .mat-tab-header { border-bottom: none; } @@ -36,16 +13,6 @@ input[type="text"] { padding-left: 15px; } -.edited-date { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - line-height: 2.4; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; -} - .dmp-label { background: var(--primary-color) 0% 0% no-repeat padding-box; border-radius: 4px 0px; @@ -69,43 +36,6 @@ input[type="text"] { font-weight: 400; } -.dmp-title, -.dataset-title { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - /* opacity: 0.81; */ - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #212121; -} - -.dataset-subtitle, -.dmp-subtitle { - display: flex; - flex-direction: row; - text-align: left; - font-weight: 400; - font-family: "Roboto", sans-serif; - font-size: 0.875rem; - opacity: 1; - align-items: center; - color: #848484; -} - -.dmp-title-draft, -.dataset-title-draft { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - /* opacity: 0.81; */ - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #f16868; -} - .icon-align { display: inline-flex; vertical-align: middle; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-description-activity/recent-edited-description-activity.component.scss b/dmp-frontend/src/app/ui/dashboard/recent-edited-description-activity/recent-edited-description-activity.component.scss index 402416656..9fb8a1fa2 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-description-activity/recent-edited-description-activity.component.scss +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-description-activity/recent-edited-description-activity.component.scss @@ -1,26 +1,3 @@ -.latest-activity-title { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - font-size: 1.25rem; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; - padding-bottom: 1.2rem; -} - -.dmp-card, -.description-card { - min-width: 712px; - /* min-height: 308px; */ - background: #ffffff 0% 0% no-repeat padding-box; - box-shadow: 0px 3px 6px #0000001a; - border-radius: 4px; - opacity: 1; - margin-top: 2.43rem; - margin-bottom: 1rem; -} - .remove-border-bottom ::ng-deep .mat-tab-header { border-bottom: none; } @@ -36,16 +13,6 @@ input[type="text"] { padding-left: 15px; } -.edited-date { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - line-height: 2.4; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; -} - .dmp-label { background: var(--primary-color) 0% 0% no-repeat padding-box; border-radius: 4px 0px; @@ -69,43 +36,6 @@ input[type="text"] { font-weight: 400; } -.dmp-title, -.description-title { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - // opacity: 0.81; - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #212121; -} - -.description-subtitle, -.dmp-subtitle { - display: flex; - flex-direction: row; - text-align: left; - font-weight: 400; - font-family: "Roboto", sans-serif; - font-size: 0.875rem; - opacity: 1; - align-items: center; - color: #848484; -} - -.dmp-title-draft, -.description-title-draft { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - // opacity: 0.81; - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #f16868; -} - .icon-align { display: inline-flex; vertical-align: middle; diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css index 6829e925e..c28a3cc62 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-dmp-activity/recent-edited-dmp-activity.component.css @@ -1,14 +1,3 @@ -.latest-activity-title { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - font-size: 1.25rem; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; - padding-bottom: 1.2rem; -} - .dmp-card, .dataset-card { min-width: 712px; /* min-height: 308px; */ @@ -35,16 +24,6 @@ input[type="text"] { padding-left: 15px; } -.edited-date { - text-align: left; - font-weight: 300; - font-family: "Roboto", sans-serif; - line-height: 2.4; - letter-spacing: 0px; - color: #212121; - opacity: 0.6; -} - .dmp-label { background: var(--primary-color) 0% 0% no-repeat padding-box; border-radius: 4px 0px; @@ -67,41 +46,6 @@ input[type="text"] { color: #212121; } -.dmp-title, .dataset-title { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - /* opacity: 0.81; */ - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #212121; -} - -.dataset-subtitle, .dmp-subtitle { - display: flex; - flex-direction: row; - text-align: left; - font-weight: 400; - font-family: "Roboto", sans-serif; - font-size: 0.875rem; - opacity: 1; - align-items: center; - color: #848484; -} - -.dmp-title-draft, -.dataset-title-draft { - text-align: left; - font-weight: 600; - font-family: "Roboto", sans-serif; - font-size: 1rem; - /* opacity: 0.81; */ - padding-top: 0.75rem; - padding-bottom: 0.55rem; - color: #f16868; -} - .icon-align { display: inline-flex; vertical-align: middle; diff --git a/dmp-frontend/src/app/ui/description/editor/description-editor.component.scss b/dmp-frontend/src/app/ui/description/editor/description-editor.component.scss index cbf91f166..4503a14f3 100644 --- a/dmp-frontend/src/app/ui/description/editor/description-editor.component.scss +++ b/dmp-frontend/src/app/ui/description/editor/description-editor.component.scss @@ -250,7 +250,6 @@ .dmp-title { text-align: left; font-weight: 700; - font-family: "Roboto", sans-serif; font-size: 1rem; color: #212121; overflow: hidden; diff --git a/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.scss b/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.scss index 00f861bd0..3b5125266 100644 --- a/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/description/listing/listing-item/description-listing-item.component.scss @@ -100,14 +100,12 @@ input[type="text"] { opacity: 1; width: 347px; height: 56px; - font-family: Arial, FontAwesome; padding-left: 15px; } .edited-date { text-align: left; font-weight: 300; - font-family: "Roboto", sans-serif; line-height: 2.4; letter-spacing: 0px; color: #212121; @@ -141,7 +139,6 @@ input[type="text"] { .description-title { text-align: left; font-weight: 600; - font-family: "Roboto", sans-serif; font-size: 1rem; // opacity: 0.81; padding-top: 0.75rem; @@ -149,24 +146,20 @@ input[type="text"] { color: #212121; } -.description-subtitle, -.dmp-subtitle { +.description-subtitle { display: flex; flex-direction: row; text-align: left; font-weight: 400; - font-family: "Roboto", sans-serif; font-size: 0.875rem; opacity: 1; align-items: center; color: #848484; } -.dmp-title-draft, .description-title-draft { text-align: left; font-weight: 600; - font-family: "Roboto", sans-serif; font-size: 1rem; // opacity: 0.81; padding-top: 0.75rem; diff --git a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss index 9f90fdda3..8f3056232 100644 --- a/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss +++ b/dmp-frontend/src/app/ui/dmp/listing/listing-item/dmp-listing-item.component.scss @@ -141,7 +141,6 @@ input[type="text"] { .edited-date { text-align: left; font-weight: 300; - font-family: "Roboto", sans-serif; line-height: 2.4; letter-spacing: 0px; color: #212121; @@ -174,7 +173,6 @@ input[type="text"] { .dataset-title { text-align: left; font-weight: 600; - font-family: "Roboto", sans-serif; font-size: 1rem; // opacity: 0.81; padding-top: 0.75rem; @@ -188,7 +186,6 @@ input[type="text"] { flex-direction: row; text-align: left; font-weight: 400; - font-family: "Roboto", sans-serif; font-size: 0.875rem; opacity: 1; align-items: center; @@ -199,7 +196,6 @@ input[type="text"] { .dataset-title-draft { text-align: left; font-weight: 600; - font-family: "Roboto", sans-serif; font-size: 1rem; // opacity: 0.81; padding-top: 0.75rem; diff --git a/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html b/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html index 7c0dbdb46..1d539e3b7 100644 --- a/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html +++ b/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.html @@ -4,7 +4,11 @@ {{form.getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} - {{hint}} + {{hint}} + + {{'REFERENCE-FIELD.COULD-NOT-FIND-MESSAGE' | translate}} + {{'REFERENCE-FIELD.ACTIONS.INSERT-MANUALLY' | translate}} + {{label?.length > 0 ? label : referenceType?.name}} @@ -12,9 +16,11 @@ {{form.getError('backendError').message}} {{'GENERAL.VALIDATION.REQUIRED' | translate}} - {{hint}} + {{hint}} + + {{'REFERENCE-FIELD.COULD-NOT-FIND-MESSAGE' | translate}} + {{'REFERENCE-FIELD.ACTIONS.INSERT-MANUALLY' | translate}} +
- {{'REFERENCE-FIELD.COULD-NOT-FIND-MESSAGE' | translate}} - {{'REFERENCE-FIELD.ACTIONS.INSERT-MANUALLY' | translate}}
diff --git a/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.scss b/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.scss index 61060bb96..81f22ba8e 100644 --- a/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.scss +++ b/dmp-frontend/src/app/ui/reference/reference-field/reference-field.component.scss @@ -2,14 +2,14 @@ text-decoration: underline; color: var(--primary-color-3); cursor: pointer; - font-size: 1rem; + // font-size: 1rem; font-weight: 400; } .not-found { // cursor: pointer; color: #333; - font-size: 1rem; + // font-size: 1rem; font-weight: 400; padding: 0rem 0.5rem 0rem 0rem; } diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css index f0b6ea5b8..d5d41797e 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar-footer/sidebar-footer.component.css @@ -13,7 +13,6 @@ cursor: pointer; display: inline-flex; font-size: small; - font-family: 'Roboto'; } .sidebar-footer .option:hover { diff --git a/dmp-frontend/src/app/ui/sidebar/sidebar.component.css b/dmp-frontend/src/app/ui/sidebar/sidebar.component.css index a7e615f2f..dbbe8ac8e 100644 --- a/dmp-frontend/src/app/ui/sidebar/sidebar.component.css +++ b/dmp-frontend/src/app/ui/sidebar/sidebar.component.css @@ -41,7 +41,6 @@ color: #000000; opacity: 1; font-size: 0.93rem; - font-family: 'Roboto',sans-serif; } .nav-subrow { @@ -54,7 +53,6 @@ color: #000000; opacity: 1; font-size: 0.93rem; - font-family: 'Roboto',sans-serif; } .nav-row:hover { diff --git a/dmp-frontend/src/assets/css/demo.css b/dmp-frontend/src/assets/css/demo.css index 20a553eb5..c95ed71c0 100644 --- a/dmp-frontend/src/assets/css/demo.css +++ b/dmp-frontend/src/assets/css/demo.css @@ -408,9 +408,6 @@ input[type=email], select { p { text-align: left; - font-family: 'Roboto', sans-serif; - /* font-weight: 300; - font-size: 1.25rem; */ letter-spacing: 0px; color: #212121; } diff --git a/dmp-frontend/src/styles.scss b/dmp-frontend/src/styles.scss index 088147143..e8f1b71be 100644 --- a/dmp-frontend/src/styles.scss +++ b/dmp-frontend/src/styles.scss @@ -72,7 +72,7 @@ $mat-typography: mat.define-typography-config($font-family: 'Roboto, sans-serif; // $subheading-1: mat.define-typography-level($font-size: 20px, $font-weight: 500, $font-family: 'Roboto, sans-serif;'), $body-2: mat.define-typography-level($font-size: 16px, $font-weight: 400, $font-family: 'Roboto, sans-serif;'), $body-1: mat.define-typography-level($font-size: 18px, $font-weight: 400, $font-family: 'Roboto, sans-serif;'), - $caption: mat.define-typography-level($font-size: 16px, $font-weight: Medium, $font-family: 'Roboto, sans-serif;'), + // $caption: mat.define-typography-level($font-size: 16px, $font-weight: Medium, $font-family: 'Roboto, sans-serif;'), $button: mat.define-typography-level($font-size: 16px, $font-weight: 500, $font-family: 'Roboto, sans-serif;'), // Line-height must be unit-less fraction of the font-size. // $input: mat.define-typography-level($font-size: inherit, $line-height: 1.125, $font-weight: 500, $font-family: 'Roboto, sans-serif;'),