From 63dd75229b3bfa43dec2e8f8fc6b03587972c1bb Mon Sep 17 00:00:00 2001
From: Simey Lameze <simey@moodle.com>
Date: Tue, 1 Aug 2017 12:02:35 +0800
Subject: [PATCH] MDL-59382 theme: bring the date picker forward

---
 theme/bootstrapbase/less/bootstrap/variables.less | 2 +-
 theme/bootstrapbase/less/moodle/calendar.less     | 3 +++
 theme/bootstrapbase/less/moodle/modal.less        | 2 +-
 theme/bootstrapbase/style/moodle.css              | 3 +++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/theme/bootstrapbase/less/bootstrap/variables.less b/theme/bootstrapbase/less/bootstrap/variables.less
index 220bbde37dc..934de950915 100644
--- a/theme/bootstrapbase/less/bootstrap/variables.less
+++ b/theme/bootstrapbase/less/bootstrap/variables.less
@@ -147,7 +147,7 @@
 @zindexFixedNavbar:       1030;
 @zindexModalBackdrop:     1040;
 @zindexModal:             1050;
-
+@zindexModalContainer:    4050;
 
 // Sprite icons path
 // -------------------------
diff --git a/theme/bootstrapbase/less/moodle/calendar.less b/theme/bootstrapbase/less/moodle/calendar.less
index f8f9ca5d368..cbb29dc26fe 100644
--- a/theme/bootstrapbase/less/moodle/calendar.less
+++ b/theme/bootstrapbase/less/moodle/calendar.less
@@ -22,6 +22,9 @@
 
 // Calendar restyling.
 .path-calendar {
+    #dateselector-calendar-panel {
+        z-index: @zindexModalContainer+4;
+    }
     .calendartable {
         width: 100%;
         th,
diff --git a/theme/bootstrapbase/less/moodle/modal.less b/theme/bootstrapbase/less/moodle/modal.less
index ecf0b0cd15d..819acc17a25 100644
--- a/theme/bootstrapbase/less/moodle/modal.less
+++ b/theme/bootstrapbase/less/moodle/modal.less
@@ -10,7 +10,7 @@ body {
     right: 0;
     bottom: 0;
     left: 0;
-    z-index: 4050;
+    z-index: @zindexModalContainer;
     outline: 0;
     overflow-x: hidden;
     overflow-y: auto;
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css
index 77d5aa202c9..52e7b7fb40d 100644
--- a/theme/bootstrapbase/style/moodle.css
+++ b/theme/bootstrapbase/style/moodle.css
@@ -5551,6 +5551,9 @@ img.iconsmall {
 .calendar_event_user {
   background-color: #dce7ec;
 }
+.path-calendar #dateselector-calendar-panel {
+  z-index: 4054;
+}
 .path-calendar .calendartable {
   width: 100%;
 }
-- 
2.43.0