Skip to content

Commit

Permalink
technical debt
Browse files Browse the repository at this point in the history
  • Loading branch information
e154 committed Jan 2, 2024
1 parent 3a4191e commit 3a1816d
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 37 deletions.
11 changes: 10 additions & 1 deletion static_source/admin/src/layout/components/AppView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ const fixedHeader = computed(() => appStore.getFixedHeader)
const footer = computed(() => appStore.getFooter)
const tagsView = computed(() => appStore.getTagsView)
const tagsViewStore = useTagsViewStore()
const getCaches = computed((): string[] => {
Expand Down Expand Up @@ -42,7 +44,14 @@ onUnmounted(() => {
<template>
<section
:class="[
'p-[var(--app-content-padding)] w-[100%] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]', '!min-h-[calc(100%-var(--top-tool-height))]', 'h-[calc(100%-var(--top-tool-height))]',
'p-[var(--app-content-padding)] w-[100%] bg-[var(--app-content-bg-color)] dark:bg-[var(--el-bg-color)]',
{
'!min-h-[calc(100%-var(--top-tool-height))]': !tagsView,
'h-[calc(100%-var(--top-tool-height))]': !tagsView,
'!min-h-[calc(100%-var(--top-tool-height)-var(--tags-view-full-height))]': tagsView,
'h-[calc(100%-var(--top-tool-height)-var(--tags-view-full-height))]': tagsView,
},
{
'!min-h-[calc(100%-var(--app-footer-height))]':
((fixedHeader && (layout === 'classic' || layout === 'topLeft')) || layout === 'top') &&
Expand Down
2 changes: 2 additions & 0 deletions static_source/admin/src/styles/var.css
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@

--tags-view-height: 35px;

--tags-view-full-height: 37px;

--tags-view-border-color: #eee;
/* header start */

Expand Down
14 changes: 7 additions & 7 deletions static_source/admin/src/views/Dashboard/editor/editor.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,10 @@ const resizeHandler = function ($event) {
}
};
const elContainerHeight = computed(()=> (splitPaneBottom.value - 60) + 'px')
const tagsView = computed(() => tagsView.value? 37 : 0)
const elContainerHeight = computed(()=> {
return (splitPaneBottom.value - 60 - tagsView.value) + 'px';
})
</script>

Expand Down Expand Up @@ -215,13 +218,10 @@ const elContainerHeight = computed(()=> (splitPaneBottom.value - 60) + 'px')
position: relative;
}
.item-card-editor {
/*background-color: #f1f1f1;*/
}
.components-container {
height: calc(100vh - 50px);
/*min-height: calc(100vh - 50px);*/
//height: calc(100vh - 50px);
height: inherit;
height: -webkit-fill-available;
margin: 0;
padding: 0;
}
Expand Down
29 changes: 0 additions & 29 deletions static_source/admin/src/views/Dashboard/view/view.vue
Original file line number Diff line number Diff line change
Expand Up @@ -100,35 +100,6 @@ fetchDashboard()
background: #f1f1f1;
}
.item-card-editor {
/*background-color: #f1f1f1;*/
}
.components-container {
height: calc(100vh - 50px);
/*min-height: calc(100vh - 50px);*/
margin: 0;
padding: 0;
}
.top-container {
width: 100%;
height: 100%;
//padding: 0 20px;
overflow-y: scroll;
}
.bottom-container {
width: 100%;
height: 100%;
padding: 0 20px;
overflow-y: scroll;
}
.filter-list {
}
p {
display: block;
margin-block-start: 1em;
Expand Down

0 comments on commit 3a1816d

Please sign in to comment.