diff --git a/cas/cas-server/src/main/config/cas-server-application-dev.yml b/cas/cas-server/src/main/config/cas-server-application-dev.yml
index d8b922635bdd1827366169d6edbac2f1b3dc0e7a..8413ec39ce337b837be8226513757f1f450e73ba 100644
--- a/cas/cas-server/src/main/config/cas-server-application-dev.yml
+++ b/cas/cas-server/src/main/config/cas-server-application-dev.yml
@@ -143,8 +143,8 @@ server-identity :
theme:
# vitam-logo: /absolute/path/to/logo.png
# vitamui-logo-large: /absolute/path/to/logo.png
-# primary: '#123456'
-# secondary: '#654321'
+ primary: '#ff4a54'
+ secondary: '#241f63'
logging:
config: src/main/config/logback-dev.xml
diff --git a/cas/cas-server/src/main/config/cas-server-application-recette.yml b/cas/cas-server/src/main/config/cas-server-application-recette.yml
index 7d1b0ae8a645c178aa2dcf52484d024d228df66e..bb139a7369b659f1be39d63a161c47a202319bb2 100644
--- a/cas/cas-server/src/main/config/cas-server-application-recette.yml
+++ b/cas/cas-server/src/main/config/cas-server-application-recette.yml
@@ -139,10 +139,9 @@ server-identity :
identityRole: SSO
identityServerId: 1
-#theme:
-# primary: '#123456'
-# secondary: '#654321'
-# ...
+theme:
+ primary: '#ff4a54'
+ secondary: '#241f63'
logging:
config: src/main/config/logback-dev.xml
diff --git a/cas/cas-server/src/main/config/sass/_login.scss b/cas/cas-server/src/main/config/sass/_login.scss
index 56416819adcc0aafb32453ae3d13e001421fad54..a73d26aa6f0ddaf094f76a50f29177960a44ce6e 100644
--- a/cas/cas-server/src/main/config/sass/_login.scss
+++ b/cas/cas-server/src/main/config/sass/_login.scss
@@ -89,7 +89,7 @@
&:focus:not([disabled]),
&:hover:not([disabled]) {
cursor: pointer;
- background-color: var(--vitamui-primary-light);
+ opacity: 85%;
outline: none;
}
@@ -124,8 +124,8 @@
i {
display: block;
font-size: 18px;
- color: var(--vitamui-secondary);
- background-color: var(--vitamui-secondary-light-20);
+ color: white;
+ background-color: var(--vitamui-secondary);
width: 30px;
height: 30px;
border-radius: 15px;
@@ -172,7 +172,7 @@
text-align: center;
i.check-icon {
- color: var(--vitamui-secondary-light);
+ color: var(--vitamui-secondary);
font-size: 110px;
}
}
diff --git a/cas/cas-server/src/main/config/sass/_mfa-sms.scss b/cas/cas-server/src/main/config/sass/_mfa-sms.scss
index e4f9ebca3dee2fbe971d27c6c45c1a3135b226d3..74a38b8beaa0f8ab9648e473d77e2763484e89ba 100644
--- a/cas/cas-server/src/main/config/sass/_mfa-sms.scss
+++ b/cas/cas-server/src/main/config/sass/_mfa-sms.scss
@@ -92,7 +92,7 @@
&:focus:not([disabled]),
&:hover:not([disabled]) {
cursor: pointer;
- background-color: var(--vitamui-primary-light);
+ opacity: 85%;
outline: none;
}
@@ -156,7 +156,7 @@
&:focus:not([disabled]),
&:hover:not([disabled]) {
cursor: pointer;
- background-color: var(--vitamui-primary-light);
+ opacity: 85%;
outline: none;
}
diff --git a/cas/cas-server/src/main/config/sass/_password-recovery.scss b/cas/cas-server/src/main/config/sass/_password-recovery.scss
index 3293697bbae7e3705c4d31e02ab2c4a75e9399d4..f9d5c1c39f15148defce27dfc0cf22a01eb19299 100644
--- a/cas/cas-server/src/main/config/sass/_password-recovery.scss
+++ b/cas/cas-server/src/main/config/sass/_password-recovery.scss
@@ -36,7 +36,7 @@
}
i.check-icon {
- color: var(--vitamui-secondary-light);
+ color: var(--vitamui-secondary);
font-size: 110px;
}
diff --git a/cas/cas-server/src/main/config/sass/_step-password.scss b/cas/cas-server/src/main/config/sass/_step-password.scss
index d357412c209f586a94c92f56af2ab91c97596ea9..1ac5fbca090f30e75c7282d2da3853b4ee47ef53 100644
--- a/cas/cas-server/src/main/config/sass/_step-password.scss
+++ b/cas/cas-server/src/main/config/sass/_step-password.scss
@@ -33,7 +33,7 @@
i.check-icon {
float: right;
- color: var(--vitamui-secondary-light);
+ color: var(--vitamui-secondary);
font-size: 110px;
margin-left: 60px;
}
diff --git a/cas/cas-server/src/main/resources/application.properties b/cas/cas-server/src/main/resources/application.properties
index a30c1d61ca39b384301444457a9fc29338743867..0a0b2e209be66609e714878ba80501cb075e6c9b 100644
--- a/cas/cas-server/src/main/resources/application.properties
+++ b/cas/cas-server/src/main/resources/application.properties
@@ -122,15 +122,10 @@ cas.authn.accept.users=casuser::Mellon
# theme.vitamui-logo-large=/path/to/vitam-logo/vitamui-logo-large.png
theme.primary=#702382
-theme.primary-light=#992fb1
-theme.primary-light-20=#ba52d1
theme.secondary=#7FA1D4
-theme.secondary-light=#c9d8ed
-theme.secondary-light-8=#bacde8
-theme.secondary-dark-5=#5784c7
# Inline-CSS added in every html template, on body tag
-theme.body.style=--vitamui-primary:${theme.primary};--vitamui-primary-light:${theme.primary-light};--vitamui-primary-light-20:${theme.primary-light-20};--vitamui-secondary:${theme.secondary};--vitamui-secondary-light:${theme.secondary-light};--vitamui-secondary-light-8:${theme.secondary-light-8};--vitamui-secondary-dark-5:${theme.secondary-dark-5};
+theme.body.style=--vitamui-primary:${theme.primary};--vitamui-secondary:${theme.secondary};
diff --git a/cas/cas-server/src/main/resources/static/css/cas.css b/cas/cas-server/src/main/resources/static/css/cas.css
index f76904f271ad72d39ccca317253de4d980506091..2cda8b07c589fc2eaa20e07fa874173fb52aa549 100644
--- a/cas/cas-server/src/main/resources/static/css/cas.css
+++ b/cas/cas-server/src/main/resources/static/css/cas.css
@@ -131,7 +131,7 @@
border: 1px solid var(--vitamui-primary); }
.login-box button.vitamui-primary:focus:not([disabled]), .login-box button.vitamui-primary:hover:not([disabled]) {
cursor: pointer;
- background-color: var(--vitamui-primary-light);
+ opacity: 85%;
outline: none; }
.login-box button.vitamui-primary[disabled] {
opacity: 0.4; }
@@ -158,8 +158,8 @@
.login-box button.back i {
display: block;
font-size: 18px;
- color: var(--vitamui-secondary);
- background-color: var(--vitamui-secondary-light-20);
+ color: white;
+ background-color: var(--vitamui-secondary);
width: 30px;
height: 30px;
border-radius: 15px;
@@ -195,7 +195,7 @@
padding: 0 15%;
text-align: center; }
.login .success .content i.check-icon {
- color: var(--vitamui-secondary-light);
+ color: var(--vitamui-secondary);
font-size: 110px; }
.login .success h1 {
line-height: 36px; }
@@ -231,7 +231,7 @@
.password-recovery .instructions {
width: 80%; }
.password-recovery i.check-icon {
- color: var(--vitamui-secondary-light);
+ color: var(--vitamui-secondary);
font-size: 110px; }
.password-recovery .cancel-link {
font-family: Roboto;
@@ -300,7 +300,7 @@
.step-password i.check-icon {
float: right;
- color: var(--vitamui-secondary-light);
+ color: var(--vitamui-secondary);
font-size: 110px;
margin-left: 60px; }
@@ -381,7 +381,7 @@
text-decoration: none; }
.mfa-login .buttonbckgrnd .submittoken:focus:not([disabled]), .mfa-login .buttonbckgrnd .submittoken:hover:not([disabled]) {
cursor: pointer;
- background-color: var(--vitamui-primary-light);
+ opacity: 85%;
outline: none; }
.mfa-login .buttonbckgrnd .submittoken[disabled] {
opacity: 0.4; }
@@ -430,7 +430,7 @@
text-decoration: none; }
.mfa-expired #resendCodeForm .button:focus:not([disabled]), .mfa-expired #resendCodeForm .button:hover:not([disabled]) {
cursor: pointer;
- background-color: var(--vitamui-primary-light);
+ opacity: 85%;
outline: none; }
.mfa-expired #resendCodeForm .button[disabled] {
opacity: 0.4; }
diff --git a/ui/ui-frontend-common/src/assets/vitamui-logo.png b/ui/ui-frontend-common/src/assets/logo.png
similarity index 100%
rename from ui/ui-frontend-common/src/assets/vitamui-logo.png
rename to ui/ui-frontend-common/src/assets/logo.png
diff --git a/ui/ui-frontend-common/src/assets/test_logo.png b/ui/ui-frontend-common/src/assets/test_logo.png
deleted file mode 100644
index d09df3639f59db3f38cf512c952ac74886be8812..0000000000000000000000000000000000000000
Binary files a/ui/ui-frontend-common/src/assets/test_logo.png and /dev/null differ
diff --git a/ui/ui-identity/src/main/config/ui-identity-application-dev.yml b/ui/ui-identity/src/main/config/ui-identity-application-dev.yml
index a902989a4496742e160b28adb5e4e08e4aee718b..09239ad12d43daf0989c4ed72d115c0b09de93a7 100644
--- a/ui/ui-identity/src/main/config/ui-identity-application-dev.yml
+++ b/ui/ui-identity/src/main/config/ui-identity-application-dev.yml
@@ -12,8 +12,8 @@ spring:
ui-identity:
#theme-logo: /path/to/logo.png
theme-colors:
- vitamui-primary: "#fe4f02"
- vitamui-secondary: "#5cbaa9"
+ vitamui-primary: "#ff4a54"
+ vitamui-secondary: "#241f63"
assets: src/main/config
iam-external-client:
server-host: localhost
diff --git a/ui/ui-identity/src/main/config/ui-identity-application-recette.yml b/ui/ui-identity/src/main/config/ui-identity-application-recette.yml
index 13013b2edb4537e8f53c7e38c6b864abd99d6204..c54dc4c1b9ea6506e7036af39dcd5890d3ce68da 100644
--- a/ui/ui-identity/src/main/config/ui-identity-application-recette.yml
+++ b/ui/ui-identity/src/main/config/ui-identity-application-recette.yml
@@ -12,8 +12,8 @@ spring:
ui-identity:
#theme-logo: /path/to/logo.png
theme-colors:
- vitamui-primary: "#fe4f02"
- vitamui-secondary: "#5cbaa9"
+ vitamui-primary: "#ff4a54"
+ vitamui-secondary: "#241f63"
assets: src/main/config
iam-external-client:
server-host: localhost
diff --git a/ui/ui-portal/src/main/config/ui-portal-application-dev.yml b/ui/ui-portal/src/main/config/ui-portal-application-dev.yml
index c67037bdf37667085f9c906dd4df257b1d464809..a22a065b0e08edcbb8b757fae12710ad9803c5dd 100644
--- a/ui/ui-portal/src/main/config/ui-portal-application-dev.yml
+++ b/ui/ui-portal/src/main/config/ui-portal-application-dev.yml
@@ -27,8 +27,8 @@ management:
ui-portal:
#theme-logo: /path/to/logo.png
theme-colors:
- vitamui-primary: "#fe4f02"
- vitamui-secondary: "#5cbaa9"
+ vitamui-primary: "#ff4a54"
+ vitamui-secondary: "#241f63"
assets: src/main/config
iam-external-client:
server-host: localhost
diff --git a/ui/ui-portal/src/main/config/ui-portal-application-recette.yml b/ui/ui-portal/src/main/config/ui-portal-application-recette.yml
index 3e01851dc472df0131b450d4222e07712c0adb04..eb765893017b03478d640772006e66c1d0ff1c78 100644
--- a/ui/ui-portal/src/main/config/ui-portal-application-recette.yml
+++ b/ui/ui-portal/src/main/config/ui-portal-application-recette.yml
@@ -27,8 +27,8 @@ management:
ui-portal:
#theme-logo: /path/to/logo.png
theme-colors:
- vitamui-primary: "#fe4f02"
- vitamui-secondary: "#5cbaa9"
+ vitamui-primary: "#ff4a54"
+ vitamui-secondary: "#241f63"
assets: src/main/config
iam-external-client:
server-host: localhost