TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-02-28 20:57:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: login flow handling (#491)

Browse Source 
* fix: login flow handling

* fix: cancel button

* fix: hover in light design

* fix: profile image width

* fix: profile image width

* fix: profile image width
This commit is contained in:
Fabi 2020-07-22 11:43:32 +02:00 committed by GitHub
parent 520cc161d7
commit f39d3a3cc7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 195 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/ui/login/handler/mfa_prompt_handler.go
View File

@ -37,6 +37,17 @@ func (l *Login) handleMfaPrompt(w http.ResponseWriter, r *http.Request) {
l.handleLogin(w, r)
}
func (l *Login) handleMfaPromptSelection(w http.ResponseWriter, r *http.Request) {
data := new(mfaPromptData)
authReq, err := l.getAuthRequestAndParseData(r, data)
if err != nil {
l.renderError(w, r, authReq, err)
return
}
l.renderNextStep(w, r, authReq)
}
func (l *Login) renderMfaPrompt(w http.ResponseWriter, r *http.Request, authReq *model.AuthRequest, mfaPromptData *model.MfaPromptStep, err error) {
var errType, errMessage string
if err != nil {

3
internal/ui/login/handler/renderer.go
View File

@ -87,6 +87,9 @@ func CreateRenderer(pathPrefix string, staticDir http.FileSystem, cookieName str
"mfaPromptUrl": func() string {
return path.Join(r.pathPrefix, EndpointMfaPrompt)
},
"mfaPromptChangeUrl": func(id string, provider model.MfaType) string {
return path.Join(r.pathPrefix, fmt.Sprintf("%s?%s=%s;%s=%v", EndpointMfaPrompt, queryAuthRequestID, id, "provider", provider))
},
"mfaInitVerifyUrl": func() string {
return path.Join(r.pathPrefix, EndpointMfaInitVerify)
},

1
internal/ui/login/handler/router.go
View File

@ -46,6 +46,7 @@ func CreateRouter(login *Login, staticDir http.FileSystem, interceptors ...mux.M
router.HandleFunc(EndpointInitUser, login.handleInitUser).Methods(http.MethodGet)
router.HandleFunc(EndpointInitUser, login.handleInitUserCheck).Methods(http.MethodPost)
router.HandleFunc(EndpointMfaVerify, login.handleMfaVerify).Methods(http.MethodPost)
router.HandleFunc(EndpointMfaPrompt, login.handleMfaPromptSelection).Methods(http.MethodGet)
router.HandleFunc(EndpointMfaPrompt, login.handleMfaPrompt).Methods(http.MethodPost)
router.HandleFunc(EndpointMfaInitVerify, login.handleMfaInitVerify).Methods(http.MethodPost)
router.HandleFunc(EndpointMailVerification, login.handleMailVerification).Methods(http.MethodGet)

1
internal/ui/login/static/i18n/de.yaml
View File

@ -122,6 +122,7 @@ Actions:
Skip: überspringen
Register: registrieren
ForgotPassword: Password zurücksetzen
Cancel: Abbrechen
Errors:
Internal: Es ist ein interner Fehler aufgetreten

3
internal/ui/login/static/i18n/en.yaml
View File

@ -121,7 +121,8 @@ Actions:
Resend: resend
Skip: skip
Register: register
ForgotPassword: Reset password
ForgotPassword: reset password
Cancel: cancel
Errors:

28
internal/ui/login/static/resources/themes/caos/css/dark.css
View File

@ -175,7 +175,8 @@ input:not([type=radio]), select {
}
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
height: 80px;
width: 80px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
@ -183,7 +184,7 @@ form button.user-selection .profile-image, .login-profile .profile-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
@ -192,16 +193,21 @@ form button.user-selection:hover .profile-image, .login-profile:hover .profile-i
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
.login-profile .profile-image {
margin-left: auto;
margin-right: auto;
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
font-size: 40px;
font-weight: 300;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
@ -263,7 +269,11 @@ form button.clean * {
font-weight: 300;
}
form .user-selection-list {
margin-bottom: 80px;
margin-bottom: 40px;
}
form button.user-selection .profile-image {
height: 80px;
width: 80px;
}
form button.user-selection .sessionstate {
display: inline-block;
@ -299,8 +309,8 @@ form button.user-selection > div.names .loginname {
margin-top: 80px;
}
form button.other-user .other-user-image {
width: 100px;
height: 75px;
width: 80px;
height: 60px;
background-repeat: no-repeat;
background-position: center;
background-image: url("../../../images/icon-newuser-dark.png");
@ -308,7 +318,7 @@ form button.other-user .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image {
background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user:hover .other-user-image {
@ -319,7 +329,7 @@ form button.other-user:hover .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image {
background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user > div:nth-of-type(2) {

2
internal/ui/login/static/resources/themes/caos/css/dark.css.map
View File

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCMW;EDLX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCDc;EDEd,OCDQ;EDER;EACA;EACA;;;AAMJ;EACI,OCXQ;EDYR,aClBS;EDmBT;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OCzCW;ED0CX;EACA;;AAEA;EACI,OC7CY;;;ADiDpB;EACI,kBCrDc;EDsDd,OCpDW;EDqDX;EACA;EACA;EACA;EACA,QEtEU;EFuEV;EACA;EACA;;AACA;EACI,kBC7DY;ED8DZ,OCjEU;EDkEV;;AAGJ;EACI,kBCpEO;EDqEP,OCtEI;EDuEJ;;AACA;EACI,kBCvEQ;;AD2EhB;EACI,kBEpEW;EFqEX;;AAEA;EACI,kBExEO;EFyEP;;;AAKZ;EACI,kBE9EmB;EF+EnB,OC1FQ;ED2FR,QEvGU;EFwGV;EACA;EACA;;;AAIA;EACI;EACA;EACA;EExGN;;AACA;EFoGE;IEnGA;IACA;;;AFyGA;EE5GF;;AACA;EF2GE;IE1GA;IACA;;;;AFiHA;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA,OEpHC;;;AF0HT;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OEhJK;EFiJL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OCnLI;EDoLJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBEhLW;;AFmLf;EACI;;AAIR;EACI;;AAMA;EACI;EACA;EACA;EACA;EACA,cErMO;EFsMP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OEjOP;;AFwOL;EACI;;AAEJ;EACI;EACA;EACA;EACA;EE3PV;;AACA;EFsPM;IErPJ;IACA;;;AF6PQ;EACI;EACA;EElQd;;AACA;EF+PU;IE9PR;IACA;;;AFoQI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OE3QN;;AFgRE;EACI,OElRL;;;AFwRX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MChTI;;ADmTR;EACI,MCrTU;;;AD0Td;EACI;EACA;;;AAIR;EAEQ;EAEJ;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"}
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCMW;EDLX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCDc;EDEd,OCDQ;EDER;EACA;EACA;;;AAMJ;EACI,OCXQ;EDYR,aClBS;EDmBT;EACA,WEzBS;;;AF4Bb;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OCzCW;ED0CX;EACA;;AAEA;EACI,OC7CY;;;ADiDpB;EACI,kBCrDc;EDsDd,OCpDW;EDqDX;EACA;EACA;EACA;EACA,QEtEU;EFuEV;EACA;EACA;;AACA;EACI,kBC7DY;ED8DZ,OCjEU;EDkEV;;AAGJ;EACI,kBCpEO;EDqEP,OCtEI;EDuEJ;;AACA;EACI,kBCvEQ;;AD2EhB;EACI,kBEnEW;EFoEX;;AAEA;EACI,kBEvEO;EFwEP;;;AAKZ;EACI,kBE7EmB;EF8EnB,OC1FQ;ED2FR,QEvGU;EFwGV;EACA;EACA;;;AAIA;EACI;EACA;EACA;EACA;EExGN;;AACA;EFmGE;IElGA;IACA;;;AFyGA;EE5GF;;AACA;EF2GE;IE1GA;IACA;;;;AFgHA;EACI;EACA;;AAGJ;EACI;EACA;;AAEA;EACI,WEtIC;EFuID;;AAGJ;EACI;EACA;EACA;EACA,OEzHC;;;AF+HT;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OErJK;EFsJL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OCzLI;ED0LJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBErLW;;AFwLf;EACI;;AAIR;EACI;;AAKA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA,cE9MO;EF+MP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OE1OP;;AFiPL;EACI;;AAEJ;EACI;EACA;EACA;EACA;EEpQV;;AACA;EF+PM;IE9PJ;IACA;;;AFsQQ;EACI;EACA;EE3Qd;;AACA;EFwQU;IEvQR;IACA;;;AF6QI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OEpRN;;AFyRE;EACI,OE3RL;;;AFiSX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MC1TI;;AD6TR;EACI,MC/TU;;;ADoUd;EACI;EACA;;;AAIR;EAEQ;EAEJ;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"}

56
internal/ui/login/static/resources/themes/caos/css/light.css
View File

@ -175,7 +175,8 @@ input:not([type=radio]), select {
}
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
height: 80px;
width: 80px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
@ -183,7 +184,7 @@ form button.user-selection .profile-image, .login-profile .profile-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
@ -192,16 +193,21 @@ form button.user-selection:hover .profile-image, .login-profile:hover .profile-i
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
.login-profile .profile-image {
margin-left: auto;
margin-right: auto;
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
font-size: 40px;
font-weight: 300;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
@ -263,7 +269,11 @@ form button.clean * {
font-weight: 300;
}
form .user-selection-list {
margin-bottom: 80px;
margin-bottom: 40px;
}
form button.user-selection .profile-image {
height: 80px;
width: 80px;
}
form button.user-selection .sessionstate {
display: inline-block;
@ -299,8 +309,8 @@ form button.user-selection > div.names .loginname {
margin-top: 80px;
}
form button.other-user .other-user-image {
width: 100px;
height: 75px;
width: 80px;
height: 60px;
background-repeat: no-repeat;
background-position: center;
background-image: url("../../../images/icon-newuser-dark.png");
@ -308,7 +318,7 @@ form button.other-user .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image {
background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user:hover .other-user-image {
@ -319,7 +329,7 @@ form button.other-user:hover .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image {
background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user > div:nth-of-type(2) {
@ -435,45 +445,45 @@ html button.clean {
}
html button.clean:hover {
border: none;
background-color: #252525;
background-color: #FFFFFF;
}
html button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-light.png");
background-image: url("../../../images/icon-user-light.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-light@2x.png");
background-size: 100px 100px;
background-image: url("../../../images/icon-user-light@2x.png");
background-size: 80px 80px;
}
}
html button.user-selection:hover {
background-color: #252525;
background-color: #FFFFFF;
}
html button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-light-hover.png");
background-image: url("../../../images/icon-user-light-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-light-hover@2x.png");
background-size: 100px 100px;
background-image: url("../../../images/icon-user-light-hover@2x.png");
background-size: 80px 80px;
}
}
html button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-light.png");
background-image: url("../../../images/icon-newuser-light.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-light@2x.png");
background-size: 100px 75px;
background-image: url("../../../images/icon-newuser-light@2x.png");
background-size: 80px 60px;
}
}
html button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-light-hover.png");
background-image: url("../../../images/icon-newuser-light-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-light-hover@2x.png");
background-size: 100px 75px;
background-image: url("../../../images/icon-newuser-light-hover@2x.png");
background-size: 80px 60px;
}
}
html input:not([type=radio]), html select {

2
internal/ui/login/static/resources/themes/caos/css/light.css.map
View File

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCMW;EDLX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCDc;EDEd,OCDQ;EDER;EACA;EACA;;;AAMJ;EACI,OCXQ;EDYR,aClBS;EDmBT;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OCzCW;ED0CX;EACA;;AAEA;EACI,OC7CY;;;ADiDpB;EACI,kBCrDc;EDsDd,OCpDW;EDqDX;EACA;EACA;EACA;EACA,QEtEU;EFuEV;EACA;EACA;;AACA;EACI,kBC7DY;ED8DZ,OCjEU;EDkEV;;AAGJ;EACI,kBCpEO;EDqEP,OCtEI;EDuEJ;;AACA;EACI,kBCvEQ;;AD2EhB;EACI,kBEpEW;EFqEX;;AAEA;EACI,kBExEO;EFyEP;;;AAKZ;EACI,kBE9EmB;EF+EnB,OC1FQ;ED2FR,QEvGU;EFwGV;EACA;EACA;;;AAIA;EACI;EACA;EACA;EExGN;;AACA;EFoGE;IEnGA;IACA;;;AFyGA;EE5GF;;AACA;EF2GE;IE1GA;IACA;;;;AFiHA;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA,OEpHC;;;AF0HT;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OEhJK;EFiJL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OCnLI;EDoLJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBEhLW;;AFmLf;EACI;;AAIR;EACI;;AAMA;EACI;EACA;EACA;EACA;EACA,cErMO;EFsMP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OEjOP;;AFwOL;EACI;;AAEJ;EACI;EACA;EACA;EACA;EE3PV;;AACA;EFsPM;IErPJ;IACA;;;AF6PQ;EACI;EACA;EElQd;;AACA;EF+PU;IE9PR;IACA;;;AFoQI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OE3QN;;AFgRE;EACI,OElRL;;;AFwRX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MChTI;;ADmTR;EACI,MCrTU;;;AD0Td;EACI;EACA;;;AAIR;EAEQ;EAEJ;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA;;;AGjXJ;EACI,kBFeQ;EEdR,OFac;;AERd;EACI;;AAGJ;EACI,OFGU;;AEAd;EACI;EACA;EACA;;AAEA;EACI,kBFIa;EEHb;;AAGJ;EACI,kBFTG;EEUH,OFXA;EEYA;EACA;;AACA;EACI,kBFbI;;AEiBZ;EACI,OFrBM;;AEuBN;EACI;EACA,kBDbO;;ACkBX;EDhCV;;AACA;EC+BU;ID9BR;IACA;;;ACiCQ;EACI,kBDvBO;;ACyBP;EDvCd;;AACA;ECsCc;IDrCZ;IACA;;;AC2CQ;ED9CV;;AACA;EC6CU;ID5CR;IACA;;;ACgDY;EDnDd;;AACA;ECkDc;IDjDZ;IACA;;;ACuDA;EACI,kBDhCoB;ECiCpB,OF1DU;;AE8DV;EACI,MF/DM;;AEkEV;EACI,MFlEA;;AEsER;EAEQ","file":"light.css"}
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/caos/variables.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"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","file":"light.css"}

10
internal/ui/login/static/resources/themes/scss/light.scss
View File

@ -45,26 +45,26 @@ html {
&.user-selection {
.profile-image {
@include retina-background-image($profileImgLight, "png", false, 100px, 100px);
@include retina-background-image($profileImgLight, "png", false, 80px, 80px);
}
&:hover {
background-color: $buttonBackgroundColorHover;
background-color: $buttonBackgroundColorHoverLight;
.profile-image {
@include retina-background-image($profileImgLight, "png", true, 100px, 100px);
@include retina-background-image($profileImgLight, "png", true, 80px, 80px);
}
}
}
&.other-user {
.other-user-image {
@include retina-background-image($otherUserImgLight, "png", false, 100px, 75px);
@include retina-background-image($otherUserImgLight, "png", false, 80px, 60px);
}
&:hover {
.other-user-image {
@include retina-background-image($otherUserImgLight, "png", true, 100px, 75px);
@include retina-background-image($otherUserImgLight, "png", true, 80px, 60px);
}
}
}

31
internal/ui/login/static/resources/themes/scss/main.scss
View File

@ -29,7 +29,7 @@ h1 {
color: $fontColor;
font-family: $headerFont;
font-weight: 300;
font-size: 40px;
font-size: $headerSize;
}
p {
@ -114,27 +114,32 @@ input:not([type='radio']), select {
%profile-image {
.profile-image {
height: 100px;
width: 100px;
height: 80px;
width: 80px;
background-position: center;
background-repeat: no-repeat;
@include retina-background-image($profileImgDark, "png", false, 100px, 100px);
@include retina-background-image($profileImgDark, "png", false, 80px, 80px);
}
&:hover .profile-image {
@include retina-background-image($profileImgDark, "png", true, 100px, 100px);
@include retina-background-image($profileImgDark, "png", true, 80px, 80px);
}
}
.login-profile {
@extend %profile-image;
.profile-image {
margin-left: auto;
margin-right: auto;
}
.names {
padding: 10px 0;
text-align: center;
div:first-of-type {
font-size: 1.3rem;
font-size: $headerSize;
font-weight: 300;
}
div:nth-of-type(2) {
@ -212,11 +217,15 @@ form {
}
.user-selection-list {
margin-bottom: 80px;
margin-bottom: 40px;
}
button.user-selection {
@extend %profile-image;
.profile-image {
height: 80px;
width: 80px;
}
.sessionstate {
display: inline-block;
@ -261,18 +270,18 @@ form {
margin-top: 80px;
}
.other-user-image {
width: 100px;
height: 75px;
width: 80px;
height: 60px;
background-repeat: no-repeat;
background-position: center;
@include retina-background-image($otherUserImgDark, "png", false, 100px, 75px);
@include retina-background-image($otherUserImgDark, "png", false, 80px, 60px);
}
&:hover {
.other-user-image {
background-repeat: no-repeat;
background-position: center;
@include retina-background-image($otherUserImgDark, "png", true, 100px, 75px);
@include retina-background-image($otherUserImgDark, "png", true, 80px, 60px);
}
}

3
internal/ui/login/static/resources/themes/scss/variables.scss
View File

@ -4,6 +4,7 @@ $headerFont: Lato;
// ----- LAYOUT ------------
$inputHeight: 50px;
$headerSize: 40px;
$retina: "only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx)";
@mixin retina-background-image($file, $type, $hover, $width, $height) {
@ -40,6 +41,6 @@ $fontColorLight: $backgroundColor;
$primaryColorLight: $primaryColor;
$primaryColorHoverLight: lighten($primaryColorLight, 10%);
$inputBackgroundColorLight: #FFFFFF;
$buttonBackgroundColorHoverLight: $inputBackgroundColor;
$buttonBackgroundColorHoverLight: $inputBackgroundColorLight;
$profileImgLight: "../../../images/icon-user-light";
$otherUserImgLight: "../../../images/icon-newuser-light";

28
internal/ui/login/static/resources/themes/zitadel/css/dark.css
View File

@ -176,7 +176,8 @@ input:not([type=radio]), select {
}
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
height: 80px;
width: 80px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
@ -184,7 +185,7 @@ form button.user-selection .profile-image, .login-profile .profile-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
@ -193,16 +194,21 @@ form button.user-selection:hover .profile-image, .login-profile:hover .profile-i
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
.login-profile .profile-image {
margin-left: auto;
margin-right: auto;
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
font-size: 40px;
font-weight: 300;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
@ -264,7 +270,11 @@ form button.clean * {
font-weight: 300;
}
form .user-selection-list {
margin-bottom: 80px;
margin-bottom: 40px;
}
form button.user-selection .profile-image {
height: 80px;
width: 80px;
}
form button.user-selection .sessionstate {
display: inline-block;
@ -300,8 +310,8 @@ form button.user-selection > div.names .loginname {
margin-top: 80px;
}
form button.other-user .other-user-image {
width: 100px;
height: 75px;
width: 80px;
height: 60px;
background-repeat: no-repeat;
background-position: center;
background-image: url("../../../images/icon-newuser-dark.png");
@ -309,7 +319,7 @@ form button.other-user .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image {
background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user:hover .other-user-image {
@ -320,7 +330,7 @@ form button.other-user:hover .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image {
background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user > div:nth-of-type(2) {

2
internal/ui/login/static/resources/themes/zitadel/css/dark.css.map
View File

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCHW;EDIX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCKc;EDJd,OCKQ;EDJR;EACA;EACA;EAEI;;;AAIR;EACI,OCLQ;EDMR,aC3BS;ED4BT;EACA;;;AAGJ;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OCnCW;EDoCX;EACA;;AAEA;EACI,OCvCY;;;AD2CpB;EACI,kBC/Cc;EDgDd,OC9CW;ED+CX;EACA;EACA;EACA;EACA,QCtEU;EDuEV;EACA;EACA;;AACA;EACI,kBCvDY;EDwDZ,OC3DU;ED4DV;;AAGJ;EACI,kBC9DO;ED+DP,OChEI;EDiEJ;;AACA;EACI,kBCjEQ;;ADqEhB;EACI,kBCpEW;EDqEX;;AAEA;EACI,kBCxEO;EDyEP;;;AAKZ;EACI,kBC9EmB;ED+EnB,OCpFQ;EDqFR,QCvGU;EDwGV;EACA;EACA;;;AAIA;EACI;EACA;EACA;ECxGN;;AACA;EDoGE;ICnGA;IACA;;;ADyGA;EC5GF;;AACA;ED2GE;IC1GA;IACA;;;;ADiHA;EACI;EACA;;AAEA;EACI;;AAGJ;EACI;EACA;EACA;EACA,OCpHC;;;AD0HT;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OChJK;EDiJL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OC7KI;ED8KJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBChLW;;ADmLf;EACI;;AAIR;EACI;;AAMA;EACI;EACA;EACA;EACA;EACA,cCrMO;EDsMP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OCjOP;;ADwOL;EACI;;AAEJ;EACI;EACA;EACA;EACA;EC3PV;;AACA;EDsPM;ICrPJ;IACA;;;AD6PQ;EACI;EACA;EClQd;;AACA;ED+PU;IC9PR;IACA;;;ADoQI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OC3QN;;ADgRE;EACI,OClRL;;;ADwRX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MC1SI;;AD6SR;EACI,MC/SU;;;ADoTd;EACI;EACA;;;AAIR;EAII;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"}
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss"],"names":[],"mappings":"AACA;EACI;EACA;;AAIJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;;AAIJ;EACI;EACA;EACA;EACA;AAA6D;EAC7D;;AC5EJ;EACI;EACA,aCHW;EDIX;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA,kBCMc;EDLd,OCMQ;EDLR;EACA;EACA;EAEI;;;AAIR;EACI,OCJQ;EDKR,aC3BS;ED4BT;EACA,WCzBS;;;AD4Bb;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;;;AAIR;EACI;EACA;EACA;EACA;;;AAGJ;EACI,OClCW;EDmCX;EACA;;AAEA;EACI,OCtCY;;;AD0CpB;EACI,kBC9Cc;ED+Cd,OC7CW;ED8CX;EACA;EACA;EACA;EACA,QCtEU;EDuEV;EACA;EACA;;AACA;EACI,kBCtDY;EDuDZ,OC1DU;ED2DV;;AAGJ;EACI,kBC7DO;ED8DP,OC/DI;EDgEJ;;AACA;EACI,kBChEQ;;ADoEhB;EACI,kBCnEW;EDoEX;;AAEA;EACI,kBCvEO;EDwEP;;;AAKZ;EACI,kBC7EmB;ED8EnB,OCnFQ;EDoFR,QCvGU;EDwGV;EACA;EACA;;;AAIA;EACI;EACA;EACA;EACA;ECxGN;;AACA;EDmGE;IClGA;IACA;;;ADyGA;EC5GF;;AACA;ED2GE;IC1GA;IACA;;;;ADgHA;EACI;EACA;;AAGJ;EACI;EACA;;AAEA;EACI,WCtIC;EDuID;;AAGJ;EACI;EACA;EACA;EACA,OCzHC;;;AD+HT;EACI;EACA;;AAGJ;EACI;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;EACI,OCrJK;EDsJL;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EACI;;AAGJ;EACI;;AAIR;EACI;EACA;EACA,OClLI;EDmLJ;EACA;EACA;EACA;;AAEA;EACI;EACA,kBCrLW;;ADwLf;EACI;;AAIR;EACI;;AAKA;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA,cC9MO;ED+MP;EACA;EACA;EACA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAKR;EACI;;AAEA;EACI;;AAEA;EACI;;AAEJ;EACI,OC1OP;;ADiPL;EACI;;AAEJ;EACI;EACA;EACA;EACA;ECpQV;;AACA;ED+PM;IC9PJ;IACA;;;ADsQQ;EACI;EACA;EC3Qd;;AACA;EDwQU;ICvQR;IACA;;;AD6QI;EACI;EACA;;AAIR;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA,OCpRN;;ADyRE;EACI,OC3RL;;;ADiSX;EACI;EACA;;;AAGJ;EACI;;AAEA;EACI,MCnTI;;ADsTR;EACI,MCxTU;;;AD6Td;EACI;EACA;;;AAIR;EAII;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;EACA;EACA;EACA;AAAkB;EAClB;EACA;EACA;EACA;EACA;EACA;EACA;AAEA;EACA;AACA;EACA;AAEA;EACA;AAEA;EACA","file":"dark.css"}

56
internal/ui/login/static/resources/themes/zitadel/css/light.css
View File

@ -176,7 +176,8 @@ input:not([type=radio]), select {
}
form button.user-selection .profile-image, .login-profile .profile-image {
height: 100px;
height: 80px;
width: 80px;
background-position: center;
background-repeat: no-repeat;
background-image: url("../../../images/icon-user-dark.png");
@ -184,7 +185,7 @@ form button.user-selection .profile-image, .login-profile .profile-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection .profile-image, .login-profile .profile-image {
background-image: url("../../../images/icon-user-dark@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
@ -193,16 +194,21 @@ form button.user-selection:hover .profile-image, .login-profile:hover .profile-i
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.user-selection:hover .profile-image, .login-profile:hover .profile-image {
background-image: url("../../../images/icon-user-dark-hover@2x.png");
background-size: 100px 100px;
background-size: 80px 80px;
}
}
.login-profile .profile-image {
margin-left: auto;
margin-right: auto;
}
.login-profile .names {
padding: 10px 0;
text-align: center;
}
.login-profile .names div:first-of-type {
font-size: 1.3rem;
font-size: 40px;
font-weight: 300;
}
.login-profile .names div:nth-of-type(2) {
font-weight: 300;
@ -264,7 +270,11 @@ form button.clean * {
font-weight: 300;
}
form .user-selection-list {
margin-bottom: 80px;
margin-bottom: 40px;
}
form button.user-selection .profile-image {
height: 80px;
width: 80px;
}
form button.user-selection .sessionstate {
display: inline-block;
@ -300,8 +310,8 @@ form button.user-selection > div.names .loginname {
margin-top: 80px;
}
form button.other-user .other-user-image {
width: 100px;
height: 75px;
width: 80px;
height: 60px;
background-repeat: no-repeat;
background-position: center;
background-image: url("../../../images/icon-newuser-dark.png");
@ -309,7 +319,7 @@ form button.other-user .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user .other-user-image {
background-image: url("../../../images/icon-newuser-dark@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user:hover .other-user-image {
@ -320,7 +330,7 @@ form button.other-user:hover .other-user-image {
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
form button.other-user:hover .other-user-image {
background-image: url("../../../images/icon-newuser-dark-hover@2x.png");
background-size: 100px 75px;
background-size: 80px 60px;
}
}
form button.other-user > div:nth-of-type(2) {
@ -436,45 +446,45 @@ html button.clean {
}
html button.clean:hover {
border: none;
background-color: #252525;
background-color: #FFFFFF;
}
html button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-light.png");
background-image: url("../../../images/icon-user-light.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.user-selection .profile-image {
background-image: url("/resources/images/icon-user-light@2x.png");
background-size: 100px 100px;
background-image: url("../../../images/icon-user-light@2x.png");
background-size: 80px 80px;
}
}
html button.user-selection:hover {
background-color: #252525;
background-color: #FFFFFF;
}
html button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-light-hover.png");
background-image: url("../../../images/icon-user-light-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.user-selection:hover .profile-image {
background-image: url("/resources/images/icon-user-light-hover@2x.png");
background-size: 100px 100px;
background-image: url("../../../images/icon-user-light-hover@2x.png");
background-size: 80px 80px;
}
}
html button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-light.png");
background-image: url("../../../images/icon-newuser-light.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.other-user .other-user-image {
background-image: url("/resources/images/icon-newuser-light@2x.png");
background-size: 100px 75px;
background-image: url("../../../images/icon-newuser-light@2x.png");
background-size: 80px 60px;
}
}
html button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-light-hover.png");
background-image: url("../../../images/icon-newuser-light-hover.png");
}
@media only screen and (-webkit-min-device-pixel-ratio: 2), only screen and (min--moz-device-pixel-ratio: 2), only screen and (-o-min-device-pixel-ratio: 2/1), only screen and (min-device-pixel-ratio: 2), only screen and (min-resolution: 192dpi), only screen and (min-resolution: 2dppx) {
html button.other-user:hover .other-user-image {
background-image: url("/resources/images/icon-newuser-light-hover@2x.png");
background-size: 100px 75px;
background-image: url("../../../images/icon-newuser-light-hover@2x.png");
background-size: 80px 60px;
}
}
html input:not([type=radio]), html select {

2
internal/ui/login/static/resources/themes/zitadel/css/light.css.map
View File

@ -1 +1 @@
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"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","file":"light.css"}
{"version":3,"sourceRoot":"","sources":["../../scss/fonts.scss","../../scss/main.scss","../../scss/variables.scss","../../scss/light.scss"],"names":[],"mappings":"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","file":"light.css"}

3
internal/ui/login/static/templates/change_password.html
View File

@ -42,6 +42,9 @@
<div class="actions">
<button type="submit" id="change-password-button" name="resend" value="false" class="primary right" disabled>{{t "Actions.Next"}}</buttontype="submit">
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/change_password_done.html
View File

@ -13,6 +13,9 @@
<div class="actions">
<button class="primary right" type="submit">{{t "Actions.Next"}}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/init_password.html
View File

@ -47,6 +47,9 @@
<div class="actions">
<button type="submit" id="init-button" name="resend" value="false" class="primary right" >{{t "Actions.Next"}}</button>
<button type="submit" name="resend" value="true" class="secondary right" formnovalidate>{{t "Actions.Resend" }}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/init_password_done.html
View File

@ -12,6 +12,9 @@
<div class="actions">
<button class="primary right" type="submit">{{t "Actions.Next"}}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/init_user.html
View File

@ -50,6 +50,9 @@
class="primary right"
{{ if not .PasswordSet }} disabled {{ end }}>{{t "Actions.Next"}}</button>
<button type="submit" name="resend" value="true" class="secondary right" formnovalidate>{{t "Actions.Resend" }}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/init_user_done.html
View File

@ -12,6 +12,9 @@
<div class="actions">
<button class="primary right" type="submit">{{t "Actions.Next"}}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/mail_verification.html
View File

@ -25,6 +25,9 @@
{{ if .UserID }}
<button type="submit" name="resend" value="true" class="secondary right" formnovalidate>{{t "Actions.Resend"}}</button>
{{ end }}
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>
<script src="{{ resourceUrl "scripts/form_submit.js" }}"></script>

3
internal/ui/login/static/templates/mail_verified.html
View File

@ -13,6 +13,9 @@
<div class="actions">
<button class="primary right" type="submit">{{if .AuthReqID }}{{t "Actions.Next"}}{{else}}{{t "Actions.Login"}}{{end}}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/mfa_init_done.html
View File

@ -13,6 +13,9 @@
<div class="actions">
<button class="primary right" type="submit">{{t "Actions.Next"}}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

6
internal/ui/login/static/templates/mfa_init_verify.html
View File

@ -35,6 +35,12 @@
<div class="actions">
<button class="primary right" id="submit-button" type="submit" disabled>{{t "Actions.Next"}}</button>
<a href="{{ mfaPromptChangeUrl .AuthReqID .MfaType }}">
<button class="secondary" type="button">{{t "Actions.Back"}}</button>
</a>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/mfa_prompt.html
View File

@ -25,6 +25,9 @@
{{if not .MfaRequired}}
<button class="default right" name="skip" value="true" type="submit" formnovalidate>{{t "Actions.Skip"}}</button>
{{end}}
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/mfa_verify.html
View File

@ -22,6 +22,9 @@
<div class="actions">
<button class="primary right" id="submit-button" type="submit" disabled>{{t "Actions.Next"}}</button>
<a href="{{ loginUrl }}">
<button class="secondary" type="button">{{t "Actions.Cancel"}}</button>
</a>
</div>
</form>

3
internal/ui/login/static/templates/register.html
View File

@ -62,6 +62,9 @@
<div class="actions">
<button class="primary right" id="register-button" type="submit" disabled>{{t "Actions.Next"}}</button>
<a href="{{ loginNameChangeUrl .AuthReqID }}">
<button class="secondary" type="button">{{t "Actions.Back"}}</button>
</a>
</div>
</form>