Skip to content

Commit 5c7831f

Browse files
committed
Fix height issues
1 parent a11d020 commit 5c7831f

3 files changed

Lines changed: 43 additions & 44 deletions

File tree

client/src/components/layout/base/BaseLayout.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
elevation="1"
3636
:style="{
3737
borderRadius: '14px',
38+
minHeight: 0,
3839
minWidth: 0,
3940
}"
4041
>

client/src/components/layout/pages/BasicSettingsPage.vue

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
2-
<div class="fill-height d-flex flex-column">
3-
<v-row class="flex-grow-0 flex-shrink-0">
4-
<v-col>
2+
<div class="fill-height d-flex flex-column overflow-hidden">
3+
<v-row class="flex-grow-0 flex-shrink-0" no-gutters>
4+
<v-col class="pa-3">
55
<div
66
class="text-white text-h5 font-weight-black ml-10 mt-5"
77
data-testid="settings-title"
@@ -10,18 +10,22 @@
1010
</div>
1111
</v-col>
1212
</v-row>
13-
<v-row>
13+
<v-row
14+
class="flex-1-1-0 overflow-hidden"
15+
no-gutters
16+
:style="{ minHeight: 0 }"
17+
>
1418
<!--- Left Settings -->
15-
<v-col cols="3">
19+
<v-col cols="3" class="h-100 overflow-y-auto pa-3">
1620
<SettingsNavigation />
1721
</v-col>
1822

1923
<!--- Right side white panel -->
20-
<v-col cols="9" class="fill-height overflow-y-auto">
24+
<v-col cols="9" class="h-100 overflow-hidden pa-3">
2125
<v-card
2226
elevation="4"
2327
rounded="lg"
24-
class="fill-height overflow-y-auto mr-16"
28+
class="h-100 overflow-y-auto mr-16"
2529
>
2630
<v-row>
2731
<v-col class="pt-8 pl-12">

client/src/pages/(app)/certificate/index.vue

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -26,45 +26,39 @@
2626
</template>
2727

2828
<template #PanelMain>
29-
<v-col>
30-
<SearchBar
31-
v-model="searchInputValue"
32-
search-text="certificates.filters.searchField"
33-
:filter-sections="[]"
34-
:filter-values="{}"
29+
<SearchBar
30+
v-model="searchInputValue"
31+
search-text="certificates.filters.searchField"
32+
:filter-sections="[]"
33+
:filter-values="{}"
34+
:data-test-id="dataTestId"
35+
dense
36+
@search="onSearch"
37+
@clear="onClearSearch"
38+
@clear-filters="onClearSearch"
39+
/>
40+
41+
<div v-if="deleteError">
42+
{{ deleteError }}
43+
</div>
44+
<LoadingFallbackComponent
45+
:loading="false"
46+
:errors="error ? [error] : []"
47+
>
48+
<EntityTable
49+
:headers="certificatesTableHeaders"
50+
:items="tableData?.content ?? []"
51+
:page-count="pageCount"
52+
:items-per-page="options.itemsPerPage"
53+
:options="options"
54+
:loading="loading || deleteLoading"
55+
:cell-formatters="cellFormatters"
56+
:actions="tableActions"
3557
:data-test-id="dataTestId"
36-
dense
37-
@search="onSearch"
38-
@clear="onClearSearch"
39-
@clear-filters="onClearSearch"
58+
item-key="alias"
59+
@update:options="loadItems"
4060
/>
41-
42-
<v-row>
43-
<v-col>
44-
<div v-if="deleteError">
45-
{{ deleteError }}
46-
</div>
47-
<LoadingFallbackComponent
48-
:loading="false"
49-
:errors="error ? [error] : []"
50-
>
51-
<EntityTable
52-
:headers="certificatesTableHeaders"
53-
:items="tableData?.content ?? []"
54-
:page-count="pageCount"
55-
:items-per-page="options.itemsPerPage"
56-
:options="options"
57-
:loading="loading || deleteLoading"
58-
:cell-formatters="cellFormatters"
59-
:actions="tableActions"
60-
:data-test-id="dataTestId"
61-
item-key="alias"
62-
@update:options="loadItems"
63-
/>
64-
</LoadingFallbackComponent>
65-
</v-col>
66-
</v-row>
67-
</v-col>
61+
</LoadingFallbackComponent>
6862
</template>
6963
</BasicSettingsPage>
7064

0 commit comments

Comments
 (0)