Skip to content

Commit f8b9b09

Browse files
committed
fix add event/assignment menu in calendar2. fixes #9609
previously menu was being positioned against #main div and not its parent #right-side div, causing it to be hidden by the overflow of the calendar list. the popup now displays properly. test plan: * open calendar2; * in the right sidebar, hover over a calendar in the list and click the gear button; * verify that the add event/assignment menu appears. Change-Id: I1fc6b6d7b0eeb0602af04803e2e2b4c9e1f30ddb Reviewed-on: https://gerrit.instructure.com/12622 Tested-by: Jenkins <jenkins@instructure.com> Reviewed-by: Jon Jensen <jon@instructure.com>
1 parent a043e04 commit f8b9b09

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

app/coffeescripts/calendar/sidebar.coffee

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,15 @@ define [
6767

6868
visibleContexts = new VisibleContextManager(contexts, selectedContexts, $holder)
6969

70-
$holder.find('.settings').kyleMenu(buttonOpts: {icons: { primary:'ui-icon-cog-with-droparrow', secondary: null}})
70+
$holder.find('.settings').kyleMenu
71+
buttonOpts:
72+
icons:
73+
primary:'ui-icon-cog-with-droparrow'
74+
secondary: null
75+
popupOpts:
76+
position:
77+
offset: '-25px 10px'
78+
within: '#right-side'
7179

7280
$holder.delegate '.context_list_context', 'click', (event) ->
7381
# dont toggle if thy were clicking the .settings button

app/stylesheets/calendar/sidebar.sass

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
height: 20px
2929
position: relative
3030

31+
.ui-kyle-menu li
32+
min-width: 95px
3133

3234
#calendar-feed-message
3335
background: url('/images/ical_big.png') no-repeat top left

0 commit comments

Comments
 (0)