From 5d4b62970fe6f917215f56165cc0adec3f87030f Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Thu, 4 Jun 2020 18:32:44 +0000 Subject: [PATCH] [Monitor Dashboard |Trunk] Stakeholder Page: Update colors according to the mocks. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58845 d315682c-612b-4755-9ff5-7f18f6832af3 --- package.json | 2 +- src/app/monitor/monitor.component.css | 0 src/app/monitor/monitor.component.html | 4 ++- src/app/monitor/monitor.component.ts | 1 + src/app/monitor/monitor.module.ts | 3 ++- src/assets/env-properties.json | 2 +- src/assets/monitor-custom.css | 27 ++++++++++++++++++-- src/assets/theme-assets/dashboard-custom.css | 22 +++++++++++++--- 8 files changed, 51 insertions(+), 10 deletions(-) create mode 100644 src/app/monitor/monitor.component.css diff --git a/package.json b/package.json index 8c940e8..467a51d 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "start:ssr": "npm run build:ssr && npm run serve:ssr", "start:prerender": "npm run build:prerender && npm run serve:prerender", "build": "ng build", - "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true --base-href /monitor/dashboard/ && ng run ng-universal-demo:server:production", + "build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true --base-href /dashboard/ && ng run ng-universal-demo:server:production", "build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender", "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server", "generate:prerender": "cd dist && node prerender", diff --git a/src/app/monitor/monitor.component.css b/src/app/monitor/monitor.component.css new file mode 100644 index 0000000..e69de29 diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html index 37a8142..851f015 100644 --- a/src/app/monitor/monitor.component.html +++ b/src/app/monitor/monitor.component.html @@ -32,7 +32,7 @@
-->
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts index 2ab23a7..ac62c0c 100644 --- a/src/app/monitor/monitor.component.ts +++ b/src/app/monitor/monitor.component.ts @@ -26,6 +26,7 @@ import {StakeholderCreator} from "../utils/entities/stakeholderCreator"; @Component({ selector: 'monitor', templateUrl: 'monitor.component.html', + styleUrls:['monitor.component.css'] }) export class MonitorComponent implements OnInit, OnDestroy, IDeactivateComponent { private static sidebarStatus: { diff --git a/src/app/monitor/monitor.module.ts b/src/app/monitor/monitor.module.ts index 7c04141..c2cf5b7 100644 --- a/src/app/monitor/monitor.module.ts +++ b/src/app/monitor/monitor.module.ts @@ -18,12 +18,13 @@ import {SideBarModule} from "../openaireLibrary/dashboard/sharedComponents/sideb import {InputModule} from "../openaireLibrary/dashboard/sharedComponents/input/input.module"; import {UserMiniModule} from "../openaireLibrary/login/userMiniModule.module"; import {ClickModule} from "../openaireLibrary/utils/click/click.module"; +import {BottomModule} from "../openaireLibrary/sharedComponents/bottom.module"; @NgModule({ imports: [ CommonModule, FormsModule, RouterModule, ErrorMessagesModule, HelperModule, Schema2jsonldModule, SEOServiceModule, MonitorRoutingModule, SideBarModule, InputModule, - UserMiniModule, ClickModule + UserMiniModule, ClickModule, BottomModule ], declarations: [ MonitorComponent diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index c7d04fc..a4256ff 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -63,7 +63,7 @@ "pagingLimit": 20, "resultsPerPage": 10, - "baseLink" : "https://beta.explore.openaire.eu", + "baseLink" : "https://beta.monitor.openaire.eu", "afterLoginRedirectLink": "", diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index 99a90dd..cb05369 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -69,12 +69,27 @@ } .stakeholderPage #hide_controls:hover #toggle:hover .material-icons, .stakeholderPage #hide_controls #toggle:not(.sidebar_main_open) .material-icons { color: var(--portal-main-color); - border: var(--portal-main-color) solid 1px; + /*border: var(--portal-main-color) solid 0px;*/ } -.stakeholderPage #hide_controls #toggle:hover, .stakeholderPage #hide_controls #toggle:not(.sidebar_main_open),.stakeholderPage #sidebar_main .menu_section > ul > li.current_section > a .menu_title, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section > a > .menu_icon .material-icons { +.stakeholderPage #hide_controls #toggle:hover .material-icons , .stakeholderPage #hide_controls #toggle:not(.sidebar_main_open) .material-icons, #hide_controls #toggle .material-icons{ color: var(--portal-main-color) !important; } +.stakeholderPage #sidebar_main .menu_section > ul > li > a > .menu_icon .material-icons { + color: var(--portal-main-color) !important; +} +.stakeholderPage #sidebar_main .menu_section > ul > li.current_section, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section:hover, +.stakeholderPage #sidebar_main .menu_section > ul > li.current_section:hover > a:hover +{ + background-color: var(--portal-main-color) !important; +} +.stakeholderPage #sidebar_main .menu_section > ul > li.current_section .menu_title, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section:hover .menu_title, .stakeholderPage #sidebar_main .menu_section > ul > li.current_section > a > .menu_icon .material-icons +/*.stakeholderPage #sidebar_main .menu_section > ul > li:hover > a > .menu_icon .material-icons*/ +{ + color: white !important; + font-weight: 700; +} + .dashboard #header_main .uk-logo img{ max-height: calc(var(--header-height) - 30px); } @@ -85,3 +100,11 @@ top:200px; } +.stakeholderPage .uk-navbar-container{ + box-shadow: 0px 1px 3px #0000004D; + +} + +.stakeholderPage #sidebar_main{ + background-color: #F0F4F2; +} diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css index cc4ff08..2cc50f0 100644 --- a/src/assets/theme-assets/dashboard-custom.css +++ b/src/assets/theme-assets/dashboard-custom.css @@ -88,7 +88,7 @@ html .dashboard { } .dashboard .sidebar_main_active #hide_controls { - background: rgba(255, 255, 255, 1); + background: #F0F4F2; /*border-top: 1px solid rgba(0,0,0,.30);*/ width: 320px; transition: width 280ms cubic-bezier(0.4, 0, 0.2, 1); @@ -109,7 +109,7 @@ html .dashboard { cursor: pointer; width: max-content; } - +/* .dashboard #hide_controls #toggle:hover, .dashboard #hide_controls #toggle:not(.sidebar_main_open) { color: var(--primary-color); } @@ -118,7 +118,7 @@ html .dashboard { .dashboard #hide_controls #toggle:not(.sidebar_main_open) .material-icons { color: var(--primary-color); border: var(--primary-color) solid 1px; -} +}*/ .dashboard #hide_controls #toggle .material-icons { transform: rotateY(0deg); @@ -152,7 +152,7 @@ html .dashboard { } .dashboard #sidebar_main .menu_section > ul > li > a { - font-weight: 700; + /*font-weight: 700;*/ overflow: unset; } @@ -526,3 +526,17 @@ body.dashboard { background-color: var(--primary-color); } +.dashboard { + background-color: white; +} +#sidebar_main{ + background-color: #F0F4F2; +} + +.dashboard .md-card{ + background: #FFFFFF 0% 0% no-repeat padding-box; + box-shadow: 1px 10px 12px #00000026; + border: 1px solid #E0E0E0; + border-radius: 5px; + opacity: 1; +}