diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 57312a2..8671ace 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -17,13 +17,13 @@ const routes: Routes = [
path: 'user-info',
loadChildren: './login/libUser.module#LibUserModule',
resolve: {envSpecific: EnvironmentSpecificResolver},
- data: {hasSidebar: false}
+ data: {hasSidebar: false, isFrontPage: true}
},
{
path: 'error',
component: OpenaireErrorPageComponent,
resolve: {envSpecific: EnvironmentSpecificResolver},
- data: {hasSidebar: false}
+ data: {hasSidebar: false, isFrontPage: true}
},
{
path: 'admin',
@@ -156,7 +156,7 @@ const routes: Routes = [
pathMatch: 'full',
component: OpenaireErrorPageComponent,
resolve: {envSpecific: EnvironmentSpecificResolver},
- data: {hasSidebar: false, hasAdminMenu: false}
+ data: {hasSidebar: false, hasAdminMenu: false, isFrontPage: true}
}
];
diff --git a/src/app/app.component.html b/src/app/app.component.html
index d23b3a8..ef29fc1 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -16,9 +16,12 @@
[headerUrl]="properties.domain + properties.baseLink" queryParamsHandling="preserve"
>
+
diff --git a/src/app/monitor/monitor.component.html b/src/app/monitor/monitor.component.html
index 830b5e2..ac25fcb 100644
--- a/src/app/monitor/monitor.component.html
+++ b/src/app/monitor/monitor.component.html
@@ -204,11 +204,6 @@
-
-
-
-
diff --git a/src/app/monitor/monitor.component.ts b/src/app/monitor/monitor.component.ts
index f0ba2d2..8c30913 100644
--- a/src/app/monitor/monitor.component.ts
+++ b/src/app/monitor/monitor.component.ts
@@ -55,7 +55,7 @@ export class MonitorComponent implements OnInit, OnDestroy {
public numberResults: Map = new Map();
public chartsActiveType: Map = new Map();
private errorMessages: ErrorMessagesComponent;
- properties: EnvProperties;
+ properties: EnvProperties = properties;
filterToggle = false;
public routerHelper: RouterHelper = new RouterHelper();
filters:Filter[] = [];
@@ -102,7 +102,6 @@ export class MonitorComponent implements OnInit, OnDestroy {
if (subscription) {
subscription.unsubscribe();
}
- this.properties = properties;
var url = properties.domain + properties.baseLink + this._router.url;
this.route.queryParams.subscribe(params => {
this.queryParams = Object.assign({}, params);
diff --git a/src/assets/dashboard-theme/structure.css b/src/assets/dashboard-theme/structure.css
index 61da7e6..3327c1e 100644
--- a/src/assets/dashboard-theme/structure.css
+++ b/src/assets/dashboard-theme/structure.css
@@ -85,7 +85,8 @@
transition-property: left;
}
-.sidebar_main_swipe #page_content, openaire-user {
+.sidebar_main_swipe #page_content, .sidebar_main_swipe openaire-user > *,
+.sidebar_main_swipe openaire-error > * {
padding-left: var(--sidebar-width);
padding-top: var(--header-height);
transition: 0.5s;
@@ -95,8 +96,20 @@
-o-transition: 0.5s;
}
+.sidebar_main_swipe bottom > * {
+ padding-left: var(--sidebar-width);
+ transition: 0.5s;
+ -webkit-transition: 0.5s;
+ -moz-transition: 0.5s;
+ -ms-transition: 0.5s;
+ -o-transition: 0.5s;
+}
+
/*Sidebar close*/
-.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #page_content {
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) #page_content,
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) openaire-user > *,
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) openaire-error > *,
+.sidebar_main_swipe:not(.sidebar_main_active):not(.sidebar_mini) bottom > *{
padding-left: 0;
}
@@ -110,7 +123,10 @@
}
/*Sidebar mini*/
-.sidebar_main_swipe.sidebar_mini #page_content {
+.sidebar_main_swipe.sidebar_mini #page_content,
+.sidebar_main_swipe.sidebar_mini openaire-user > *,
+.sidebar_main_swipe.sidebar_mini openaire-error > *,
+.sidebar_main_swipe.sidebar_mini bottom > * {
padding-left: var(--sidebar-mini-width);
transition: 0.5s;
-webkit-transition: 0.5s;
@@ -147,7 +163,7 @@
-o-transition: 0.5s;
}
-.sidebar_mini #page_content_header{
+.sidebar_mini #page_content_header {
width: calc(100vw - var(--sidebar-mini-width) - 200px);
}
@@ -155,6 +171,6 @@
padding: 50px 90px 90px;
}
-navbar > * {
+navbar > *, openaire-error > *, openaire-user > * {
background-color: var(--background-color);
}
diff --git a/src/assets/dashboard-theme/tabs-pills.css b/src/assets/dashboard-theme/tabs-pills.css
index a1291d4..fa2a432 100644
--- a/src/assets/dashboard-theme/tabs-pills.css
+++ b/src/assets/dashboard-theme/tabs-pills.css
@@ -5,7 +5,6 @@
.uk-subnav-pill > * > a, .uk-subnav-pill > * > span > a {
color: currentColor !important;
- font-size: 13px;
opacity: 0.5;
border-radius: 40px !important;
border: 1px solid currentColor !important;
@@ -15,7 +14,7 @@
.uk-subnav-pill > * > :first-child {
text-transform: none;
- font-size: var(--font-size);
+ font-size: 13px;
color: var(--text-color);
}
@@ -54,10 +53,6 @@
border: 0 transparent !important;
}
-.subCategoriesTabs > li > a{
- font-size: 13px;
-}
-
.uk-tab.customTabs::before {
border-bottom: none !important;
}