Skip to content

Commit

Permalink
Merge pull request #29968 from nextcloud/fix-input-for-groups-validat…
Browse files Browse the repository at this point in the history
…ion-in-new-user-form

Fix input for groups validation in new user form
  • Loading branch information
artonge authored Dec 7, 2021
2 parents 2594d9e + b7cbba0 commit 6c0036a
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 27 deletions.
22 changes: 1 addition & 21 deletions apps/settings/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1555,8 +1555,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
}

/* various */
&#grid-header,
&#new-user {
&#grid-header {
@include position('sticky');
align-self: normal;
background-color: var(--color-main-background);
Expand All @@ -1566,29 +1565,10 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
&.sticky {
box-shadow: 0 -2px 10px 1px var(--color-box-shadow);
}

/* fake input for groups validation */
input#newgroups {
position: absolute;
opacity: 0;
width: 80% !important;
margin: 0 10%;
z-index: 0;
}
}

// separate prop to set initial value to top: 50px
&#new-user {
height: 120px;

.row {
padding-top: 50px;
}
}

&#grid-header {
color: var(--color-text-maxcontrast);
z-index: 60; /* above new-user */
border-bottom-width: thin;

#headerDisplayName,
Expand Down
4 changes: 2 additions & 2 deletions apps/settings/js/vue-settings-apps-users-management.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/settings/js/vue-settings-apps-users-management.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions apps/settings/js/vue-settings-users.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/js/vue-settings-users.js.map

Large diffs are not rendered by default.

12 changes: 12 additions & 0 deletions apps/settings/src/components/UserList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -623,4 +623,16 @@ export default {
.row::v-deep .multiselect__single {
z-index: auto !important;
}
/* fake input for groups validation */
input#newgroups {
position: absolute;
opacity: 0;
/* The "hidden" input is behind the Multiselect, so in general it does
* not receives clicks. However, with Firefox, after the validation
* fails, it will receive the first click done on it, so its width needs
* to be set to 0 to prevent that ("pointer-events: none" does not
* prevent it). */
width: 0;
}
</style>

0 comments on commit 6c0036a

Please sign in to comment.