Skip to content

Commit

Permalink
Fix Grid Table Border and OIDC Alert Line Wrapping
Browse files Browse the repository at this point in the history
The grid table had the `show-expand` property but since we're handling expansion ourselves, we don't need the extra table cell. Removed.

V-Alerts attempt to store their text on one line and hide any overflow. Added a class to ensure the text wraps instead for a v-alert on the user's page with a large amount of text.
  • Loading branch information
coreyogburn committed Jan 22, 2025
1 parent a914d30 commit 470aeab
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions html/css/app.css
Original file line number Diff line number Diff line change
Expand Up @@ -903,6 +903,10 @@ ul ul ul {
vertical-align: middle;
}

.multi-line {
white-space: pre-line;
}

.text-primary .v-switch__thumb {
background-color: rgb(var(--v-theme-primary)) !important;
}
Expand Down
4 changes: 2 additions & 2 deletions html/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2532,7 +2532,7 @@ <h4 v-if="!$root.loading">{{ i18n.usersEnabled }} {{ countUsersEnabled() }} / {{
<v-card>
<v-card-title>{{ i18n.access }}</v-card-title>
<v-card-text>
<v-alert v-if="item.oidcStatus == 'enabled'" class="mt-2" type="warning" icon="fa-shield-halved" variant="text" density="compact" data-aid="users_details_reset_password_help">
<v-alert v-if="item.oidcStatus == 'enabled'" class="mt-2 multi-line" type="warning" icon="fa-shield-halved" variant="text" density="compact" data-aid="users_details_reset_password_help">
{{ i18n.oidcResetPasswordHelp }}
</v-alert>

Expand Down Expand Up @@ -4677,7 +4677,7 @@ <h4 v-if="metricsEnabled" data-aid="grid_summary">{{ i18n.gridEps }} {{ formatCo
<v-row>
<v-col>
<v-data-table :search="gridFilter" :sort-by="sortBy" @update:sort-by="val => sortBy = val"
data-aid="grid_list" :footer-props="footerProps" show-expand :expanded="expanded" @update:expanded="val => expanded = val"
data-aid="grid_list" :footer-props="footerProps" :expanded="expanded" @update:expanded="val => expanded = val"
:items-per-page.sync="itemsPerPage" must-sort :headers="headers" :items="nodes">
<template #top>
<v-container fluid>
Expand Down

0 comments on commit 470aeab

Please sign in to comment.