KumiSystems/Chatwoot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: Fixes height issues with seconday sidebar (#5407)

Browse source
This commit is contained in:
Sivin Varghese 2022-09-12 19:36:49 +05:30 committed by GitHub
parent db73d033b7
commit a680b08251
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/dashboard/components/layout/Sidebar.vue
View file

@ -285,8 +285,6 @@ export default {
} }
.secondary-menu .nested.vertical.menu { .secondary-menu .nested.vertical.menu {
overflow-y: auto;
height: 100%;
margin-left: var(--space-small); margin-left: var(--space-small);
} }
</style> </style>

3
app/javascript/dashboard/components/layout/sidebarComponents/Secondary.vue
View file

@ -245,6 +245,8 @@ export default {
@import '~dashboard/assets/scss/woot'; @import '~dashboard/assets/scss/woot';
.secondary-menu { .secondary-menu {
display: flex;
flex-direction: column;
background: var(--white); background: var(--white);
border-right: 1px solid var(--s-50); border-right: 1px solid var(--s-50);
height: 100%; height: 100%;
@ -267,7 +269,6 @@ export default {
.menu { .menu {
padding: var(--space-small); padding: var(--space-small);
overflow-y: auto; overflow-y: auto;
height: 94%;
} }
} }
</style> </style>

5
app/javascript/dashboard/routes/dashboard/contacts/components/Header.vue
View file

@ -2,6 +2,7 @@
<header class="header"> <header class="header">
<div class="table-actions-wrap"> <div class="table-actions-wrap">
<div class="left-aligned-wrap"> <div class="left-aligned-wrap">
<woot-sidemenu-icon />
<h1 class="page-title"> <h1 class="page-title">
{{ headerTitle }} {{ headerTitle }}
</h1> </h1>
@ -173,11 +174,13 @@ export default {
} }
.search-wrap { .search-wrap {
width: 400px; max-width: 400px;
min-width: 150px;
display: flex; display: flex;
align-items: center; align-items: center;
position: relative; position: relative;
margin-right: var(--space-small); margin-right: var(--space-small);
margin-left: var(--space-small);
.search-icon { .search-icon {
position: absolute; position: absolute;

21
app/javascript/dashboard/routes/dashboard/helpcenter/components/HelpCenterLayout.vue
View file

@ -6,17 +6,16 @@
@open-key-shortcut-modal="toggleKeyShortcutModal" @open-key-shortcut-modal="toggleKeyShortcutModal"
@close-key-shortcut-modal="closeKeyShortcutModal" @close-key-shortcut-modal="closeKeyShortcutModal"
/> />
<div v-if="portals.length"> <help-center-sidebar
<help-center-sidebar v-if="portals.length"
:class="sidebarClassName" :class="sidebarClassName"
:header-title="headerTitle" :header-title="headerTitle"
:sub-title="localeName(selectedPortalLocale)" :sub-title="localeName(selectedPortalLocale)"
:accessible-menu-items="accessibleMenuItems" :accessible-menu-items="accessibleMenuItems"
:additional-secondary-menu-items="additionalSecondaryMenuItems" :additional-secondary-menu-items="additionalSecondaryMenuItems"
@open-popover="openPortalPopover" @open-popover="openPortalPopover"
@open-modal="onClickOpenAddCatogoryModal" @open-modal="onClickOpenAddCatogoryModal"
/> />
</div>
<section class="app-content columns" :class="contentClassName"> <section class="app-content columns" :class="contentClassName">
<router-view /> <router-view />
<command-bar /> <command-bar />

7
app/javascript/dashboard/routes/dashboard/helpcenter/components/Sidebar/Sidebar.vue
View file

@ -89,6 +89,8 @@ export default {
<style scoped lang="scss"> <style scoped lang="scss">
@import '~dashboard/assets/scss/woot'; @import '~dashboard/assets/scss/woot';
.secondary-menu { .secondary-menu {
display: flex;
flex-direction: column;
background: var(--white); background: var(--white);
border-right: 1px solid var(--s-50); border-right: 1px solid var(--s-50);
height: 100%; height: 100%;
@ -108,5 +110,10 @@ export default {
&:hover { &:hover {
overflow: auto; overflow: auto;
} }
.menu {
padding: var(--space-small);
overflow-y: auto;
}
} }
</style> </style>