Skip to content

Commit

Permalink
Merge pull request #30145 from nextcloud/backport/29968/stable22
Browse files Browse the repository at this point in the history
  • Loading branch information
skjnldsv authored Dec 9, 2021
2 parents bda1956 + bf499c0 commit 2f1345b
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 28 deletions.
22 changes: 1 addition & 21 deletions apps/settings/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1549,8 +1549,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 @@ -1560,29 +1559,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.

6 changes: 3 additions & 3 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 @@ -622,4 +622,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 2f1345b

Please sign in to comment.