diff --git a/.gitmodules b/.gitmodules index 1b47c270..877021c4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "explore/src/assets/common-assets"] path = explore/src/assets/common-assets url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git +[submodule "explore/src/assets/openaire-theme"] + path = explore/src/assets/openaire-theme + url = gitea@code-repo.d4science.org:MaDgIK/openaire-theme.git diff --git a/explore/angular.json b/explore/angular.json index 52abc037..7ce52470 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -57,9 +57,8 @@ "src/material.scss" ], "scripts": [ - "src/assets/common-assets/common/jquery.js", - "src/assets/common-assets/common/uikit.min.js", - "src/assets/common-assets/common/uikit-icons.min.js", + "src/assets/openaire-theme/js/uikit.min.js", + "src/assets/openaire-theme/js/uikit-icons.min.js", "node_modules/jquery/dist/jquery.js" ] }, diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 5b732fea..d26f56e2 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 5b732fea7b33ce4f39fd158d836c93fecfbd8c17 +Subproject commit d26f56e260a01fdcca40a5fa495c1f67f6b19b9b diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 04d799f0..776ba071 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 04d799f089c93ae28c9d2ca8436f283ebc0be3ae +Subproject commit 776ba07197e4cf73e98890bd4213a32183ea19d2 diff --git a/explore/src/assets/explore-custom.css b/explore/src/assets/explore-custom.css index 436dd5a2..3e3f2362 100644 --- a/explore/src/assets/explore-custom.css +++ b/explore/src/assets/explore-custom.css @@ -1,263 +1,283 @@ :root { - --portal-main-color: #D95F2D; - --portal-main-contrast: white; - --portal-dark-color: #a0462c; - --openaire-main-color: #313179; + /*buttons*/ + --button-primary-background: var(--explore-color); + --button-primary-background-image: linear-gradient(104deg, var(--explore-dark-color) 50%, var(--explore-light-color) 100%); - --explore-portal-color: #D95F2D; - --provide-portal-color: #37C7E9; - --monitor-portal-color: #9ABB55; - --connect-portal-color: #EBB13E; - --develop-portal-color: #DA65AB; + /*backgrounds*/ + --background-primary:var(--explore-color); + --background-primary-image:none; + --background-secondary: var(--grey-color); + --background-secondary-image:none; - --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; + /*fonts*/ + --text-primary-color: var(--explore-color); + --text-gradient-color: linear-gradient(110deg, var(--explore-dark-color) 0%, var(--explore-light-color) 100%); + + /*slider*/ + --slider-dot-background: rgba(var(--explore-color-rgb), 0.5); + --slider-dot-active-background: var(--explore-color); } +/*:root {*/ +/* --portal-main-color: #D95F2D;*/ +/* --portal-main-contrast: white;*/ +/* --portal-dark-color: #a0462c;*/ +/* --openaire-main-color: #313179;*/ -.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; - } +/* --explore-portal-color: #D95F2D;*/ +/* --provide-portal-color: #37C7E9;*/ +/* --monitor-portal-color: #9ABB55;*/ +/* --connect-portal-color: #EBB13E;*/ +/* --develop-portal-color: #DA65AB;*/ - .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-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 { - } +/*.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; -} +/*.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 { +/*.searchForm, .generalSearchForm,*/ +/*.publicationsSearchForm,*/ +/*.projectsSearchForm, .projectsTableSearchForm,*/ +/*.organizationsSearchForm,*/ +/*.datasetsSearchForm,*/ +/*.softwareSearchForm,*/ +/*.orpsSearchForm,*/ +/*.datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,*/ +/* .journalsSearchForm, .journalsTableSearchForm,*/ +/*.entityRegistriesSearchForm, .entityRegistriesTableSearchForm {*/ - background: url('./Εxplore-sub.jpg') right !important; +/* 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) ; -} +/*.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 .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; -} +/*.questions {*/ +/* font-size: 15px;*/ +/* font-weight: bold;*/ +/* color: #4687E6;*/ +/*}*/ -.uk-card-explore { - background-color: var(--portal-main-color); - color: #fff !important; -} +/*.uk-card-explore {*/ +/* background-color: var(--portal-main-color);*/ +/* color: #fff !important;*/ +/*}*/ -.uk-card-explore .uk-h3 { - 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-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; -} +/*.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; -} +/*.emphasis {*/ +/* color: #000;*/ +/* font-size: 17px;*/ +/* font-weight: bold;*/ +/*}*/ -.portal-color.emphasis { - color: #37C7E9; - font-size: 40px; - 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; -} +/*.numbers-background {*/ +/* background: transparent url('explore-assets/numbers_background_pattern.svg') repeat-x center bottom;*/ +/*}*/ -.number { - color: #1d1d1d; -} +/*.number {*/ +/* color: #1d1d1d;*/ +/*}*/ -.home-logo img{ - -webkit-filter: grayscale(1); /* Safari 6.0 - 9.0 */ - filter: grayscale(1); - transition-duration:0.3s; -} +/*.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; -} +/*.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 {*/ +/* background: #F4F4F4 0 0 no-repeat padding-box;*/ +/*}*/ -.graph-background-bottom { - background-image: url("curved-bottom.svg"); - background-color: #FAFAFA; - height: 170px; -} +/*.graph-background-bottom {*/ +/* background-image: url("curved-bottom.svg");*/ +/* background-color: #FAFAFA;*/ +/* height: 170px;*/ +/*}*/ -.trello-image { - margin-top: -3px; -} +/*.trello-image {*/ +/* margin-top: -3px;*/ +/*}*/ -.trello-button { - border: #0079BF 1px solid; - text-transform: none !important; - font-size: 16px; - padding: 0 16px; -} +/*.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-white {*/ +/* background-color: white;*/ +/* color: #0079BF;*/ +/*}*/ -.trello-button-blue { - background-color: #0076BA; - color: white; -} +/*.trello-button-blue {*/ +/* background-color: #0076BA;*/ +/* color: white;*/ +/*}*/ -.trello-button-white:hover { - background-color: #E9EEF5; - color: #0079BF; -} +/*.trello-button-white:hover {*/ +/* background-color: #E9EEF5;*/ +/* color: #0079BF;*/ +/*}*/ -.trello-button-blue:hover { - background-color: #0084B1; - color: white; -} +/*.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 {*/ +/* 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-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; -} +/*.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; -} +/*.exploreBorder {*/ +/* border-color: #d8d8d8;*/ +/* border-style: solid;*/ +/* border-width: 2px;*/ +/* border-radius: 6px;*/ +/*}*/ -.flex-column { - display: flex; - flex-direction: column; -} +/*.flex-column {*/ +/* display: flex;*/ +/* flex-direction: column;*/ +/*}*/ -.min-width-30 { - min-width: 30%; -} +/*.min-width-30 {*/ +/* min-width: 30%;*/ +/*}*/ -.verticalLine { - height: 100%; - width: 2px; - background-color: #DEDEDE; - opacity: 0.7; -} +/*.verticalLine {*/ +/* height: 100%;*/ +/* width: 2px;*/ +/* background-color: #DEDEDE;*/ +/* opacity: 0.7;*/ +/*}*/ -.flex-gap { - grid-gap: 40px; -} +/*.flex-gap {*/ +/* grid-gap: 40px;*/ +/*}*/ -.padding-left { - padding-left: 30px; -} +/*.padding-left {*/ +/* padding-left: 30px;*/ +/*}*/ -.gateway-link-logo { - max-height: 50px; - width: auto; - margin-bottom: 10px; -} +/*.gateway-link-logo {*/ +/* max-height: 50px;*/ +/* width: auto;*/ +/* margin-bottom: 10px;*/ +/*}*/ -.custom-height-130 { - max-height: 130px; -} +/*.custom-height-130 {*/ +/* max-height: 130px;*/ +/*}*/ -.custom-list { - list-style: none; - padding-left: 15px; - margin: 10px 0; -} +/*.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; -} +/*.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; -} +/*.connect-image {*/ +/* max-height:100%;*/ +/* border-radius: 0 4px 4px 0;*/ +/*}*/ -.border-top { - border-top: 1px solid rgba(0,0,0,0.09); -} \ No newline at end of file +/*.border-top {*/ +/* border-top: 1px solid rgba(0,0,0,0.09);*/ +/*}*/ diff --git a/explore/src/assets/openaire-theme b/explore/src/assets/openaire-theme new file mode 160000 index 00000000..3b700ea4 --- /dev/null +++ b/explore/src/assets/openaire-theme @@ -0,0 +1 @@ +Subproject commit 3b700ea4c14ba05d1f8c2cf3ef3253623eda55f3 diff --git a/explore/src/styles.css b/explore/src/styles.css index e81234a7..4e0e7eb1 100644 --- a/explore/src/styles.css +++ b/explore/src/styles.css @@ -1,5 +1,4 @@ /* You can add global styles to this file, and also import other style files */ -@import "assets/common-assets/common/theme.css"; -@import "assets/common-assets/common/custom.css"; +@import "assets/openaire-theme/css/import.css"; @import "assets/common-assets/library.css"; @import "assets/explore-custom.css";