Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/settings/css/settings.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/settings/css/settings.css.map

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

39 changes: 19 additions & 20 deletions apps/settings/css/settings.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1329,32 +1329,31 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
grid-auto-rows: minmax(60px, max-content);

.row {
// TODO replace with css4 subgrid when available
// fallback for ie11 no grid
display: flex;
display: grid;
min-height: $grid-row-height;
grid-row-start: span 1;
grid-gap: 3px;
align-items: center;
/* let's define the column until storage path,
what follows will be manually defined */
grid-template-columns:
44px
minmax($grid-col-min-width + 30px, 1fr) // username, displayname
minmax($grid-col-min-width, 1fr) // password
minmax($grid-col-min-width, 1fr) // email
minmax(1.5*$grid-col-min-width, 1fr) // groups
minmax(1.5*$grid-col-min-width, 1fr) // group admins
minmax($grid-col-min-width, 1fr) // quota
minmax(1.5*$grid-col-min-width, 1fr) // manager
repeat(auto-fit, minmax($grid-col-min-width, 1fr));
border-bottom: var(--color-border) 1px solid;

&.disabled {
opacity: .5;
}

td, th {
flex: 1 1;
min-width: $grid-col-min-width
}
.avatar {
flex: 0 0;
min-width: $grid-col-min-width / 2 ;
}
.name {
//min-width: $grid-col-min-width + 30px;
}
.groups,
.subadmins,
.manager {
//min-width: 1.5*$grid-col-min-width;
}

/* grid col width */
.name,
.password,
Expand Down Expand Up @@ -1396,7 +1395,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
.groups,
.subadmins,
.quota {
min-width: $grid-col-min-width;
//min-width: $grid-col-min-width;

.multiselect {
width: 100%;
Expand All @@ -1418,7 +1417,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
display: flex;
justify-content: flex-end;
right: 0px;
min-width: 88px;
//min-width: 88px;
}

.subtitle {
Expand Down
8 changes: 2 additions & 6 deletions apps/settings/src/components/UserList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,7 @@
<tr id="grid-header"
:class="{'sticky': scrolled && !showConfig.showNewUserForm}"
class="row">
<th id="headerAvatar" class="avatar">
<span class="hidden-visually"> {{ t('settings', 'Avatar') }} </span>
</th>
<th id="headerAvatar" class="avatar"></th>
<th id="headerName" class="name">
<div class="subtitle">
<strong>
Expand Down Expand Up @@ -225,9 +223,7 @@
<th id="headerManager" class="manager">
{{ t('settings', 'Manager') }}
</th>
<th class="userActions hidden-visually">
{{ t('settings', 'User actions') }}
</th>
<th class="userActions" />
</tr>

<user-row v-for="user in filteredUsers"
Expand Down
4 changes: 2 additions & 2 deletions dist/settings-users-8351.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/settings-users-8351.js.map

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.