TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2024-12-12 02:54:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: idp styling (#3797)

Browse Source 
* fix: idp styling

* escape idp a color

* elevation on hover

* css gen

Co-authored-by: Max Peintner <max@caos.ch>
This commit is contained in:
Livio Spring 2022-06-10 15:17:33 +02:00 committed by GitHub
parent 7b0f0b81a3
commit 6bd5799770
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/api/ui/login/static/resources/themes/scss/styles/a/a_theme.scss
View File

@ -5,7 +5,7 @@
}
@mixin lgn-a-color() {
a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button) {
a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button):not(.lgn-idp) {
color: var(--zitadel-color-font);
&:hover,

6
internal/api/ui/login/static/resources/themes/scss/styles/identity_provider/identity_provider_theme.scss
View File

@ -8,10 +8,12 @@
.lgn-idp {
border-color: var(--zitadel-color-divider);
@include lgn-idp-elevation(1);
&:hover {
@include lgn-idp-elevation(1);
}
&:not([disabled]):active {
@include lgn-idp-elevation(8);
@include lgn-idp-elevation(2);
}
&.google {

8
internal/api/ui/login/static/resources/themes/zitadel/css/zitadel.css
View File

@ -2815,10 +2815,10 @@ footer .lgn-logo-watermark {
background-size: contain;
}
a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button) {
a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button):not(.lgn-idp) {
color: var(--zitadel-color-font);
}
a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button):hover, a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button):active {
a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button):not(.lgn-idp):hover, a:not(.lgn-stroked-button):not(.lgn-button):not(.lgn-raised-button):not(.lgn-idp):active {
color: var(--zitadel-color-primary-500);
}
@ -2911,10 +2911,12 @@ ul li i.lgn-valid {
.lgn-idp {
border-color: var(--zitadel-color-divider);
}
.lgn-idp:hover {
box-shadow: 0px 2px 1px -1px rgba(0, 0, 0, 0.2), 0px 1px 1px 0px rgba(0, 0, 0, 0.14), 0px 1px 3px 0px rgba(0, 0, 0, 0.12);
}
.lgn-idp:not([disabled]):active {
box-shadow: 0px 5px 5px -3px rgba(0, 0, 0, 0.2), 0px 8px 10px 1px rgba(0, 0, 0, 0.14), 0px 3px 14px 2px rgba(0, 0, 0, 0.12);
box-shadow: 0px 3px 1px -2px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 1px 5px 0px rgba(0, 0, 0, 0.12);
}
.lgn-idp.google {
color: var(--zitadel-color-google-text);

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

File diff suppressed because one or more lines are too long

7
internal/auth/repository/eventsourcing/handler/idp_providers.go
View File

@ -132,8 +132,11 @@ func (i *IDPProvider) processIdpProvider(event *models.Event) (err error) {
if event.AggregateID != event.InstanceID {
providerType = iam_model.IDPProviderTypeOrg
}
esConfig.AppendEvent(providerType, event)
providers, err := i.view.IDPProvidersByIDPConfigID(esConfig.IDPConfigID, esConfig.InstanceID)
err = esConfig.AppendEvent(providerType, event)
if err != nil {
return err
}
providers, err := i.view.IDPProvidersByIDPConfigID(esConfig.IDPConfigID, event.InstanceID)
if err != nil {
return err
}