Skip to content

Commit 4e7e2cd

Browse files
authored
Merge pull request #6484 from Countly/validating-sidebar-menu
fix: Add z-index to sidebar menu container
2 parents 8d33e51 + 6a533fb commit 4e7e2cd

File tree

4 files changed

+9
-8
lines changed

4 files changed

+9
-8
lines changed

frontend/express/public/javascripts/countly/vue/components/sidebar.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,6 @@
616616
countlyVue.container.dataMixin({
617617
"externalMainMenuOptions": "/sidebar/menu/main",
618618
"otherMenuOptions": "/sidebar/menu/other",
619-
"customSidebarComponents": "/sidebar/custom",
620619
})
621620
],
622621
components: {

frontend/express/public/javascripts/countly/vue/core.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -894,17 +894,23 @@
894894
self.vm = new Vue({
895895
el: el,
896896
store: _vuex.getGlobalStore(),
897+
mixins: [
898+
countlyVue.container.dataMixin({
899+
"customOverlayComponents": "/overlay/custom",
900+
})
901+
],
897902
components: {
898903
DummyCompAPI: DummyCompAPI,
899904
MainView: self.component,
900905
GenericPopups: GenericPopupsView,
901-
QuickstartPopover: QuickstartPopoverView,
906+
QuickstartPopover: QuickstartPopoverView
902907
},
903908
template: '<div>\
904909
<MainView></MainView>\
905910
<GenericPopups></GenericPopups>\
906911
<DummyCompAPI></DummyCompAPI>\
907912
<QuickstartPopover></QuickstartPopover>\
913+
<component v-if="customOverlayComponents" v-for="customComponent in customOverlayComponents" :key="customComponent.name" :is="customComponent.component" />\
908914
</div>',
909915
beforeCreate: function() {
910916
this.$route.params = self.params;

frontend/express/public/javascripts/countly/vue/templates/sidebar/sidebar.html

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,4 @@
6767
</a>
6868
</div>
6969
</transition>
70-
71-
<component
72-
v-if="customSidebarComponents"
73-
v-for="customComponent in customSidebarComponents"
74-
:key="customComponent.name"
75-
:is="customComponent.component" />
7670
</div>

frontend/express/public/stylesheets/styles/blocks/_sidebar.scss

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ $bg-color: #24292e;
88
left: 0;
99
height: 100%;
1010
user-select: none;
11+
z-index: 2000;
1112
color: map.get(c.$colors, "warm-gray-40");
1213
}
1314

@@ -141,6 +142,7 @@ $bg-color: #24292e;
141142
box-sizing: border-box;
142143
height: 100%;
143144
overflow: hidden;
145+
z-index: 2004;
144146
position: relative;
145147

146148
/* .cly-vue-sidebar__menu--with-banner */

0 commit comments

Comments
 (0)