Merging in open1248, resolve conflicts

2015-06-16 14:07:53 -07:00
parent 4887ba0e58 c6c4fa7182
commit c428df524c
7 changed files with 81 additions and 88 deletions
--- a/platform/commonUI/general/res/sass/controls/_menus.scss
+++ b/platform/commonUI/general/res/sass/controls/_menus.scss
@@ -168,7 +168,7 @@
    position: absolute;
    height: 200px;
    width: 170px;
-    z-index: 59;
+    z-index: 70;
    .context-menu-wrapper {
        position: absolute;
        height: 100%;