From eb88aec5d95b16dcb8f6f8c55cab27fb3bbbc143 Mon Sep 17 00:00:00 2001 From: Konstantinos Triantafyllou Date: Wed, 13 Nov 2019 16:01:33 +0000 Subject: [PATCH] [Monitor Dashboard]: customize breadcrumbs. git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@57602 d315682c-612b-4755-9ff5-7f18f6832af3 --- src/app/home/home.component.html | 23 +++++----- src/app/topic/indicators.component.html | 33 +++++++++----- src/assets/theme-assets/dashboard-custom.css | 48 +++++++++++++++----- 3 files changed, 69 insertions(+), 35 deletions(-) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index f4f38b9..b6aef81 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -41,7 +41,8 @@
+ [class.uk-form-danger]="!valid && (!copyTopic.name || copyTopic.name === '')" + type="text">
@@ -79,7 +80,7 @@
  • - + add Create new Topic @@ -95,7 +96,8 @@
    + [class.uk-form-danger]="!valid && (!copyTopic.name || copyTopic.name === '')" + type="text">
    @@ -164,17 +166,14 @@ Select one of the topics below!
  • -
    +
    - -
    -
    -
    {{topic.name}}
    -
    - {{topic.description}} -
    +
    +
    +
    {{topic.name}}
    +
    + {{topic.description}}
    diff --git a/src/app/topic/indicators.component.html b/src/app/topic/indicators.component.html index 4f143aa..937d593 100644 --- a/src/app/topic/indicators.component.html +++ b/src/app/topic/indicators.component.html @@ -69,11 +69,11 @@
    -
    Number Indicators
    +

    Number Indicators

    @@ -114,7 +114,7 @@
    -
    Chart Indicators
    +

    Chart Indicators

    - {{indicatorUtils.chartTypes.get(indicatorPath.type)}} + + {{indicatorUtils.chartTypes.get(indicatorPath.type)}} + {{indicatorPath.type + ' Chart'}} - {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} + + {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} + {{(indicator.isPublic) ? 'Public' : 'Private'}} {{indicatorUtils.isActiveIcon}} + [class.md-color-green-300]="indicator.isActive"> + {{indicatorUtils.isActiveIcon}} + {{(indicator.isActive) ? 'Active' : 'Inactive'}} more_vert @@ -155,17 +159,22 @@
    - {{indicatorUtils.chartTypes.get(indicatorPath.type)}} + + {{indicatorUtils.chartTypes.get(indicatorPath.type)}} +
    {{indicatorPath.type + ' Chart'}}
    - {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} + + {{indicatorUtils.isPublicIcon.get(indicator.isPublic)}} +
    {{(indicator.isPublic) ? 'Public' : 'Private'}}
    - {{indicatorUtils.isActiveIcon}} + + {{indicatorUtils.isActiveIcon}} +
    {{(indicator.isActive) ? 'Active' : 'Inactive'}}
    diff --git a/src/assets/theme-assets/dashboard-custom.css b/src/assets/theme-assets/dashboard-custom.css index 6a1a0de..bc0647a 100644 --- a/src/assets/theme-assets/dashboard-custom.css +++ b/src/assets/theme-assets/dashboard-custom.css @@ -7,6 +7,11 @@ --header-height: 70px; */ +/* Global css*/ + +html .dashboard { + color: black; +} /* On link hover, his items with this class will be displayed*/ .dashboard li>a .onHover { @@ -16,8 +21,6 @@ .dashboard li>a:hover .onHover { display: block; } -/*---*/ - /* Custom width of sidebar, change var: sidebar-width*/ .dashboard #sidebar_main { @@ -31,15 +34,19 @@ transform: translate3d(0,0,0); } +.dashboard #sidebar_main .sidebar_main_header { + color: #000000; +} + .dashboard #sidebar_main .menu_section > ul > li > a { font-weight: 700; font-size: var(--sidebar-font-size); - color: rgba(0, 0, 0, 0.70); + color: rgba(0, 0, 0, 0.7); } .dashboard #sidebar_main .menu_section > ul > li ul a { font-size: var(--sidebar-font-size); - color: rgba(0, 0, 0, 0.70); + color: rgba(0, 0, 0, 0.7); } @media only screen and (min-width: 1220px) { @@ -49,6 +56,7 @@ margin-left: var(--sidebar-width); } } + /* Custom height of header, change var: header-height*/ body.dashboard { padding-top: var(--header-height); @@ -57,26 +65,44 @@ body.dashboard { .dashboard #header_main { padding: calc((var(--header-height) - 48px)/2) 25px; } -/*---*/ /* Custom card*/ -.dashboard .md-card .md-card-toolbar-heading-text { +.dashboard .md-card .md-card-content { + color: rgba(0, 0, 0, 0.8); +} + +.dashboard .md-card .md-card-toolbar .md-card-toolbar-actions { + color: rgba(0, 0, 0, 0.8); +} + +.dashboard .md-card .md-card-toolbar .md-card-toolbar-heading-text { font-weight: 700; } -/*---*/ /* Breadcrumb*/ .dashboard #breadcrumbs { background: inherit; } -/* Notification */ +.dashboard #breadcrumbs > li a, +.dashboard #breadcrumbs > li span { + color: rgba(0, 0, 0, 0.4); + font-size: 12px; + line-height: 20px; +} -/*Remove the second close added by theme because it was used uikit 2*/ +.dashboard #breadcrumbs > li + li a:before, +.dashboard #breadcrumbs > li + li span:before { + font-weight: 400 !important; + margin-top: -9px; + font-size: 16px; +} + +/* Notification */ +/* Remove the second close added by theme because it was used uikit 2*/ .dashboard .uk-close::after {content: '';} -/* Change z-index, because of sidebar and header z-index is larger that default */ +/* Change z-index, because of sidebar and header z-index is bigger that default */ .dashboard .uk-notification { z-index: 2000; } -/*---*/