Skip to content

Commit

Permalink
Adjust layout and advanced filter padding
Browse files Browse the repository at this point in the history
  • Loading branch information
@guerler
guerler committed Feb 18, 2024
1 parent 5e13058 commit f7a0726
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 51 deletions.
28 changes: 12 additions & 16 deletions client/src/components/Grid/GridHistory.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,20 @@ withDefaults(defineProps<Props>(), {

<template>
<div class="d-flex flex-column">
<div class="mb-2">
<div class="d-flex">
<Heading h1 separator inline size="xl" class="flex-grow-1 mb-2">Histories</Heading>
<div>
<BButton size="sm" variant="outline-primary" to="/histories/import">
<Icon :icon="faPlus" />
<span v-localize>Import History</span>
</BButton>
</div>
<div class="d-flex">
<Heading h1 separator inline size="xl" class="flex-grow-1 mb-2">Histories</Heading>
<div>
<BButton size="sm" variant="outline-primary" to="/histories/import">
<Icon :icon="faPlus" />
<span v-localize>Import History</span>
</BButton>
</div>
<BNav pills justified class="mb-2">
<BNavItem :active="activeList === 'my'" to="/histories/list"> My Histories </BNavItem>
<BNavItem :active="activeList === 'shared'" to="/histories/list_shared"> Shared with Me </BNavItem>
<BNavItem :active="activeList === 'published'" to="/histories/list_published">
Public Histories
</BNavItem>
</BNav>
</div>
<BNav pills justified class="mb-2">
<BNavItem :active="activeList === 'my'" to="/histories/list"> My Histories </BNavItem>
<BNavItem :active="activeList === 'shared'" to="/histories/list_shared"> Shared with Me </BNavItem>
<BNavItem :active="activeList === 'published'" to="/histories/list_published"> Public Histories </BNavItem>
</BNav>
<GridList v-if="activeList === 'my'" :grid-config="historiesGridConfig" embedded />
<GridList v-else-if="activeList === 'shared'" :grid-config="historiesSharedGridConfig" embedded />
<GridList v-else :grid-config="historiesPublishedGridConfig" embedded />
Expand Down
2 changes: 1 addition & 1 deletion client/src/components/Grid/GridList.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ watch(operationMessage, () => {
</div>
</div>
<FilterMenu
class="py-2"
:class="{ 'py-2': !embedded }"
:name="gridConfig.plural"
:placeholder="`search ${gridConfig.plural.toLowerCase()}`"
:filter-class="gridConfig.filtering"
Expand Down
30 changes: 14 additions & 16 deletions client/src/components/Grid/GridPage.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,21 @@ withDefaults(defineProps<Props>(), {
</script>

<template>
<div>
<div class="mb-2">
<div class="d-flex">
<Heading h1 separator inline size="xl" class="flex-grow-1 mb-2">Pages</Heading>
<div>
<BButton size="sm" variant="outline-primary" to="/pages/create">
<Icon :icon="faPlus" />
<span v-localize>Create Page</span>
</BButton>
</div>
<div class="d-flex flex-column">
<div class="d-flex">
<Heading h1 separator inline size="xl" class="flex-grow-1 mb-2">Pages</Heading>
<div>
<BButton size="sm" variant="outline-primary" to="/pages/create">
<Icon :icon="faPlus" />
<span v-localize>Create Page</span>
</BButton>
</div>
<BNav pills justified class="mb-2">
<BNavItem :active="activeList === 'my'" to="/pages/list"> My Pages </BNavItem>
<BNavItem :active="activeList === 'published'" to="/pages/list_published"> Public Pages </BNavItem>
</BNav>
<GridList v-if="activeList === 'my'" :grid-config="pagesGridConfig" embedded />
<GridList v-else :grid-config="pagesPublishedGridConfig" embedded />
</div>
<BNav pills justified class="mb-2">
<BNavItem :active="activeList === 'my'" to="/pages/list"> My Pages </BNavItem>
<BNavItem :active="activeList === 'published'" to="/pages/list_published"> Public Pages </BNavItem>
</BNav>
<GridList v-if="activeList === 'my'" :grid-config="pagesGridConfig" embedded />
<GridList v-else :grid-config="pagesPublishedGridConfig" embedded />
</div>
</template>
34 changes: 16 additions & 18 deletions client/src/components/Grid/GridVisualization.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,23 @@ withDefaults(defineProps<Props>(), {
</script>

<template>
<div>
<div class="mb-2">
<div class="d-flex">
<Heading h1 separator inline size="xl" class="flex-grow-1 mb-2">Visualizations</Heading>
<div>
<BButton size="sm" variant="outline-primary" to="/visualizations">
<Icon :icon="faPlus" />
<span v-localize>Create Visualization</span>
</BButton>
</div>
<div class="d-flex flex-column">
<div class="d-flex">
<Heading h1 separator inline size="xl" class="flex-grow-1 mb-2">Visualizations</Heading>
<div>
<BButton size="sm" variant="outline-primary" to="/visualizations">
<Icon :icon="faPlus" />
<span v-localize>Create Visualization</span>
</BButton>
</div>
<BNav pills justified class="mb-2">
<BNavItem :active="activeList === 'my'" to="/visualizations/list"> My Visualizations </BNavItem>
<BNavItem :active="activeList === 'published'" to="/visualizations/list_published">
Public Visualizations
</BNavItem>
</BNav>
<GridList v-if="activeList === 'my'" :grid-config="visualizationsGridConfig" embedded />
<GridList v-else :grid-config="visualizationsPublishedGridConfig" embedded />
</div>
<BNav pills justified class="mb-2">
<BNavItem :active="activeList === 'my'" to="/visualizations/list"> My Visualizations </BNavItem>
<BNavItem :active="activeList === 'published'" to="/visualizations/list_published">
Public Visualizations
</BNavItem>
</BNav>
<GridList v-if="activeList === 'my'" :grid-config="visualizationsGridConfig" embedded />
<GridList v-else :grid-config="visualizationsPublishedGridConfig" embedded />
</div>
</template>

0 comments on commit f7a0726

Please sign in to comment.