From 01fd4ac49f2758bb992529478562358bf45e6370 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Sun, 17 Jul 2022 16:01:39 +0300 Subject: [PATCH] Filters title alignment. Rename some component css files to less. --- .../displayClaims/displayClaims.component.ts | 2 +- claims/linking/linkingGeneric.component.css | 0 claims/linking/linkingGeneric.component.ts | 7 +- .../page-content/page-content.component.ts | 8 +- .../dataProvider/dataProvider.component.html | 59 ++++---- landingPages/landing-utils/fos.component.ts | 2 +- .../metrics/metrics.component.css | 40 ------ .../metrics/metrics.component.less | 48 +++++++ .../metrics/metrics.component.ts | 6 +- .../landing-utils/parsingFunctions.class.ts | 6 +- landingPages/landing-utils/sdg.component.ts | 2 +- .../organization/organization.component.html | 19 +-- landingPages/project/project.component.html | 135 ++++++++++-------- .../result/resultLanding.component.html | 73 +++++----- .../{how.component.css => how.component.less} | 0 monitor/how/how.component.ts | 2 +- .../notification-user.component.css | 24 ---- .../notification-user.component.less | 27 ++++ .../notification-user.component.ts | 2 +- .../notify-form/notify-form.component.css | 14 -- .../notify-form/notify-form.component.less | 19 +++ .../notify-form/notify-form.component.ts | 17 +-- .../my-orcid-links/myOrcidLinks.component.ts | 5 +- orcid/orcid-work.component.ts | 19 ++- searchPages/find/searchAll.component.html | 4 +- .../searchUtils/newSearchPage.component.html | 10 +- .../searchUtils/searchFilter.component.html | 5 +- sharedComponents/navigationBar.component.html | 2 +- .../quick-contact/quick-contact.component.css | 24 ---- .../quick-contact.component.less | 26 ++++ .../quick-contact/quick-contact.component.ts | 2 +- .../subscriber-invite.component.css | 4 - .../subscriber-invite.component.ts | 3 +- utils/dataTransfer/transferData.component.ts | 2 +- utils/rangeFilter/rangeFilter.component.html | 6 +- utils/tabs/tabs.component.ts | 15 +- 36 files changed, 320 insertions(+), 319 deletions(-) delete mode 100644 claims/linking/linkingGeneric.component.css delete mode 100644 landingPages/landing-utils/metrics/metrics.component.css create mode 100644 landingPages/landing-utils/metrics/metrics.component.less rename monitor/how/{how.component.css => how.component.less} (100%) delete mode 100644 notifications/notification-user/notification-user.component.css create mode 100644 notifications/notification-user/notification-user.component.less delete mode 100644 notifications/notify-form/notify-form.component.css create mode 100644 notifications/notify-form/notify-form.component.less delete mode 100644 sharedComponents/quick-contact/quick-contact.component.css create mode 100644 sharedComponents/quick-contact/quick-contact.component.less delete mode 100644 sharedComponents/subscriber-invite/subscriber-invite.component.css diff --git a/claims/claim-utils/displayClaims/displayClaims.component.ts b/claims/claim-utils/displayClaims/displayClaims.component.ts index 556d1076..0f9b03ad 100644 --- a/claims/claim-utils/displayClaims/displayClaims.component.ts +++ b/claims/claim-utils/displayClaims/displayClaims.component.ts @@ -91,7 +91,7 @@ export class DisplayClaimsComponent implements OnInit, OnDestroy { ngOnInit() { if (typeof document !== "undefined" && this.actions) { - this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--structure-header-height')); + this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height')); } this.entities = []; this.filterForm = this._fb.group({ diff --git a/claims/linking/linkingGeneric.component.css b/claims/linking/linkingGeneric.component.css deleted file mode 100644 index e69de29b..00000000 diff --git a/claims/linking/linkingGeneric.component.ts b/claims/linking/linkingGeneric.component.ts index a41c3125..b2ff4277 100644 --- a/claims/linking/linkingGeneric.component.ts +++ b/claims/linking/linkingGeneric.component.ts @@ -12,16 +12,11 @@ import {PiwikService} from "../../utils/piwik/piwik.service"; import {Subscriber} from "rxjs"; import {properties} from "../../../../environments/environment"; import {Breadcrumb} from "../../utils/breadcrumbs/breadcrumbs.component"; -import {MetricsService} from "../../services/metrics.service"; import {OpenaireEntities} from "../../utils/properties/searchFields"; -declare var UIkit:any; - @Component({ selector: 'linking-generic', - templateUrl: 'linkingGeneric.component.html', - styleUrls:[ 'linkingGeneric.component.css'] - + templateUrl: 'linkingGeneric.component.html' }) export class LinkingGenericComponent { @Input() piwikSiteId = null; diff --git a/dashboard/sharedComponents/page-content/page-content.component.ts b/dashboard/sharedComponents/page-content/page-content.component.ts index 1bcad0c2..fb032f08 100644 --- a/dashboard/sharedComponents/page-content/page-content.component.ts +++ b/dashboard/sharedComponents/page-content/page-content.component.ts @@ -6,14 +6,16 @@ declare var UIkit; selector: '[page-content]', template: `
-
+
-
+
@@ -43,7 +45,7 @@ export class PageContentComponent implements OnInit, AfterViewInit, OnDestroy { ngOnInit() { if (typeof document !== "undefined") { - this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--structure-header-height')); + this.offset = Number.parseInt(getComputedStyle(document.documentElement).getPropertyValue('--header-height')); } } diff --git a/landingPages/dataProvider/dataProvider.component.html b/landingPages/dataProvider/dataProvider.component.html index 711b7a91..ae3d5f7e 100644 --- a/landingPages/dataProvider/dataProvider.component.html +++ b/landingPages/dataProvider/dataProvider.component.html @@ -4,8 +4,8 @@
-
-
+
@@ -23,7 +23,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -36,7 +36,7 @@
    -
    +
    @@ -65,7 +65,7 @@
    -
    @@ -84,7 +84,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -102,34 +102,42 @@ -
    +
    - - - {{dataProviderInfo.compatibility.info}} - {{dataProviderInfo.compatibility.name}} - - - {{dataProviderInfo.compatibility.info}} +
    + + + {{dataProviderInfo.compatibility.info}} + {{dataProviderInfo.compatibility.name}} + + + {{dataProviderInfo.compatibility.info}} + + + {{dataProviderInfo.compatibility.name}} + - - {{dataProviderInfo.compatibility.name}} - -   +
    - OpenAIRE Text Mining  +
    + OpenAIRE Text Mining +
    - {{country}}  +
    + {{country}} +
    - Thematic +
    + Thematic +
    @@ -149,9 +157,8 @@
    -
    + - ` + `, + styleUrls: ['metrics.component.less'] }) export class MetricsComponent { diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts index 0b1dc570..38f9004e 100644 --- a/landingPages/landing-utils/parsingFunctions.class.ts +++ b/landingPages/landing-utils/parsingFunctions.class.ts @@ -19,11 +19,7 @@ export class ParsingFunctions { private notebookKeyword: string = "eosc jupyter notebook"; private notebook_label: string = "EOSC"; private notebook_value: string = "EOSC Jupyter Notebook"; - - // public open = 'assets/common-assets/unlock.svg'; - // public closed = 'assets/common-assets/lock.svg'; - // public unknown = 'assets/common-assets/question.svg'; - + public open = 'lock_open'; public closed = 'lock'; public unknown = 'question_mark'; diff --git a/landingPages/landing-utils/sdg.component.ts b/landingPages/landing-utils/sdg.component.ts index 7aa5283c..c8ba6336 100644 --- a/landingPages/landing-utils/sdg.component.ts +++ b/landingPages/landing-utils/sdg.component.ts @@ -70,4 +70,4 @@ export class SdgComponent { public urlEncodeAndQuote(str: string): string { return StringUtils.quote(StringUtils.URIEncode(str)); } -} \ No newline at end of file +} diff --git a/landingPages/organization/organization.component.html b/landingPages/organization/organization.component.html index 291729fc..95cdc3f7 100644 --- a/landingPages/organization/organization.component.html +++ b/landingPages/organization/organization.component.html @@ -3,8 +3,8 @@
    -
    -
    +
    Actions
    @@ -12,7 +12,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -21,7 +21,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -34,7 +34,7 @@
    • -
    +
    @@ -63,7 +63,7 @@
    -
    @@ -81,14 +81,14 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'">
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -128,7 +128,8 @@
    -
    +
    -
    -
    +
    @@ -23,7 +23,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -32,7 +32,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -42,7 +42,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -51,7 +51,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -61,7 +61,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -75,7 +75,7 @@
    -
    +
    @@ -104,7 +104,7 @@
    -
    @@ -121,7 +121,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -129,7 +129,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -139,7 +139,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -148,7 +148,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -157,7 +157,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -176,27 +176,35 @@ [status]="projectInfo.status"> -
    +
    - - Open Access mandate for {{openaireEntities.PUBLICATIONS}} and {{openaireEntities.DATASETS}} -   +
    + + Open Access mandate for {{openaireEntities.PUBLICATIONS}} and {{openaireEntities.DATASETS}} + +
    - - Open Access mandate for {{openaireEntities.PUBLICATIONS}} -   +
    + + Open Access mandate for {{openaireEntities.PUBLICATIONS}} + +
    - - Open Access mandate for {{openaireEntities.DATASETS}} -   +
    + + Open Access mandate for {{openaireEntities.DATASETS}} + +
    - - {{projectInfo.funding.funderName}} -   +
    + + {{projectInfo.funding.funderName}} + +
    @@ -286,9 +294,8 @@
    -
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -34,7 +34,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -46,7 +46,7 @@
  • + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -72,7 +72,7 @@
    -
    +
    @@ -101,7 +101,7 @@
    -
    @@ -122,7 +122,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -131,7 +131,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -143,7 +143,7 @@
    + [attr.uk-tooltip]="'pos: right; cls: uk-active uk-text-small uk-padding-small'"> @@ -180,26 +180,30 @@ [year]="resultLandingInfo.date" [embargoEndDate]="resultLandingInfo.embargoEndDate"> -
    - - {{resultLandingInfo.accessMode}} -   - - + +
    + {{resultLandingInfo.accessMode}} + +
    +     + - - {{language}} -   - -     - - - {{programmingLanguage}} -   - - + +
    + {{language}} +
    +     + + + +
    + {{programmingLanguage}} +
    +     +
    @@ -220,9 +224,8 @@
    -
    +
    -
    -
    +
    @@ -420,7 +423,7 @@ -
    `, - styleUrls: ['how.component.css'] + styleUrls: ['how.component.less'] }) export class HowComponent { diff --git a/notifications/notification-user/notification-user.component.css b/notifications/notification-user/notification-user.component.css deleted file mode 100644 index 5bbfc101..00000000 --- a/notifications/notification-user/notification-user.component.css +++ /dev/null @@ -1,24 +0,0 @@ -svg:not(.outlined) circle{ - fill: currentColor; - stroke: currentColor; -} - -svg:not(.outlined) text { - fill: white; - stroke: white; -} - - -svg.outlined circle{ - fill: white; - stroke: currentColor; -} - -svg.outlined text { - fill: currentColor; - stroke: currentColor; -} - -svg { - user-select: none; -} diff --git a/notifications/notification-user/notification-user.component.less b/notifications/notification-user/notification-user.component.less new file mode 100644 index 00000000..1a0bf5a4 --- /dev/null +++ b/notifications/notification-user/notification-user.component.less @@ -0,0 +1,27 @@ +svg { + user-select: none; + + &:not(.outlined) { + circle { + fill: currentColor; + stroke: currentColor; + } + + text { + fill: white; + stroke: white; + } + } + + &.outlined { + circle { + ill: white; + stroke: currentColor; + } + + text { + fill: currentColor; + stroke: currentColor; + } + } +} diff --git a/notifications/notification-user/notification-user.component.ts b/notifications/notification-user/notification-user.component.ts index 8759db89..9bb53daa 100644 --- a/notifications/notification-user/notification-user.component.ts +++ b/notifications/notification-user/notification-user.component.ts @@ -10,7 +10,7 @@ import {Component, Input, OnInit} from "@angular/core"; `, - styleUrls: ['notification-user.component.css'] + styleUrls: ['notification-user.component.less'] }) export class NotificationUserComponent implements OnInit{ @Input() diff --git a/notifications/notify-form/notify-form.component.css b/notifications/notify-form/notify-form.component.css deleted file mode 100644 index 59e9ea76..00000000 --- a/notifications/notify-form/notify-form.component.css +++ /dev/null @@ -1,14 +0,0 @@ -[notify-form] .notification-user { - position: absolute; - top: 0; - left: 0; - transform: translate(-50%, -50%); - z-index: 1; -} - -[notify-form] .input-wrapper.recipients { - --input-padding-horizontal: 0px; - --input-font-size: 14px; - --input-placeholder-weight: 700; - --input-placeholder-color: var(--grey-color); -} diff --git a/notifications/notify-form/notify-form.component.less b/notifications/notify-form/notify-form.component.less new file mode 100644 index 00000000..3610dac8 --- /dev/null +++ b/notifications/notify-form/notify-form.component.less @@ -0,0 +1,19 @@ +@import (reference) "~src/assets/openaire-theme/less/_import-variables"; + +[notify-form] { + + .notification-user { + position: absolute; + top: 0; + left: 0; + transform: translate(-50%, -50%); + z-index: 1; + } + + .input-wrapper.recipients { + --input-padding-horizontal: 0px; + --input-font-size: 14px; + --input-placeholder-weight: 700; + --input-placeholder-color: @global-color; + } +} diff --git a/notifications/notify-form/notify-form.component.ts b/notifications/notify-form/notify-form.component.ts index bdc5aeb6..de00d6e9 100644 --- a/notifications/notify-form/notify-form.component.ts +++ b/notifications/notify-form/notify-form.component.ts @@ -6,8 +6,7 @@ import {Subscription} from "rxjs"; import {NotificationService} from "../notification.service"; import {Notification} from "../notifications"; import {InputComponent, Option} from "../../sharedComponents/input/input.component"; - -declare var UIkit; +import {NotificationHandler} from "../../utils/notification-handler"; @Component({ selector: '[notify-form]', @@ -42,7 +41,7 @@ declare var UIkit; `, - styleUrls: ['notify-form.component.css'], + styleUrls: ['notify-form.component.less'], encapsulation: ViewEncapsulation.None }) export class NotifyFormComponent implements OnInit, OnDestroy { @@ -122,19 +121,11 @@ export class NotifyFormComponent implements OnInit, OnDestroy { this.notification.surname = this.user.lastname; this.subscriptions.push(this.notificationService.sendNotification(this.notification).subscribe(notification => { this.sending = false; - UIkit.notification('A notification has been sent successfully', { - status: 'success', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise('A notification has been sent successfully'); this.reset(); }, error => { this.sending = false; - UIkit.notification('An error has occurred. Please try again later', { - status: 'danger', - timeout: 6000, - pos: 'bottom-right' - }); + NotificationHandler.rise('An error has occurred. Please try again later', 'danger'); this.reset(); })); } diff --git a/orcid/my-orcid-links/myOrcidLinks.component.ts b/orcid/my-orcid-links/myOrcidLinks.component.ts index 54841851..f9d5ed0c 100644 --- a/orcid/my-orcid-links/myOrcidLinks.component.ts +++ b/orcid/my-orcid-links/myOrcidLinks.component.ts @@ -42,7 +42,7 @@ declare var UIkit: any;
    Did you link a result with your ORCID - but the green icon is missing? + but the green icon is missing?
    No worries! It will appear, as soon as we synchronize again with ORCID data. Latest synchronization was on {{lastOrcidUpdateDate | date}}. @@ -96,8 +96,7 @@ declare var UIkit: any;
    - `, - styles: ['.orcid-color { color: #a6ce39; }'] + ` }) export class MyOrcidLinksComponent { public resultType: string = "result"; diff --git a/orcid/orcid-work.component.ts b/orcid/orcid-work.component.ts index 72d04821..afbade88 100644 --- a/orcid/orcid-work.component.ts +++ b/orcid/orcid-work.component.ts @@ -15,9 +15,6 @@ import {OpenaireEntities} from "../utils/properties/searchFields"; declare var UIkit: any; @Component({ - styles: [ - '.loading-action-button { width: 35px; height: 35px; }' - ], selector: 'orcid-work', template: ` @@ -46,9 +43,9 @@ declare var UIkit: any; Delete from  - + ORCID  -   +       @@ -57,7 +54,7 @@ declare var UIkit: any; - - @@ -115,8 +112,8 @@ declare var UIkit: any; ORCID  - -  ACTIONS + +  ACTIONS - + +
    diff --git a/searchPages/searchUtils/newSearchPage.component.html b/searchPages/searchUtils/newSearchPage.component.html index 5ce91eaf..536438ba 100644 --- a/searchPages/searchUtils/newSearchPage.component.html +++ b/searchPages/searchUtils/newSearchPage.component.html @@ -1,8 +1,8 @@

    -
    +
    -
    +
      - - -
    + +

    diff --git a/searchPages/searchUtils/searchFilter.component.html b/searchPages/searchUtils/searchFilter.component.html index b593f672..31b1831c 100644 --- a/searchPages/searchUtils/searchFilter.component.html +++ b/searchPages/searchUtils/searchFilter.component.html @@ -1,8 +1,7 @@
    -
    {{_formatTitle(filter.title, filter.values.length)}}
    - Clear +
    {{_formatTitle(filter.title, filter.values.length)}}
    + Clear
    -
    +
    - `, - styleUrls: ['subscriber-invite.component.css'] + ` }) export class SubscriberInviteComponent implements OnInit, OnDestroy { @Input() diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts index e3ab57f4..9dd7cfde 100644 --- a/utils/dataTransfer/transferData.component.ts +++ b/utils/dataTransfer/transferData.component.ts @@ -13,7 +13,7 @@ declare var UIkit; template: ` diff --git a/utils/rangeFilter/rangeFilter.component.html b/utils/rangeFilter/rangeFilter.component.html index 127aaba8..0ea1dedf 100644 --- a/utils/rangeFilter/rangeFilter.component.html +++ b/utils/rangeFilter/rangeFilter.component.html @@ -1,8 +1,8 @@
    -
    -
    {{_formatTitle(filter.title)}}
    +
    +
    {{_formatTitle(filter.title)}}
     + [class.uk-disabled]="isDisabled" class="uk-text-small uk-margin-left"> Clear
    diff --git a/utils/tabs/tabs.component.ts b/utils/tabs/tabs.component.ts index 15efe361..694be03d 100644 --- a/utils/tabs/tabs.component.ts +++ b/utils/tabs/tabs.component.ts @@ -42,8 +42,8 @@ import {TabComponent} from './tab.component';
    - - + +
    @@ -79,16 +79,7 @@ import {TabComponent} from './tab.component'; bottom: 0; left: 0; right: 0; - border-bottom: 2px solid #eaeaea; - } - .featuredTab, .uk-active a.featuredTab{ - color:#E96439 !important; - } - .blur-background { - background-color: var(--landing-default-color); - } - .blur-background { - background: rgba(var(--landing-default-color-rgb), 0.80); + border-bottom: 1px solid #eaeaea; } ` ]