From b0021e73468cbf480812573f20d03ab872ef6a7d Mon Sep 17 00:00:00 2001
From: Brian Talbot <btalbot@edx.org>
Date: Wed, 3 Apr 2013 15:35:22 -0400
Subject: [PATCH] studio - resolved z-index issue with release date modal and
 JQUI timepicker + conslidated all vendor styling overrides/extensions

---
 cms/static/sass/base-style.scss                        |  2 +-
 .../{_jquery-ui-calendar.scss => _vendor.scss}         | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
 rename cms/static/sass/elements/{_jquery-ui-calendar.scss => _vendor.scss} (87%)

diff --git a/cms/static/sass/base-style.scss b/cms/static/sass/base-style.scss
index 5c67789f72..b9becc4829 100644
--- a/cms/static/sass/base-style.scss
+++ b/cms/static/sass/base-style.scss
@@ -27,7 +27,7 @@
 @import 'elements/forms';
 @import 'elements/modal';
 @import 'elements/alerts';
-@import 'elements/jquery-ui-calendar';
+@import 'elements/vendor';
 @import 'elements/tender-widget';
 
 // specific views
diff --git a/cms/static/sass/elements/_jquery-ui-calendar.scss b/cms/static/sass/elements/_vendor.scss
similarity index 87%
rename from cms/static/sass/elements/_jquery-ui-calendar.scss
rename to cms/static/sass/elements/_vendor.scss
index d7d7f093e5..b106f322ab 100644
--- a/cms/static/sass/elements/_jquery-ui-calendar.scss
+++ b/cms/static/sass/elements/_vendor.scss
@@ -1,6 +1,7 @@
-// studio - elements - JQUI calendar
+// studio - elements - vendor overrides
 // ====================
 
+// JQUI calendar
 .ui-datepicker {
   border-color: $darkGrey;
   border-radius: 2px;
@@ -54,4 +55,11 @@
     border-color: $orange;
     color: #fff;
   }
+}
+
+// ====================
+
+// JQUI timepicker
+.ui-timepicker-list {
+  z-index: 100000 !important;
 }
\ No newline at end of file