Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2016-04-11 12:08:27 +0300
committerRobert Speicher <rspeicher@gmail.com>2016-04-20 22:42:09 +0300
commitf56c62631525e45568231ad2be26f0e40f345c2b (patch)
tree555ca7dcc5a565d2703a7260788372337dd1d205
parent7617ae25658907556e3b4c270e1e6717b8711052 (diff)
Fixed issue with bootstrap dropdown closing the calendar
-rw-r--r--app/assets/javascripts/due_date_select.js.coffee5
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss4
2 files changed, 9 insertions, 0 deletions
diff --git a/app/assets/javascripts/due_date_select.js.coffee b/app/assets/javascripts/due_date_select.js.coffee
index edc28954aaf..b6e96002dfd 100644
--- a/app/assets/javascripts/due_date_select.js.coffee
+++ b/app/assets/javascripts/due_date_select.js.coffee
@@ -53,3 +53,8 @@ class @DueDateSelect
defaultDate: $("input[name='#{fieldName}']").val()
altField: "input[name='#{fieldName}']"
)
+
+ $(document)
+ .off 'click', '.ui-datepicker-header a'
+ .on 'click', '.ui-datepicker-header a', (e) ->
+ e.stopImmediatePropagation()
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index b57ecd1b37a..55c90b09e97 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -404,6 +404,10 @@
}
.dropdown-menu-due-date {
+ .dropdown-content {
+ max-height: 230px;
+ }
+
.ui-widget {
table {
margin: 0;