From 11860054a0a5f3a0a25162f4a55a509009c13e08 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Fri, 1 Dec 2023 19:32:58 +0200 Subject: [PATCH] [master]: Add grid and list buttons in browse page. Fix cards in browse pages to align with the theme. Extend buttons, cards, progress and backgrounds base on mocks --- src/app/openaireLibrary | 2 +- .../browse-repositories.component.html | 6 +++--- .../browse-stakeholders.component.html | 10 +++++++-- .../browse-stakeholders.module.ts | 3 ++- src/assets/extend-theme/less/_import.less | 4 ++++ src/assets/extend-theme/less/background.less | 1 + src/assets/extend-theme/less/button.less | 21 +++++++++++++++---- src/assets/extend-theme/less/card.less | 9 ++++++++ src/assets/extend-theme/less/color.less | 2 +- src/assets/extend-theme/less/progress.less | 3 +++ src/assets/extend-theme/less/variables.less | 6 +++++- src/assets/openaire-theme | 2 +- src/environments/environment.ts | 2 +- 13 files changed, 56 insertions(+), 15 deletions(-) create mode 100644 src/assets/extend-theme/less/card.less create mode 100644 src/assets/extend-theme/less/progress.less diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 65f8676..a2706af 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 65f8676a0800997f7e8a5c24f96a050bdb65504e +Subproject commit a2706af35d413c867fa3a93f28b58023725fae51 diff --git a/src/app/repository/browse-repositories/browse-repositories.component.html b/src/app/repository/browse-repositories/browse-repositories.component.html index b673d0b..6f97fd5 100644 --- a/src/app/repository/browse-repositories/browse-repositories.component.html +++ b/src/app/repository/browse-repositories/browse-repositories.component.html @@ -41,12 +41,12 @@
-
+
+ [showEntityActions]="false" [customUrl]="item.alias" [isMobile]="isMobile" [modifier]="'uk-card-default'">
- \ No newline at end of file + diff --git a/src/app/shared/browse-stakeholders/browse-stakeholders.component.html b/src/app/shared/browse-stakeholders/browse-stakeholders.component.html index f03149c..0006e79 100644 --- a/src/app/shared/browse-stakeholders/browse-stakeholders.component.html +++ b/src/app/shared/browse-stakeholders/browse-stakeholders.component.html @@ -9,8 +9,14 @@ placeholder="Search for {{typeAsLabel}} {{entities.stakeholders}}" [disabled]="stakeholders.length === 0" class="uk-width-1-2@m uk-width-1-1">
- Grid - List + +
diff --git a/src/app/shared/browse-stakeholders/browse-stakeholders.module.ts b/src/app/shared/browse-stakeholders/browse-stakeholders.module.ts index 1943432..dc9c74d 100644 --- a/src/app/shared/browse-stakeholders/browse-stakeholders.module.ts +++ b/src/app/shared/browse-stakeholders/browse-stakeholders.module.ts @@ -8,13 +8,14 @@ import {LoadingModule} from "../../openaireLibrary/utils/loading/loading.module" import {InputModule} from "../../openaireLibrary/sharedComponents/input/input.module"; import {PagingModule} from "../../openaireLibrary/utils/paging.module"; import {LogoUrlPipeModule} from "../../openaireLibrary/utils/pipes/logoUrlPipe.module"; +import {IconsModule} from "../../openaireLibrary/utils/icons/icons.module"; @NgModule({ imports: [CommonModule, LoadingModule, SearchInputModule, InputModule, PagingModule, LogoUrlPipeModule, RouterModule.forChild([ {path: '', component: BrowseStakeholdersComponent, canDeactivate: [PreviousRouteRecorder]} - ])], + ]), IconsModule], declarations: [BrowseStakeholdersComponent], exports: [BrowseStakeholdersComponent] }) diff --git a/src/assets/extend-theme/less/_import.less b/src/assets/extend-theme/less/_import.less index e52ad86..bbd99c7 100644 --- a/src/assets/extend-theme/less/_import.less +++ b/src/assets/extend-theme/less/_import.less @@ -5,6 +5,10 @@ // Elements @import "button"; +@import "progress"; + +// Layouts +@import "card"; // Navs @import "navbar"; diff --git a/src/assets/extend-theme/less/background.less b/src/assets/extend-theme/less/background.less index 2dde90f..48e0b55 100644 --- a/src/assets/extend-theme/less/background.less +++ b/src/assets/extend-theme/less/background.less @@ -1 +1,2 @@ @background-primary-background-gradient: none; +@background-muted-background: @table-color; diff --git a/src/assets/extend-theme/less/button.less b/src/assets/extend-theme/less/button.less index 63ce1db..405daae 100644 --- a/src/assets/extend-theme/less/button.less +++ b/src/assets/extend-theme/less/button.less @@ -1,23 +1,36 @@ +@button-shadow: none; +@button-hover-shadow: none; +@button-active-shadow: none; + +/* Default */ +@button-default-box-shadow: none; +@button-default-border: @global-border; +@button-default-hover-color: @button-default-color; +@button-default-hover-box-shadow: none; +@button-default-hover-border: @global-color; + /* Primary */ @button-primary-background: @global-primary-background; @button-primary-background-gradient: none; @button-primary-color: @global-inverse-color; -@button-primary-box-shadow: @global-medium-box-shadow; @button-primary-border: transparent; @button-primary-hover-background: @global-secondary-background; @button-primary-hover-background-gradient: none; @button-primary-hover-color: @global-inverse-color; -@button-primary-hover-box-shadow: @global-small-box-shadow; @button-primary-hover-border: transparent; /* Secondary */ @button-secondary-background: @global-secondary-background; @button-secondary-background-gradient: none; @button-secondary-color: @global-inverse-color; -@button-secondary-box-shadow: @global-medium-box-shadow; @button-secondary-border: @global-secondary-background; @button-secondary-hover-background: @global-inverse-color; @button-secondary-hover-background-gradient: none; @button-secondary-hover-color: @global-secondary-background; -@button-secondary-hover-box-shadow: @global-small-box-shadow; @button-secondary-hover-border: @global-secondary-background; + + +/* Inverse */ +@inverse-button-box-shadow: none; +@inverse-button-hover-box-shadow: none; +@inverse-button-active-box-shadow: none; diff --git a/src/assets/extend-theme/less/card.less b/src/assets/extend-theme/less/card.less new file mode 100644 index 0000000..1f3a033 --- /dev/null +++ b/src/assets/extend-theme/less/card.less @@ -0,0 +1,9 @@ +@card-border-radius: @global-small-border-radius; +@card-box-shadow-m: none; +@card-hover-box-shadow: none; + + +@card-default-border: @light-border; +@card-default-border-width-m: @card-default-border-width; +@card-default-hover-background: @card-hover-background; +@card-default-hover-border: @global-primary-background; diff --git a/src/assets/extend-theme/less/color.less b/src/assets/extend-theme/less/color.less index c26a8f6..878079a 100644 --- a/src/assets/extend-theme/less/color.less +++ b/src/assets/extend-theme/less/color.less @@ -7,7 +7,7 @@ @secondary-color: @irish-global-secondary-color; @ciel-color: #EBF4F2; @default-color: #F9FBFC; - +@light-border: #F4F3F5; @funder-color: #4D276F; @organization-color: #762243; diff --git a/src/assets/extend-theme/less/progress.less b/src/assets/extend-theme/less/progress.less new file mode 100644 index 0000000..38e161e --- /dev/null +++ b/src/assets/extend-theme/less/progress.less @@ -0,0 +1,3 @@ +@progress-height: 8px; +@progress-bar-background: @success-color; +@progress-border-radius: 50px; diff --git a/src/assets/extend-theme/less/variables.less b/src/assets/extend-theme/less/variables.less index 7b5b1ab..263f991 100644 --- a/src/assets/extend-theme/less/variables.less +++ b/src/assets/extend-theme/less/variables.less @@ -3,9 +3,13 @@ /** Backgrounds */ @global-primary-gradient: radial-gradient(farthest-corner at 50% 25%, @primary-light-color 0%, @primary-dark-color 100%); -/** Border */ +/** Borders */ @global-border: @gray-300; +/* Shadows */ +@global-default-shadow: 2px 2px 5px #00000014; + + /* Controls */ @global-control-small-height: 25px; @global-control-height: 33px; diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index 7aa9e57..b64262c 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 7aa9e577193e3a77415434fd5e6e856a21d5efeb +Subproject commit b64262cb3bb5a5f326054771dcc03237b0957409 diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 9d5dc54..b169053 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -14,7 +14,7 @@ let props: EnvProperties = { piwikSiteId: "407", enablePiwikTrack:false, piwikBaseUrl: 'https://beta.analytics.openaire.eu/piwik.php?idsite=', - disableFrameLoad: true, + disableFrameLoad: false, adminToolsPortalType: 'irish', adminToolsCommunity: 'irish', domain: "http://mpagasas.di.uoa.gr:5500",