Skip to content

User Table Style Updates #13743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 23, 2025
Merged

User Table Style Updates #13743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8a8d0c0
polish
nucleogenesis Sep 15, 2025
a73c843
spacing updates, fix page-level scrolling
nucleogenesis Sep 17, 2025
da5a1cd
drill appearanceOverrides through FacilityAppBarPage & make the users…
nucleogenesis Sep 19, 2025
e11b76a
remove commented-out code
nucleogenesis Sep 19, 2025
e20852c
users table: maxHeight calculation updated to work w/ other changes
nucleogenesis Sep 23, 2025
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
14 changes: 10 additions & 4 deletions kolibri/plugins/facility/assets/src/views/FacilityAppBarPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<template>

<AppBarPage :title="title">
<AppBarPage
:title="title"
:appearanceOverrides="appearanceOverrides"
>
<template #default="{ pageContentHeight }">
<div style="max-width: 1000px; margin: 0 auto">
<slot :pageContentHeight="pageContentHeight"></slot>
</div>
<slot :pageContentHeight="pageContentHeight"></slot>
</template>
</AppBarPage>

Expand All @@ -30,6 +31,11 @@
type: String,
default: null,
},
appearanceOverrides: {
type: Object,
required: false,
default: null,
},
Comment on lines +34 to +38
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should probably do this in all of our *AppBarPage components and establish it as a convention for page-specific styling for each plugin.

},
computed: {
/* Returns the given appBarTitle prop if given, otherwise will return
Expand Down
30 changes: 20 additions & 10 deletions kolibri/plugins/facility/assets/src/views/users/NewUsersPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
<template #default="{ pageContentHeight }">
<KPageContainer
class="page-container"
:style="{ maxHeight: pageContentHeight + 24 + 'px' }"
:style="{ maxHeight: pageContentHeight + 24 + 'px', padding: '2em 2em 1em' }"
>
<p>
<KRouterLink
:to="$store.getters.facilityPageLinks.UserPage"
icon="back"
:text="backToUsers$()"
/>
</p>
<KRouterLink
:to="$store.getters.facilityPageLinks.UserPage"
icon="back"
:text="backToUsers$()"
/>
<div class="new-users-page-header">
<h1>{{ newUsers$() }}</h1>
<div>
Expand Down Expand Up @@ -331,18 +329,23 @@
<style lang="scss" scoped>

.page-container {
position: relative;
display: flex;
flex-direction: column;
max-width: 1000px;
margin: 24px auto;
margin: 0 auto auto;
}

.new-users-page-header {
display: flex;
gap: 16px;
align-items: center;
justify-content: space-between;
margin-bottom: 16px;
margin: 1em 0 1.5em;

h1 {
margin: 0;
}
}

.empty-new-users {
Expand Down Expand Up @@ -374,4 +377,11 @@
}
}

/deep/ .main-wrapper {
// The default padding causes root scroll which defeats
// the purpose of our maxHeight style on the KPageContainer.
// Uses !important because the overridden style is inline
padding-bottom: 0 !important;
}

</style>
42 changes: 27 additions & 15 deletions kolibri/plugins/facility/assets/src/views/users/UsersRootPage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,28 @@
<template>

<FacilityAppBarPage>
<FacilityAppBarPage
class="wrapper"
:appearanceOverrides="{
maxWidth: '1440px',
margin: '0 auto',
padding: '2em',
}"
>
<template #default="{ pageContentHeight }">
<!-- Adding 24 pixels to the max height to prevent having too much bottom padding space -->
<KPageContainer
class="flex-column"
:style="{ maxHeight: pageContentHeight + 24 + 'px' }"
:style="{ maxHeight: pageContentHeight - 48 + 'px', padding: '2em 2em 1em' }"
>
<p>
<KRouterLink
v-if="userIsMultiFacilityAdmin"
:to="{
name: $store.getters.facilityPageLinks.AllFacilitiesPage.name,
params: { subtopicName: 'UserPage' },
}"
icon="back"
:text="coreString('changeLearningFacility')"
/>
</p>
<KRouterLink
v-if="userIsMultiFacilityAdmin"
:to="{
name: $store.getters.facilityPageLinks.AllFacilitiesPage.name,
params: { subtopicName: 'UserPage' },
}"
icon="back"
:text="coreString('changeLearningFacility')"
/>
<div class="users-page-header">
<h1>{{ coreString('usersLabel') }}</h1>
<div class="users-page-header-actions">
Expand Down Expand Up @@ -335,10 +340,10 @@
gap: 16px;
align-items: center;
justify-content: space-between;
margin-bottom: 16px;
margin-bottom: 1.5em;

h1 {
margin: 16px 0;
margin: 0;
}

.users-page-header-actions {
Expand All @@ -355,4 +360,11 @@
flex-direction: column;
}

/deep/ .main-wrapper {
// The default padding causes root scroll which defeats
// the purpose of our maxHeight style on the KPageContainer.
// Uses !important because the overridden style is inline
padding-bottom: 0 !important;
}

</style>
5 changes: 3 additions & 2 deletions kolibri/plugins/facility/assets/src/views/users/common/UsersTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,6 @@

.move-down {
position: relative;
margin-top: 24px;
}

.role-badge {
Expand All @@ -731,6 +730,8 @@
.search-filter-section {
display: flex;
justify-content: start;
// Ensure space enough for keyboard nav outline before table content
padding-bottom: 0.5em;
}

.user-type-icon {
Expand All @@ -742,7 +743,7 @@
}

.filter-button {
padding-top: 8px;
padding-top: 10px;
margin-left: 1em;
}

Expand Down
3 changes: 2 additions & 1 deletion packages/kolibri-common/components/PaginatedListContainerWithBackend.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,8 @@
<style lang="scss" scoped>

.pagination-nav {
margin-bottom: 8px;
/* Ensure space for pagination buttons on touch devices */
margin-top: 1em;
text-align: right;
}

Expand Down
Loading