Skip to content
Snippets Groups Projects
Commit 3ee946ec authored by Maël AUDEON's avatar Maël AUDEON
Browse files

[DLAB-4011] Set dlab theme config

parent bba10c4e
No related branches found
No related tags found
1 merge request!1Feature/design/1
Showing with 16 additions and 19 deletions
......@@ -86,9 +86,9 @@ export class StartupService {
this.authService.logoutRedirectUiUrl = this.configurationData.LOGOUT_REDIRECT_UI_URL;
})
.then(() => this.refreshUser().toPromise())
.then(() => this.applicationApi.getAsset('vitamui-logo.png').toPromise())
.then(() => this.applicationApi.getAsset('logo.png').toPromise())
.then((data) => {
this.configurationData.LOGO = data['vitamui-logo.png'];
this.configurationData.LOGO = data['logo.png'];
})
.then(() => {
this.themeService.init(this.configurationData.THEME_COLORS);
......
......@@ -129,7 +129,7 @@
}
.mat-menu-item {
border-top: 1px solid #51a495;
border-top: 1px solid var(--vitamui-secondary);
}
.mat-menu-item:hover:not([disabled]):not(.menu-cancel-button) {
......
......@@ -20,10 +20,12 @@
.mat-option:hover:not(.mat-option-disabled),
.mat-option:focus:not(.mat-option-disabled) {
background-color: rgba(var(--vitamui-secondary-rgb), 0.85);
color: white;
}
.mat-option.mat-selected:not(.mat-option-multiple):not(.mat-option-disabled) {
background-color: rgba(var(--vitamui-secondary-rgb), 0.85);
color: white;
}
.mat-option.mat-selected:not(.mat-option-multiple):not(.mat-active):not(:hover) {
......@@ -32,12 +34,12 @@
.mat-option.mat-selected:not(.mat-option-multiple) {
font-weight: 500;
color: var(--vitamui-secondary);
color: white;
&:before {
content: 'check';
font-family: 'Material Icons';
color: var(--vitamui-secondary);
color: white;
display: block;
position: absolute;
left: 10px;
......
......@@ -108,8 +108,7 @@ button.back {
letter-spacing: -0.8px;
text-align: left;
color: $charcoal-grey;
color: var(--charcoal-grey);
margin-left: 20px;
margin-left: 20px;
}
.controls {
......
......@@ -12,8 +12,8 @@ spring:
ui-identity:
#theme-logo: /path/to/logo.png
theme-colors:
vitamui-primary: "#702382"
vitamui-secondary: "#7FA1D4"
vitamui-primary: "#fe4f02"
vitamui-secondary: "#5cbaa9"
assets: src/main/config
iam-external-client:
server-host: localhost
......
......@@ -12,10 +12,8 @@ spring:
ui-identity:
#theme-logo: /path/to/logo.png
theme-colors:
vitamui-primary: "#702382"
vitamui-primary-light: "#992fb1"
vitamui-primary-light-20: "#ba52d1"
vitamui-secondary: "#7FA1D4"
vitamui-primary: "#fe4f02"
vitamui-secondary: "#5cbaa9"
assets: src/main/config
iam-external-client:
server-host: localhost
......
......@@ -27,8 +27,8 @@ management:
ui-portal:
#theme-logo: /path/to/logo.png
theme-colors:
vitamui-primary: "#702382"
vitamui-secondary: "#7FA1D4"
vitamui-primary: "#fe4f02"
vitamui-secondary: "#5cbaa9"
assets: src/main/config
iam-external-client:
server-host: localhost
......
......@@ -27,10 +27,8 @@ management:
ui-portal:
#theme-logo: /path/to/logo.png
theme-colors:
vitamui-primary: "#702382"
vitamui-primary-light: "#992fb1"
vitamui-primary-light-20: "#ba52d1"
vitamui-secondary: "#7FA1D4"
vitamui-primary: "#fe4f02"
vitamui-secondary: "#5cbaa9"
assets: src/main/config
iam-external-client:
server-host: localhost
......
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