Commit dec2e088 authored by descamps's avatar descamps
Browse files

Merge branch 'fix/guards-and-header' into 'feat/test'

Fixed guards and header's CSS

See merge request !50
parents 85370137 98182b6a
......@@ -47,12 +47,12 @@ import { PastisAuthGuard } from './security/pastis.auth.guard';
import { PastisAppGuard } from './security/pastis.app.guard';
const routes: Routes = [
{path: 'sedaview', canActivate: [PastisAuthGuard, PastisAppGuard], component: SedaVisualizerComponent},
{path: 'profileview', canActivate: [PastisAuthGuard, PastisAppGuard], component: ProfileVisualizerComponent},
{path: 'sedaview', canActivate: [PastisAuthGuard, PastisAppGuard], component: SedaVisualizerComponent, data:{appId: 'PASTIS_APP'}},
{path: 'profileview', canActivate: [PastisAuthGuard, PastisAppGuard], component: ProfileVisualizerComponent, data:{appId: 'PASTIS_APP'}},
{path: '', canActivate: [PastisAuthGuard, PastisAppGuard], component: ListProfileComponent, data:{appId: 'PASTIS_APP'}},
{path: 'edit/:id', canActivate: [PastisAuthGuard, PastisAppGuard], component: MainComponent},
{path: 'new', canActivate: [PastisAuthGuard, PastisAppGuard], component: MainComponent},
{path: '**', canActivate: [PastisAuthGuard, PastisAppGuard], component: PastisUnderConstructionComponent},
{path: 'edit/:id', canActivate: [PastisAuthGuard, PastisAppGuard], component: MainComponent, data:{appId: 'PASTIS_APP'}},
{path: 'new', canActivate: [PastisAuthGuard, PastisAppGuard], component: MainComponent, data:{appId: 'PASTIS_APP'}},
{path: '**', canActivate: [PastisAuthGuard, PastisAppGuard], component: PastisUnderConstructionComponent, data:{appId: 'PASTIS_APP'}},
];
@NgModule({
......
......@@ -45,14 +45,14 @@ td {
}
// Inital content
.mat-select {
.pastis-table-container .mat-select {
@extend .dropdown;
@extend .pastis-dropdown-border-button1-enabled;
max-height: 50px;
}
// Inital content text
.mat-select-value {
.pastis-table-container .mat-select-value {
vertical-align: middle;
color: var(--vitamui-grey-600);
@extend .text-text-normal;
......@@ -61,7 +61,7 @@ td {
/////////////################ Select trigger - Text + arrow
.mat-select-arrow {
.pastis-table-container .mat-select-arrow {
background: url(../../../../assets/svg/icons/drop-box-arrow-vitam.svg) no-repeat 100% 50% ;
background-size: 24px 24px;
border: none !important;
......@@ -74,7 +74,7 @@ td {
margin: 0px -10px 0px 0px !important;
}
.mat-select-value-text {
.pastis-table-container .mat-select-value-text {
@extend .text-text-normal;
color: var(--vitamui-grey-600);
vertical-align: middle;
......@@ -82,7 +82,7 @@ td {
max-width: 200px;
}
.mat-select-placeholder {
.pastis-table-container .mat-select-placeholder {
//styleName: Text/Text-medium;
@extend .text-text-medium;
color:#757575;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment