diff --git a/explore/angular.json b/explore/angular.json index 7ce52470..3361ad45 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -53,12 +53,13 @@ } ], "styles": [ - "src/styles.css", - "src/material.scss" + "src/styles.less", + "src/deprecated.css", + "src/assets/common-assets/library-css/material.scss" ], "scripts": [ - "src/assets/openaire-theme/js/uikit.min.js", - "src/assets/openaire-theme/js/uikit-icons.min.js", + "node_modules/uikit/dist/js/uikit.min.js", + "node_modules/uikit/dist/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" ] }, diff --git a/explore/package.json b/explore/package.json index 13d6949e..d88bb8c4 100644 --- a/explore/package.json +++ b/explore/package.json @@ -45,6 +45,7 @@ "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", + "uikit": "^3.12.0", "zone.js": "~0.10.2" }, "devDependencies": { @@ -53,11 +54,11 @@ "@angular/compiler-cli": "~11.2.14", "@angular/language-service": "~11.2.14", "@nguniversal/builders": "^11.2.1", - "@types/express": "^4.17.0", "@types/compression": "^1.7.0", - "@types/node": "^12.11.1", + "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", "@types/jasminewd2": "~2.0.3", + "@types/node": "^12.11.1", "codelyzer": "^6.0.0", "jasmine-core": "~3.8.0", "jasmine-spec-reporter": "~5.0.0", diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 428a4822..67211e78 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 428a48223aa5066fc2161aef0b7c858c0439c9fb +Subproject commit 67211e78c6429c718e0618ec27354a213a4031be diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index d6fd642f..1c7b4228 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit d6fd642f214ce91e0eefaa06a9e8b50fedf9b7d8 +Subproject commit 1c7b42284c58024e7d51cb0ae7c5c27f997c646d diff --git a/explore/src/assets/explore-custom.css b/explore/src/assets/explore-custom.css deleted file mode 100644 index b9528f71..00000000 --- a/explore/src/assets/explore-custom.css +++ /dev/null @@ -1,290 +0,0 @@ -:root { - /*buttons*/ - --button-primary-background: var(--explore-color); - --button-primary-background-image: linear-gradient(104deg, var(--explore-dark-color) 0%, var(--explore-light-color) 100%); - - /*backgrounds*/ - --background-primary:var(--explore-color); - --background-primary-image:none; - --background-secondary: var(--grey-color); - --background-secondary-image:none; - --background-primary-rgb: var(--explore-color-rgb); - - /*fonts*/ - --text-primary-color: var(--explore-color); - --text-gradient-color: linear-gradient(110deg, var(--explore-dark-color) 0%, var(--explore-light-color) 100%); - - /* Label */ - --label-secondary: var(--explore-color); - - /*slider*/ - --slider-dot-background: rgba(var(--explore-color-rgb), 0.5); - --slider-dot-active-background: var(--explore-color); -} - -.landing { --landing-text-primary-color: var(--explore-color); } - - -/*:root {*/ -/* --portal-main-color: #D95F2D;*/ -/* --portal-main-contrast: white;*/ -/* --portal-dark-color: #a0462c;*/ -/* --openaire-main-color: #313179;*/ - -/* --explore-portal-color: #D95F2D;*/ -/* --provide-portal-color: #37C7E9;*/ -/* --monitor-portal-color: #9ABB55;*/ -/* --connect-portal-color: #EBB13E;*/ -/* --develop-portal-color: #DA65AB;*/ - -/* --explore-portal-lower-tone: #a0462c;*/ -/* --provide-portal-lower-tone: #3A8FA3;*/ -/* --monitor-portal-lower-tone: #7c9144;*/ -/* --connect-portal-lower-tone: #b48536;*/ -/* --develop-portal-lower-tone: #9f4e7e;*/ -/*}*/ - - -/*.tm-toolbar .uk-subnav-line .custom-explore-li {*/ -/* background:var(--portal-main-color) !important;*/ -/*}*/ -/*!* .custom-explore-toolbar ul.uk-subnav.uk-subnav-line{*/ -/* background-color: var(--portal-main-color) !important;*/ -/* }*/ -/*.custom-explore-toolbar ul.uk-subnav.uk-subnav-line{*/ -/* background-color: var(--portal-main-color) !important;*/ -/*}*/ -/* .custom-explore-toolbar .inner {*/ -/* background-color: var(--portal-main-color) !important;*/ -/* }*/ - -/* .custom-explore-toolbar{*/ -/* border-top-color:var(--portal-main-color) !important;*/ -/* } *!*/ -/*.mainPageSearchForm{*/ -/* !*background-image: !*linear-gradient(rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)),*! url('home.jpg');*!*/ -/* background: transparent linear-gradient(180deg, #FAFAFA 0%, #FFFFFF 100%);*/ -/*}*/ -/*.firstPageNumbers{*/ -/* !* font-weight: 600 !important; *!*/ -/* !* color: var(--portal-main-color) !important; *!*/ -/*}*/ - - - -/*.explore-numbers {*/ -/* }*/ - -/*.mainPageBottomInfo{*/ -/* background: linear-gradient( rgba(255, 255, 255, 0.5),rgba(255, 255, 255, 0.5)), url('home.jpg');*/ -/* background-attachment: scroll, scroll;*/ -/* background-size: auto auto, auto auto;*/ -/* background-size: cover;*/ -/* background-attachment: fixed;*/ -/* box-sizing: border-box;*/ -/* min-height: calc(100vh - 412.767px);*/ -/*}*/ -/*.box-links .uk-card-header:hover {*/ -/* text-decoration: underline;*/ -/* text-decoration-color: currentcolor;*/ -/* text-decoration-color: #90929D;*/ -/*}*/ - -/*.searchForm, .generalSearchForm,*/ -/*.publicationsSearchForm,*/ -/*.projectsSearchForm, .projectsTableSearchForm,*/ -/*.organizationsSearchForm,*/ -/*.datasetsSearchForm,*/ -/*.softwareSearchForm,*/ -/*.orpsSearchForm,*/ -/*.datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,*/ -/* .journalsSearchForm, .journalsTableSearchForm,*/ -/*.entityRegistriesSearchForm, .entityRegistriesTableSearchForm {*/ - -/* background: url('./Εxplore-sub.jpg') right !important;*/ - -/*}*/ - -/*.ask-explore.uk-grid-divider > :not(.uk-first-column)::before {*/ -/* border-left: 1px solid var(--portal-main-color) ;*/ -/*}*/ - -/*.questions .tm-child-list-divider > ul > li:nth-child(n+2), .questions .uk-list-divider > li:nth-child(n+2) {*/ -/* border-top: 1px solid #c5c5c5;*/ -/*}*/ - -/*.questions {*/ -/* font-size: 15px;*/ -/* font-weight: bold;*/ -/* color: #4687E6;*/ -/*}*/ - -/*.uk-card-explore {*/ -/* background-color: var(--portal-main-color);*/ -/* color: #fff !important;*/ -/*}*/ - -/*.uk-card-explore .uk-h3 {*/ -/* color: #fff !important;*/ -/*}*/ - -/*.uk-card-explore .uk-h6 a {*/ -/* color: #fff !important;*/ -/* text-decoration: underline;*/ -/*}*/ - -/*.uk-card-explore .uk-h5 {*/ -/* color: #fff !important;*/ -/* text-transform: uppercase;*/ -/* font-size: 15px;*/ -/* font-weight: bolder;*/ -/*}*/ - -/*.emphasis {*/ -/* color: #000;*/ -/* font-size: 17px;*/ -/* font-weight: bold;*/ -/*}*/ - -/*.portal-color.emphasis {*/ -/* color: #37C7E9;*/ -/* font-size: 40px;*/ -/* font-weight: bold;*/ -/*}*/ - -/*.numbers-background {*/ -/* background: transparent url('explore-assets/numbers_background_pattern.svg') repeat-x center bottom;*/ -/*}*/ - -/*.number {*/ -/* color: #1d1d1d;*/ -/*}*/ - - -/*.home-logo img{*/ -/* -webkit-filter: grayscale(1); !* Safari 6.0 - 9.0 *!*/ -/* filter: grayscale(1);*/ -/* transition-duration:0.3s;*/ -/*}*/ - -/*.home-logo:hover img{*/ -/* -webkit-filter: grayscale(0); !* Safari 6.0 - 9.0 *!*/ -/* filter: grayscale(0);*/ -/* transition-duration:0.3s;*/ -/*}*/ - -/*.graph-background {*/ -/* background: #F4F4F4 0 0 no-repeat padding-box;*/ -/*}*/ - -/*.graph-background-bottom {*/ -/* background-image: url("curved-bottom.svg");*/ -/* background-color: #FAFAFA;*/ -/* height: 170px;*/ -/*}*/ - -/*.trello-image {*/ -/* margin-top: -3px;*/ -/*}*/ - -/*.trello-button {*/ -/* border: #0079BF 1px solid;*/ -/* text-transform: none !important;*/ -/* font-size: 16px;*/ -/* padding: 0 16px;*/ -/*}*/ - -/*.trello-button-white {*/ -/* background-color: white;*/ -/* color: #0079BF;*/ -/*}*/ - -/*.trello-button-blue {*/ -/* background-color: #0076BA;*/ -/* color: white;*/ -/*}*/ - -/*.trello-button-white:hover {*/ -/* background-color: #E9EEF5;*/ -/* color: #0079BF;*/ -/*}*/ - -/*.trello-button-blue:hover {*/ -/* background-color: #0084B1;*/ -/* color: white;*/ -/*}*/ - -/*.explorePanelBackground {*/ -/* background: transparent linear-gradient(133deg, #F5F5F5 0%, #D8D8D8 100%) 0% 0% no-repeat padding-box;*/ -/*}*/ - -/*.explorePanelBackground .uk-grid-divider > :not(.uk-first-column)::before {*/ -/* border-left: 1px solid rgba(0, 0, 0, .2);*/ -/*}*/ - -/*.explorePanelBackground .uk-breadcrumb > :nth-child(n+2):not(.uk-first-column)::before {*/ -/* color: #bfbfbf;*/ -/*}*/ - -/*.exploreBorder {*/ -/* border-color: #d8d8d8;*/ -/* border-style: solid;*/ -/* border-width: 2px;*/ -/* border-radius: 6px;*/ -/*}*/ - -/*.flex-column {*/ -/* display: flex;*/ -/* flex-direction: column;*/ -/*}*/ - -/*.min-width-30 {*/ -/* min-width: 30%;*/ -/*}*/ - -/*.verticalLine {*/ -/* height: 100%;*/ -/* width: 2px;*/ -/* background-color: #DEDEDE;*/ -/* opacity: 0.7;*/ -/*}*/ - -/*.flex-gap {*/ -/* grid-gap: 40px;*/ -/*}*/ - -/*.padding-left {*/ -/* padding-left: 30px;*/ -/*}*/ - -/*.gateway-link-logo {*/ -/* max-height: 50px;*/ -/* width: auto;*/ -/* margin-bottom: 10px;*/ -/*}*/ - -/*.custom-height-130 {*/ -/* max-height: 130px;*/ -/*}*/ - -/*.custom-list {*/ -/* list-style: none;*/ -/* padding-left: 15px;*/ -/* margin: 10px 0;*/ -/*}*/ - -/*.custom-list li {*/ -/* -webkit-column-break-inside: avoid;*/ -/* page-break-inside: avoid;*/ -/* break-inside: avoid;*/ -/* margin-bottom: 4px;*/ -/*}*/ - -/*.connect-image {*/ -/* max-height:100%;*/ -/* border-radius: 0 4px 4px 0;*/ -/*}*/ - -/*.border-top {*/ -/* border-top: 1px solid rgba(0,0,0,0.09);*/ -/*}*/ diff --git a/explore/src/assets/explore-custom.less b/explore/src/assets/explore-custom.less new file mode 100644 index 00000000..3d72a396 --- /dev/null +++ b/explore/src/assets/explore-custom.less @@ -0,0 +1,19 @@ +@global-primary-gradient: linear-gradient(104deg, @explore-dark-color 0%, @explore-light-color 100%); + +/* Button */ +@button-primary-background: @explore-color; +@inverse-button-primary-background: @explore-color; + +/* Background */ +@background-primary-background: @explore-color; +@background-primary-background-gradient: none; + +/* Text */ +@text-primary-color: @explore-color; + +/* Label */ +@label-secondary-color: @explore-color; + +.deposit { + @import (multiple) "~src/assets/openaire-theme/less/_import"; +} diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme index 4fca369b..aba7dffc 160000 --- a/explore/src/assets/openaire-theme +++ b/explore/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit 4fca369b2e4f4f2c2689e0efc501d2c548dfeb68 +Subproject commit aba7dffcfa907e5534178c80d5870076590badbb diff --git a/explore/src/deprecated.css b/explore/src/deprecated.css new file mode 100644 index 00000000..f8d50eab --- /dev/null +++ b/explore/src/deprecated.css @@ -0,0 +1,4 @@ +@import "assets/openaire-theme/css/structure/variables.css"; +@import "assets/common-assets/library.css"; + +.landing { --landing-text-primary-color: var(--explore-color); } diff --git a/explore/src/material.scss b/explore/src/material.scss deleted file mode 100644 index 50525afc..00000000 --- a/explore/src/material.scss +++ /dev/null @@ -1,9 +0,0 @@ -@import '~@angular/material/theming'; -@include mat-core(); -$my-app-primary: mat-palette($mat-gray, 900); -$my-app-accent: mat-palette($mat-light-green, 700); - -$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent); - -@include angular-material-theme($my-app-theme); - diff --git a/explore/src/styles.css b/explore/src/styles.css deleted file mode 100644 index 4e0e7eb1..00000000 --- a/explore/src/styles.css +++ /dev/null @@ -1,4 +0,0 @@ -/* You can add global styles to this file, and also import other style files */ -@import "assets/openaire-theme/css/import.css"; -@import "assets/common-assets/library.css"; -@import "assets/explore-custom.css"; diff --git a/explore/src/styles.less b/explore/src/styles.less new file mode 100644 index 00000000..8f9a6394 --- /dev/null +++ b/explore/src/styles.less @@ -0,0 +1,3 @@ +/* You can add global styles to this file, and also import other style files */ +@import "~src/assets/openaire-theme/less/_import"; +@import "assets/explore-custom";