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

[DLAB-4011] Set dlab colors on cas, identity & portal

parent 3ee946ec
No related branches found
No related tags found
1 merge request!1Feature/design/1
Hide whitespace changes
Inline Side-by-side
Showing
with 30 additions and 36 deletions
cas/cas-server/src/main/config/cas-server-application-dev.yml
+ 2
− 2
View file @ b73f5faa
......@@ -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
......
cas/cas-server/src/main/config/cas-server-application-recette.yml
+ 3
− 4
View file @ b73f5faa
......@@ -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
......
cas/cas-server/src/main/config/sass/_login.scss
+ 4
− 4
View file @ b73f5faa
......@@ -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;
}
}
......
cas/cas-server/src/main/config/sass/_mfa-sms.scss
+ 2
− 2
View file @ b73f5faa
......@@ -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;
}
......
cas/cas-server/src/main/config/sass/_password-recovery.scss
+ 1
− 1
View file @ b73f5faa
......@@ -36,7 +36,7 @@
}
i.check-icon {
color: var(--vitamui-secondary-light);
color: var(--vitamui-secondary);
font-size: 110px;
}
......
cas/cas-server/src/main/config/sass/_step-password.scss
+ 1
− 1
View file @ b73f5faa
......@@ -33,7 +33,7 @@
i.check-icon {
float: right;
color: var(--vitamui-secondary-light);
color: var(--vitamui-secondary);
font-size: 110px;
margin-left: 60px;
}
......
cas/cas-server/src/main/resources/application.properties
+ 1
− 6
View file @ b73f5faa
......@@ -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};
......
cas/cas-server/src/main/resources/static/css/cas.css
+ 8
− 8
View file @ b73f5faa
......@@ -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; }
......
ui/ui-frontend-common/src/assets/test_logo.png deleted 100644 → 0
+ 0
− 0
View file @ 3ee946ec
ui/ui-frontend-common/src/assets/test_logo.png

2.56 KiB

ui/ui-identity/src/main/config/ui-identity-application-dev.yml
+ 2
− 2
View file @ b73f5faa
......@@ -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
......
ui/ui-identity/src/main/config/ui-identity-application-recette.yml
+ 2
− 2
View file @ b73f5faa
......@@ -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
......
ui/ui-portal/src/main/config/ui-portal-application-dev.yml
+ 2
− 2
View file @ b73f5faa
......@@ -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
......
ui/ui-portal/src/main/config/ui-portal-application-recette.yml
+ 2
− 2
View file @ b73f5faa
......@@ -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
......
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