From 38bba7440b5eb75ab1435bd1cf9a98309ae6e2d9 Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 26 Apr 2022 17:19:38 +0300 Subject: [PATCH] initial commit for new-theme branch --- .gitmodules | 3 + src/app/home/home.component.html | 2 +- src/app/openaireLibrary | 2 +- src/assets/openaire-theme | 1 + src/assets/portal-custom.css | 112 ++++++++++++++++++------------- src/styles.css | 3 +- 6 files changed, 74 insertions(+), 49 deletions(-) create mode 160000 src/assets/openaire-theme diff --git a/.gitmodules b/.gitmodules index 589d456..b14b9aa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "src/assets/common-assets"] path = src/assets/common-assets url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git +[submodule "src/assets/openaire-theme"] + path = src/assets/openaire-theme + url = gitea@code-repo.d4science.org:MaDgIK/openaire-theme.git diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index a1cfffe..9c92591 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -8,7 +8,7 @@
diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 24848d2..fc2fbb5 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 24848d2bee6a99afe8db2b894fc654e68a1e0c6c +Subproject commit fc2fbb5ba008712b856a60d28e341dc1475fab80 diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme new file mode 160000 index 0000000..3b518bb --- /dev/null +++ b/src/assets/openaire-theme @@ -0,0 +1 @@ +Subproject commit 3b518bbe8d442f0ce798663384ca33084da61009 diff --git a/src/assets/portal-custom.css b/src/assets/portal-custom.css index 27dbe27..c7b1c20 100644 --- a/src/assets/portal-custom.css +++ b/src/assets/portal-custom.css @@ -1,53 +1,75 @@ +/*:root {*/ +/* --portal-main-color: #2d72d6;*/ +/* --portal-main-contrast: white;*/ +/* --portal-dark-color: #313179;*/ +/* --openaire-main-color: #313179;*/ +/* --graph-background: no-repeat bottom;;*/ +/*}*/ +/*new theme */ :root { - --portal-main-color: #2d72d6; - --portal-main-contrast: white; - --portal-dark-color: #313179; - --openaire-main-color: #313179; - --graph-background: no-repeat bottom;; -} + /*buttons*/ + /*--button-primary-background: var(--explore-color);*/ + /*--button-primary-background-image: linear-gradient(104deg, var(--explore-dark-color) 0%, var(--explore-light-color) 100%);*/ -.graph-background { - background-size: cover !important; - padding-bottom: 100px; - background-color: #FAFAFA !important; - background: var(--graph-background); -} -.mainPageSearchForm{ - background-color: white !important; - background-image: none !important; - margin-bottom: 20px; -} + /*backgrounds*/ + /*--background-primary:var(--explore-color);*/ + /*--background-primary-image:none;*/ + /*--background-secondary: var(--grey-color);*/ + /*--background-secondary-image:none;*/ -.searchForm, .generalSearchForm, -.publicationsSearchForm, -.projectsSearchForm, .projectsTableSearchForm, -.organizationsSearchForm, -.datasetsSearchForm, -.softwareSearchForm, -.orpsSearchForm, -.datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm, - .journalsSearchForm, .journalsTableSearchForm, -.entityRegistriesSearchForm, .entityRegistriesTableSearchForm { - - background-color: white !important; - background-image: none !important; -} + /*fonts*/ + /*--text-primary-color: var(--explore-color);*/ + /*--text-gradient-color: linear-gradient(110deg, var(--explore-dark-color) 0%, var(--explore-light-color) 100%);*/ -.explorePanelBackground { - background: transparent linear-gradient(133deg, #F5F5F5 0%, #D8D8D8 100%) 0 0 no-repeat padding-box; -} + /* Label */ + /*--label-secondary: var(--explore-color);*/ -.explorePanelBackground .uk-grid-divider > :not(.uk-first-column)::before { - border-left: 1px solid rgba(0, 0, 0, .2); + /*slider*/ + /*--slider-dot-background: rgba(var(--explore-color-rgb), 0.5);*/ + /*--slider-dot-active-background: var(--explore-color);*/ } +/*.graph-background {*/ +/* background-size: cover !important;*/ +/* padding-bottom: 100px;*/ +/* background-color: #FAFAFA !important;*/ +/* background: var(--graph-background);*/ +/*}*/ +/*.mainPageSearchForm{*/ +/* background-color: white !important;*/ +/* background-image: none !important;*/ +/* margin-bottom: 20px;*/ +/*}*/ -.explorePanelBackground .uk-breadcrumb > :nth-child(n+2):not(.uk-first-column)::before { - color: #bfbfbf; -} +/*.searchForm, .generalSearchForm,*/ +/*.publicationsSearchForm,*/ +/*.projectsSearchForm, .projectsTableSearchForm,*/ +/*.organizationsSearchForm,*/ +/*.datasetsSearchForm,*/ +/*.softwareSearchForm,*/ +/*.orpsSearchForm,*/ +/*.datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,*/ +/* .journalsSearchForm, .journalsTableSearchForm,*/ +/*.entityRegistriesSearchForm, .entityRegistriesTableSearchForm {*/ -.numbers-background { - background: transparent url('numbers_background_pattern.svg') repeat-x center bottom; -} -.number { - color: #1d1d1d; -} +/* background-color: white !important;*/ +/* background-image: none !important;*/ +/*}*/ + +/*.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;*/ +/*}*/ + +/*.numbers-background {*/ +/* background: transparent url('numbers_background_pattern.svg') repeat-x center bottom;*/ +/*}*/ +/*.number {*/ +/* color: #1d1d1d;*/ +/*}*/ diff --git a/src/styles.css b/src/styles.css index 47fab39..1b07fdc 100644 --- a/src/styles.css +++ b/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/portal-custom.css";