Skip to content

Commit 6c0036a

Browse files
authored
Merge pull request #29968 from nextcloud/fix-input-for-groups-validation-in-new-user-form
Fix input for groups validation in new user form
2 parents 2594d9e + b7cbba0 commit 6c0036a

6 files changed

Lines changed: 19 additions & 27 deletions

File tree

apps/settings/css/settings.scss

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1555,8 +1555,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
15551555
}
15561556

15571557
/* various */
1558-
&#grid-header,
1559-
&#new-user {
1558+
&#grid-header {
15601559
@include position('sticky');
15611560
align-self: normal;
15621561
background-color: var(--color-main-background);
@@ -1566,29 +1565,10 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
15661565
&.sticky {
15671566
box-shadow: 0 -2px 10px 1px var(--color-box-shadow);
15681567
}
1569-
1570-
/* fake input for groups validation */
1571-
input#newgroups {
1572-
position: absolute;
1573-
opacity: 0;
1574-
width: 80% !important;
1575-
margin: 0 10%;
1576-
z-index: 0;
1577-
}
1578-
}
1579-
1580-
// separate prop to set initial value to top: 50px
1581-
&#new-user {
1582-
height: 120px;
1583-
1584-
.row {
1585-
padding-top: 50px;
1586-
}
15871568
}
15881569

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

15941574
#headerDisplayName,

apps/settings/js/vue-settings-apps-users-management.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-apps-users-management.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-users.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/js/vue-settings-users.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

apps/settings/src/components/UserList.vue

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -623,4 +623,16 @@ export default {
623623
.row::v-deep .multiselect__single {
624624
z-index: auto !important;
625625
}
626+
627+
/* fake input for groups validation */
628+
input#newgroups {
629+
position: absolute;
630+
opacity: 0;
631+
/* The "hidden" input is behind the Multiselect, so in general it does
632+
* not receives clicks. However, with Firefox, after the validation
633+
* fails, it will receive the first click done on it, so its width needs
634+
* to be set to 0 to prevent that ("pointer-events: none" does not
635+
* prevent it). */
636+
width: 0;
637+
}
626638
</style>

0 commit comments

Comments
 (0)