Merge branch 'master' into open889

2016-05-10 23:09:59 -07:00
parent 2829b8d495 3727b287a1
commit 7c82e31b66
786 changed files with 411 additions and 1889 deletions
--- a/platform/commonUI/general/res/sass/user-environ/_frame.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss
@@ -36,6 +36,8 @@
 		line-height: $ohH;
        .left {
            padding-right: $interiorMarginLg;
+
+            z-index: 5;
        }
 	}
 	>.object-holder.abs {