+
li > a, .uk-dropdown-nav > li:hover > a {
+ padding: 4px 10px;
+ color: var(--text-color);
+ font-weight: 400 !important;
+ font-size: var(--small-font-size);
+}
+
+.uk-dropdown .uk-nav-divider {
+ margin: 4px 10px;
+ border-color: var(--secondary-color);
+}
diff --git a/src/assets/dashboard-theme/input.css b/src/assets/dashboard-theme/input.css
new file mode 100644
index 0000000..1f86274
--- /dev/null
+++ b/src/assets/dashboard-theme/input.css
@@ -0,0 +1,58 @@
+.uk-form-label {
+ font-size: var(--font-size);
+ font-family: "Roboto", sans-serif;
+ color: currentColor;
+}
+
+.uk-form-hint {
+ font-family: "Roboto", sans-serif;
+ color: currentColor;
+}
+
+.input-box {
+ background-color: #FAFAFA;
+ border: 1px solid transparent;
+ padding: 16px;
+ border-radius: 4px;
+ color: currentColor;
+ height: auto;
+}
+
+.input-box:focus {
+ color: currentColor;
+}
+
+.input-box:not(.uk-form-danger) {
+ border-color: #D1D1D1 !important;
+}
+
+.input-box::placeholder {
+ color: rgba(122, 122, 122, 0.7);
+}
+
+.input-box .mat-select {
+ font-family: "Open Sans", sans-serif;
+ font-size: var(--font-size);
+}
+
+.input-box .mat-select-value {
+ color: currentColor;
+}
+
+.input-box .mat-form-field-infix {
+ border: none !important;
+ line-height: 30px;
+ padding: 0 !important;
+}
+
+.input-box .mat-form-field-appearance-legacy .mat-form-field-wrapper {
+ padding: 0 !important;
+}
+
+.input-box .mat-form-field-appearance-legacy .mat-form-field-underline {
+ display: none;
+}
+
+.input-box .mat-form-field-appearance-legacy .mat-form-field-subscript-wrapper {
+ display: none;
+}
diff --git a/src/assets/dashboard-theme/main.css b/src/assets/dashboard-theme/main.css
new file mode 100644
index 0000000..af55d59
--- /dev/null
+++ b/src/assets/dashboard-theme/main.css
@@ -0,0 +1,7 @@
+@import "variables.css";
+@import "text.css";
+@import "structure.css";
+@import "input.css";
+@import "tabs-pills.css";
+@import "card.css";
+@import "dropdowns.css";
diff --git a/src/assets/dashboard-theme/structure.css b/src/assets/dashboard-theme/structure.css
new file mode 100644
index 0000000..4fa9f58
--- /dev/null
+++ b/src/assets/dashboard-theme/structure.css
@@ -0,0 +1,111 @@
+:root {
+ --sidebar-width: 320px;
+ --sidebar-mini-width: 130px;
+ --sidebar-font-size: 14px;
+ --header-height: 100px;
+ --background-color: #F9FBFC;
+}
+
+#sidebar_main .badge {
+ height: 59px;
+ position: absolute;
+ top: 0;
+ left: -5px;
+ z-index: 1;
+ background-color: transparent;
+ display: block !important;
+}
+
+#sidebar_main #sidebar_content {
+ width: var(--sidebar-width);
+ position: fixed;
+ height: 100%;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ z-index: 981;
+ background: #fff;
+}
+
+.sidebar_main_swipe.sidebar_mini #sidebar_switcher_toggle {
+ left: calc(var(--sidebar-mini-width) + 0px);
+
+}
+
+.sidebar_main_swipe #sidebar_switcher_toggle {
+ left: calc(var(--sidebar-width) + 0px);
+}
+
+#sidebar_main .menu_section > ul > li > a {
+ font-size: var(--sidebar-font-size);
+ color: rgba(0, 0, 0, .7);
+}
+
+#sidebar_main .menu_section > ul > li > a:hover, #sidebar_main .menu_section > ul li.current_section > a {
+ color: var(--secondary-color);
+}
+
+#sidebar_switcher_toggle {
+ top: 320px !important;
+ position: fixed;
+ background: #ffffff;
+ border: 1px solid var(--portal-dark-color);
+ border-left: 0;
+ cursor: pointer;
+ padding: 0 4px;
+ width: 10px;
+ height: 66px;
+ z-index: 981;
+}
+
+.sidebar_main_swipe #page_content {
+ padding-left: var(--sidebar-width);
+ padding-top: var(--header-height);
+ transition: 0.5s;
+}
+
+/*Sidebar close*/
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #page_content {
+ padding-left: 0;
+ transition: 0.5s;
+}
+
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #sidebar_main #sidebar_content {
+ display: none;
+ width: 0;
+}
+
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #sidebar_switcher_toggle {
+ left: 10px;
+}
+
+/*Sidebar mini*/
+.sidebar_main_swipe.sidebar_mini #page_content {
+ padding-left: var(--sidebar-mini-width);
+ transition: 0.5s;
+}
+
+.sidebar_mini #sidebar_main #sidebar_content {
+ width: var(--sidebar-mini-width);
+}
+
+#sidebar_main .menu_section > ul > li > a {
+ display: block;
+}
+
+#sidebar_main #sidebar_content {
+ border-right: 1px solid var(--portal-dark-color);
+}
+
+#page_content {
+ min-height: calc(100vh - var(--header-height));
+ background-color: var(--background-color);
+}
+
+#page_content_inner {
+ padding: 50px 50px 100px 50px;
+}
+
+navbar > * {
+ background-color: var(--background-color);
+}
diff --git a/src/assets/dashboard-theme/tabs-pills.css b/src/assets/dashboard-theme/tabs-pills.css
new file mode 100644
index 0000000..e69de29
diff --git a/src/assets/dashboard-theme/text.css b/src/assets/dashboard-theme/text.css
new file mode 100644
index 0000000..e810fce
--- /dev/null
+++ b/src/assets/dashboard-theme/text.css
@@ -0,0 +1,20 @@
+:root {
+ --font-size: 16px;
+ --text-color: #212121;
+ --small-font-size: 14px;
+ --large-font-size: 18px;
+}
+
+body {
+ color: var(--text-color);
+ font-size: var(--font-size);
+ font-family: "Open Sans", sans-serif;
+}
+
+.uk-text-small {
+ font-size: var(--small-font-size);
+}
+
+.uk-text-large {
+ font-size: var(--large-font-size);
+}
diff --git a/src/assets/dashboard-theme/variables.css b/src/assets/dashboard-theme/variables.css
new file mode 100644
index 0000000..844b424
--- /dev/null
+++ b/src/assets/dashboard-theme/variables.css
@@ -0,0 +1,24 @@
+:root {
+ --portal-main-color: #8DCA26;
+ --portal-main-contrast: white;
+ --portal-dark-color: #7c9144;
+ --primary-color: var(--theme-primary-color);
+ --secondary-color: var(--theme-secondary-color);
+ --contrast-color: white;
+
+ /* Portable Variables*/
+ --theme-primary-color: #222080;
+ --theme-secondary-color: #4686E5;
+ --openaire-main-color: #313179;
+ --explore-portal-color: #D95F2D;
+ --provide-portal-color: #37C7E9;
+ --monitor-portal-color: #8DCA26;
+ --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;
+}
diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css
index c95f469..afb412e 100644
--- a/src/assets/monitor-custom.css
+++ b/src/assets/monitor-custom.css
@@ -1,34 +1,3 @@
-:root {
- --portal-main-color: #4686E5; /*#8DCA26;*/
- --portal-main-contrast: white;
- --portal-dark-color: #004494;/*#7c9144;*/
-
- --openaire-main-color: #313179;
-
- --explore-portal-color: #D95F2D;
- --provide-portal-color: #37C7E9;
- --monitor-portal-color: #8DCA26;
- --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;
-
-
- /* Dashboard variables*/
- --sidebar-width: 320px;
- --sidebar-mini-width: 130px;
- --sidebar-font-size: 14px;
- --header-height: 70px;
- --primary-color: #0d47a1;
- --secondary-color: #1CA9D5;
-
- --monitor-header-menu-height: 100px;
-}
-
.refresh-iframe {
background-color: rgba(0, 0, 0, 0.50);
position: absolute;
diff --git a/src/assets/new.css b/src/assets/new.css
index 296e29c..fdb6878 100644
--- a/src/assets/new.css
+++ b/src/assets/new.css
@@ -1,32 +1,12 @@
:root {
- --portal-main-color: #4686E5; /*#8DCA26;*/
+ --portal-main-color: #8DCA26;
--portal-main-contrast: white;
- --portal-dark-color: #004494;/*#7c9144;*/
+ --portal-dark-color: #7c9144;
+}
- --openaire-main-color: #313179;
-
- --explore-portal-color: #D95F2D;
- --provide-portal-color: #37C7E9;
- --monitor-portal-color: #8DCA26;
- --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;
-
-
- /* Dashboard variables*/
- --sidebar-width: 320px;
- --sidebar-mini-width: 130px;
- --sidebar-font-size: 14px;
- --header-height: 70px;
- --primary-color: #0d47a1;
- --secondary-color: #1CA9D5;
-
- --monitor-header-menu-height: 100px;
+.stakeholderPage {
+ --primary-color: var(--theme-secondary-color);
+ --secondary-color: var(--theme-primary-color);
}
/*Stakeholder Specific*/
.publicationsSearchForm{
@@ -48,16 +28,6 @@
}
/*General*/
-#sidebar_main #sidebar_content{
- width:var(--sidebar-width);
- position: fixed;
- height: 100%;
- top: 0;
- bottom: 0;
- left: 0;
- z-index: 981;
- background: #fff;
-}
.stakeholderPage {
background: #F9FBFC !important;
}
@@ -83,7 +53,7 @@
top: 320px !important;
position: fixed;
height: 36px;
- background-color: var(--portal-main-color);
+ background-color: var(--secondary-color);
border-radius: 4px 0 0 4px;
cursor: pointer;
padding: 0 2px;
@@ -92,96 +62,20 @@
/*z-index: 981;*/
right: 0;
}
-.sidebar_main_swipe.sidebar_mini #sidebar_switcher_toggle{
- left:calc( var(--sidebar-mini-width) + 0px);
-
-}
-.sidebar_main_swipe #sidebar_switcher_toggle{
- left:calc( var(--sidebar-width) + 0px);
-}
-#sidebar_switcher_toggle {
- top: 320px !important;
- position: fixed;
- background: #fff;
- background-color: rgb(255, 255, 255);
- border: 1px solid var(--portal-dark-color);
- border-left: 0px ;
- cursor: pointer;
- padding: 0 4px;
- width:10px;
- height: 66px;
- z-index: 981;
-}
/*Sidebar*/
-.badge {
- height: 59px;
- position: absolute;
- top: 0;
- left: -5px;
- z-index: 1;
- background-color: transparent;
- display: block !important;
-}
/*Style*/
-
-
-#sidebar_main .menu_section > ul li > a {
- font-size: var(--sidebar-font-size);
- color: rgba(0,0,0,.7);
-}
-
-.dashboard #sidebar_main .menu_section > ul > li > a:hover, #sidebar_main .menu_section > ul li.current_section > a {
- color: var(--portal-main-color);
-}
/*#sidebar_main .menu_section > ul li.current_section > a {*/
/* font-size: var(--sidebar-font-size);*/
/* color: rgba(0,0,0,.7);*/
/*}*/
-.sidebar_main_swipe #page_content{
- padding-left: var(--sidebar-width);
- transition: 0.5s;
-}
-
-/*Sidebar close*/
-.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #page_content{
- padding-left:0;
- transition: 0.5s;
-
-}
-.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #sidebar_main #sidebar_content {
- display: none;
- width:0;
-
-}
-.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #sidebar_switcher_toggle{
- left: 10px;
-}
-/*Sidebar mini*/
-.sidebar_main_swipe.sidebar_mini #page_content{
- padding-left:var(--sidebar-mini-width);
- transition: 0.5s;
-
-}
-
-.sidebar_mini #sidebar_main #sidebar_content {
- width: var(--sidebar-mini-width);
-
-}
-#sidebar_main .menu_section > ul > li > a {
- display: block;
-}
-
-.dashboard #sidebar_main #sidebar_content{
- border-right: 1px solid var(--portal-dark-color);
-}
/*Sidebar Header logo */
#sidebar_main .sidebar_main_header .portalLogo{
background: url("/assets/logo-large-monitor.png") no-repeat;
background-size: contain ;
margin-left: 35px;
margin-top: 5px;
- height:50px;
+ height:50px;
}
.sidebar_mini #sidebar_main .sidebar_main_header .portalLogo{
@@ -243,7 +137,7 @@
border: 0 transparent !important;
}
.categoriesTabs.uk-tab > li.uk-active > a,.categoriesTabs.uk-tab > li > a:focus, .categoriesTabs.uk-tab > li > a:hover {
- color: var(--portal-main-color) !important
+ color: var(--secondary-color) !important
}
.categoriesTabs >li a{
font-size: 14px;
@@ -268,8 +162,8 @@
.uk-subnav-pill.subCategoriesTabs > li.uk-active > a{
color: white;
- border: 1px solid var(--portal-main-color);
- background-color: var(--portal-main-color);
+ border: 1px solid var(--secondary-color);
+ background-color: var(--secondary-color);
opacity: 1 ;
}
@@ -280,11 +174,11 @@
/*dashboard tabs*/
.categoriesTabs.uk-tab.admin > li.uk-active > a, .categoriesTabs.uk-tab.admin > li > a:focus, .categoriesTabs.uk-tab.admin > li > a:hover {
- color: var(--portal-dark-color) !important
+ color: var(--primary-color) !important
}
.uk-subnav-pill.subCategoriesTabs.admin > li.uk-active > a{
- border: 1px solid var(--portal-dark-color);
- background-color: var(--portal-dark-color);
+ border: 1px solid var(--primary-color);
+ background-color: var(--primary-color);
}
/* Section Tools*/
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index cc93234..9a97089 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -49,13 +49,13 @@ export let properties: EnvProperties = {
vocabulariesAPI: "https://dev-openaire.d4science.org/provision/mvc/vocabularies/",
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "80",
- registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
+ /*registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
loginUrl: "http://mpagasas.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
- logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',
- /*loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
+ logoutUrl: 'http://mpagasas.di.uoa.gr:8180/dnet-login/openid_logout',*/
+ loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
- logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",*/
+ logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
cookieDomain: ".di.uoa.gr",
feedbackmail: "openaire.test@gmail.com",
cacheUrl: "http://scoobydoo.di.uoa.gr:3000/get?url=",
diff --git a/src/material.scss b/src/material.scss
index 4008866..2e6485d 100644
--- a/src/material.scss
+++ b/src/material.scss
@@ -1,8 +1,19 @@
@import '~@angular/material/theming';
@include mat-core();
-$my-app-primary: mat-palette($mat-blue, 900);
-$my-app-accent: mat-palette($mat-blue, 700);
-
+$primary-color: (
+ 0: var(--primary-color),
+ contrast: (
+ 50: var(--contrast-color)
+ )
+);
+$secondary-color: (
+ 0: var(--secondary-color),
+ contrast: (
+ 50: var(--contrast-color)
+ )
+);
+$my-app-primary: mat-palette($primary-color, 0);
+$my-app-accent: mat-palette($secondary-color, 0);
$my-app-theme: mat-light-theme($my-app-primary, $my-app-accent);
@include angular-material-theme($my-app-theme);
diff --git a/src/styles.css b/src/styles.css
index 74e8234..5c5a5d9 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -8,14 +8,11 @@
/*@import "assets/theme-assets/css/themes/my_theme.min.css";*/
/* You can add global styles to this file, and also import other style files */
-@import "~@angular/material/prebuilt-themes/indigo-pink.css";
@import "assets/common-assets/common/theme.css";
@import "assets/common-assets/common/custom.css";
@import "assets/common-assets/library.css";
+@import "assets/dashboard-theme/main.css";
/*@import "assets/theme-assets/dashboard-custom.css";*/
/*@import "assets/monitor-custom.css";*/
@import "assets/new.css";
-@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,900&display=swap');
-@import "assets/common-assets/common/theme-changes.css";
-