resolving local merge

2013-04-01 16:56:11 -04:00
parent 57e5eb683b ac180ca2b9
commit 769e209091
116 changed files with 3055 additions and 1823 deletions
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -660,7 +660,7 @@ hr.divide {
  position: absolute;
  top: 0;
  left: 0;
-  z-index: 99999;
+  z-index: 10000;
  padding: 0 10px;
  border-radius: 3px;
  background: rgba(0, 0, 0, 0.85);
--- a/cms/static/sass/elements/_jquery-ui-calendar.scss
+++ b/cms/static/sass/elements/_jquery-ui-calendar.scss
@@ -8,6 +8,7 @@
  font-family: $sans-serif;
  font-size: 12px;
  @include box-shadow(0 5px 10px rgba(0, 0, 0, 0.1));
+  z-index: 100000 !important;

  .ui-widget-header {
    background: $darkGrey;