Merge remote-tracking branch 'origin/master' into table-export-934

2016-06-01 10:33:53 -07:00
parent cc2b102256 dc577d4c24
commit ea676b4368
24 changed files with 485 additions and 61 deletions
--- a/platform/commonUI/general/res/sass/user-environ/_layout.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss
@@ -288,8 +288,9 @@ body.desktop .pane .mini-tab-icon.toggle-pane {

    .left {
        padding-right: $interiorMarginLg;
-        .l-back:not(.s-status-editing) {
+        .l-back {
            margin-right: $interiorMarginLg;
+            &.s-status-editing { display: none; }
        }
    }
 }