Skip to content
Snippets Groups Projects
Commit 850d27a8 authored by BLANCHET Ludovic's avatar BLANCHET Ludovic Committed by Makhtar DIAGNE
Browse files

First step: Update main color + customer collection


Signed-off-by: default avatarMakhtar DIAGNE <makhtar.diagne@teamdlab.com>
parent e83b7729
No related branches found
No related tags found
1 merge request!1Feature/design/1
Showing
with 37 additions and 20 deletions
...@@ -113,4 +113,7 @@ public class CustomerDto extends IdDto { ...@@ -113,4 +113,7 @@ public class CustomerDto extends IdDto {
private String identifier; private String identifier;
private boolean hasCustomGraphicIdentity = false; private boolean hasCustomGraphicIdentity = false;
private String mainColor;
private String secondaryColor;
} }
...@@ -47,4 +47,8 @@ public class GraphicIdentity { ...@@ -47,4 +47,8 @@ public class GraphicIdentity {
String logoDataBase64; String logoDataBase64;
// Theme based Graphical identity
String mainColor;
String secondaryColor;
} }
...@@ -101,3 +101,7 @@ cas: ...@@ -101,3 +101,7 @@ cas:
trust-store: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_client_type }}.jks trust-store: {{ vitamui_folder_conf }}/truststore_{{ vitamui_certificate_client_type }}.jks
trust-store-password: {{ password_truststore }} trust-store-password: {{ password_truststore }}
{% endif %} {% endif %}
theme:
main-color: {{}}
secondary-color: {{}}
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
i { i {
color: $greeny-blue; color: var(--vitamui-secondary);
font-size: 42px; font-size: 42px;
margin-right: 15px; margin-right: 15px;
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
:host { :host {
width: 100%; width: 100%;
background: $greeny-blue; background: var(--vitamui-secondary);
padding: 14px 24px; padding: 14px 24px;
} }
......
...@@ -115,7 +115,7 @@ $anim-timing: 150ms ease-out; ...@@ -115,7 +115,7 @@ $anim-timing: 150ms ease-out;
} }
i.edit-icon { i.edit-icon {
color: $greeny-blue; color: var(--vitamui-secondary);
opacity: 0; opacity: 0;
// margin-left: 18px; // margin-left: 18px;
transition: opacity $anim-timing; transition: opacity $anim-timing;
...@@ -125,7 +125,7 @@ $anim-timing: 150ms ease-out; ...@@ -125,7 +125,7 @@ $anim-timing: 150ms ease-out;
} }
&:hover:not(.edit-mode), &:focus:not(.edit-mode) { &:hover:not(.edit-mode), &:focus:not(.edit-mode) {
border-color: $greeny-blue; border-color: var(--vitamui-secondary);
i.edit-icon { i.edit-icon {
opacity: 1; opacity: 1;
...@@ -168,7 +168,7 @@ $anim-timing: 150ms ease-out; ...@@ -168,7 +168,7 @@ $anim-timing: 150ms ease-out;
} }
.editable-field.edit-mode { .editable-field.edit-mode {
border-color: $greeny-blue; border-color: var(--vitamui-secondary);
padding-right: 25px; padding-right: 25px;
.editable-field-content { .editable-field-content {
......
...@@ -88,7 +88,7 @@ label { ...@@ -88,7 +88,7 @@ label {
pointer-events: none; pointer-events: none;
.required-marker { .required-marker {
color: $blood-orange; color: var(--vitamui-primary);
} }
} }
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
i { i {
margin-right: 10px; margin-right: 10px;
color: $greeny-blue; color: var(--vitamui-secondary);
font-size: 24px; font-size: 24px;
vertical-align: middle; vertical-align: middle;
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
white-space: nowrap; white-space: nowrap;
&.active { &.active {
color: $greeny-blue; color: var(--vitamui-secondary);
} }
&.upside-down > i { &.upside-down > i {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
width: 100%; width: 100%;
&.active > i { &.active > i {
color: $greeny-blue; color: var(--vitamui-secondary);
} }
&.upside-down > i { &.upside-down > i {
......
...@@ -31,7 +31,7 @@ label { ...@@ -31,7 +31,7 @@ label {
@include elevation-1; @include elevation-1;
&.slide-toggle-on { &.slide-toggle-on {
background-color: $greeny-blue; background-color: var(--vitamui-secondary);
} }
&:hover { &:hover {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
} }
i { i {
color: $greeny-blue; color: var(--vitamui-secondary);
font-size: 42px; font-size: 42px;
margin-right: 15px; margin-right: 15px;
} }
......
...@@ -32,7 +32,7 @@ $animation-time: 150ms; ...@@ -32,7 +32,7 @@ $animation-time: 150ms;
right: 16px; right: 16px;
top: 14px; top: 14px;
pointer-events: none; pointer-events: none;
color: $blood-orange; color: var(--vitamui-primary);
} }
.input-label { .input-label {
......
...@@ -91,6 +91,6 @@ label { ...@@ -91,6 +91,6 @@ label {
white-space: nowrap; white-space: nowrap;
.required-marker { .required-marker {
color: $blood-orange; color: var(--vitamui-primary);
} }
} }
...@@ -92,6 +92,6 @@ label { ...@@ -92,6 +92,6 @@ label {
pointer-events: none; pointer-events: none;
.required-marker { .required-marker {
color: $blood-orange; color: var(--vitamui-primary);
} }
} }
...@@ -68,5 +68,5 @@ input.vitamui-input { ...@@ -68,5 +68,5 @@ input.vitamui-input {
} }
.required-marker { .required-marker {
color: $blood-orange; color: var(--vitamui-primary);
} }
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
.user-app { .user-app {
i { i {
color: $blood-orange; color: var(--vitamui-primary);
&.chevron-icon { &.chevron-icon {
font-size: 24px; font-size: 24px;
...@@ -62,7 +62,7 @@ ...@@ -62,7 +62,7 @@
.settings-app { .settings-app {
i { i {
color: $greeny-blue; color: var(--vitamui-secondary);
&.chevron-icon { &.chevron-icon {
font-size: 24px; font-size: 24px;
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
} }
.archive-tile { .archive-tile {
background-color: $blood-orange; background-color: var(--vitamui-primary);
color: $white; color: $white;
i { i {
......
...@@ -44,7 +44,7 @@ $input-height: 70px; ...@@ -44,7 +44,7 @@ $input-height: 70px;
} }
i { i {
color: $greeny-blue; color: var(--vitamui-secondary);
font-size: 42px; font-size: 42px;
margin-right: 15px; margin-right: 15px;
} }
......
...@@ -63,6 +63,8 @@ export class StartupService { ...@@ -63,6 +63,8 @@ export class StartupService {
private CURRENT_TENANT_IDENTIFIER: string; private CURRENT_TENANT_IDENTIFIER: string;
private themeWrapper = document.querySelector('body');
constructor( constructor(
private logger: Logger, private logger: Logger,
private authService: AuthService, private authService: AuthService,
...@@ -81,6 +83,10 @@ export class StartupService { ...@@ -81,6 +83,10 @@ export class StartupService {
this.authService.loginUrl = this.configurationData.CAS_URL; this.authService.loginUrl = this.configurationData.CAS_URL;
this.authService.logoutUrl = this.configurationData.CAS_LOGOUT_URL; this.authService.logoutUrl = this.configurationData.CAS_LOGOUT_URL;
this.authService.logoutRedirectUiUrl = this.configurationData.LOGOUT_REDIRECT_UI_URL; this.authService.logoutRedirectUiUrl = this.configurationData.LOGOUT_REDIRECT_UI_URL;
// TODO set the colors returned from the back-end - How to get customer's values ? Or not load here ?
this.themeWrapper.style.setProperty('--vitamui-primary', '#81B');
this.themeWrapper.style.setProperty('--vitamui-secondary', '#A2F');
}) })
.then(() => this.refreshUser().toPromise()) .then(() => this.refreshUser().toPromise())
.then(() => this.applicationService.list().toPromise()); .then(() => this.applicationService.list().toPromise());
......
@import '../../../../sass/variables/colors'; @import '../../../../sass/variables/colors';
.banner-subrogation { .banner-subrogation {
background: $greeny-blue; background: var(--vitamui-secondary);
border-radius: 0; border-radius: 0;
max-width: none; max-width: none;
width: 100%; width: 100%;
......
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