Skip to content

Commit

Permalink
Merge pull request #18007 from guerler/activity_divider
Browse files Browse the repository at this point in the history
Add section divider to activity bar, fix click handler
  • Loading branch information
ahmedhamidawan authored Apr 18, 2024
2 parents ffc66f2 + 85c6894 commit 10a0c58
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion client/src/components/ActivityBar/ActivityBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ import NotificationsPanel from "@/components/Panels/NotificationsPanel.vue";
import SettingsPanel from "@/components/Panels/SettingsPanel.vue";
import ToolPanel from "@/components/Panels/ToolPanel.vue";
// require user to long click before dragging
const DRAG_DELAY = 50;
const { config, isConfigLoaded } = useConfig();
const route = useRoute();
Expand Down Expand Up @@ -150,6 +153,7 @@ watch(
:class="{ 'activity-popper-disabled': isDragging }"
:force-fallback="true"
chosen-class="activity-chosen-class"
:delay="DRAG_DELAY"
drag-class="activity-drag-class"
ghost-class="activity-chosen-class"
@start="isDragging = true"
Expand Down Expand Up @@ -197,7 +201,7 @@ watch(
</div>
</draggable>
</b-nav>
<b-nav v-if="!isAnonymous" vertical class="flex-nowrap p-1">
<b-nav v-if="!isAnonymous" vertical class="activity-footer flex-nowrap p-1">
<NotificationItem
v-if="isConfigLoaded && config.enable_notification_system"
id="activity-notifications"
Expand Down Expand Up @@ -255,6 +259,11 @@ watch(
display: none;
}
.activity-footer {
border-top: $border-default;
border-top-style: dotted;
}
.activity-popper-disabled {
.popper-element {
display: none;
Expand Down

0 comments on commit 10a0c58

Please sign in to comment.