From b73f5faae7080c728108bfb9cbf4cd09d8dc4ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ma=C3=ABl=20AUDEON?= <mael.audeon@teamdlab.com>
Date: Tue, 28 Apr 2020 15:14:18 +0200
Subject: [PATCH] [DLAB-4011] Set dlab colors on cas, identity & portal
---
.../main/config/cas-server-application-dev.yml | 4 ++--
.../config/cas-server-application-recette.yml | 7 +++----
cas/cas-server/src/main/config/sass/_login.scss | 8 ++++----
.../src/main/config/sass/_mfa-sms.scss | 4 ++--
.../main/config/sass/_password-recovery.scss | 2 +-
.../src/main/config/sass/_step-password.scss | 2 +-
.../src/main/resources/application.properties | 7 +------
.../src/main/resources/static/css/cas.css | 16 ++++++++--------
.../src/assets/{vitamui-logo.png => logo.png} | Bin
ui/ui-frontend-common/src/assets/test_logo.png | Bin 2617 -> 0 bytes
.../main/config/ui-identity-application-dev.yml | 4 ++--
.../config/ui-identity-application-recette.yml | 4 ++--
.../main/config/ui-portal-application-dev.yml | 4 ++--
.../config/ui-portal-application-recette.yml | 4 ++--
14 files changed, 30 insertions(+), 36 deletions(-)
rename ui/ui-frontend-common/src/assets/{vitamui-logo.png => logo.png} (100%)
delete mode 100644 ui/ui-frontend-common/src/assets/test_logo.png
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 d8b92263..8413ec39 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 7d1b0ae8..bb139a73 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 56416819..a73d26aa 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 e4f9ebca..74a38b8b 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 3293697b..f9d5c1c3 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 d357412c..1ac5fbca 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 a30c1d61..0a0b2e20 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 f76904f2..2cda8b07 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
GIT binary patch
literal 0
HcmV?d00001
literal 2617
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
b#QFF?2#k6~<wkIx00000NkvXXu0mjf@wNJE
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 a902989a..09239ad1 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 13013b2e..c54dc4c1 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 c67037bd..a22a065b 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 3e01851d..eb765893 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
--
GitLab