Merge branch 'temp8-upgrade-angular' of https://github.com/umbraco/Umbraco-CMS into temp8-upgrade-angular

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-header.html

@@ -83,7 +83,7 @@
                     ng-if="!hideDescription && !descriptionLocked"
                     ng-model="$parent.description" />
         
-                <div class="umb-panel-header-locked-description" ng-show="descriptionLocked">{{ description }}</div>
+                <div class="umb-panel-header-locked-description" ng-if="descriptionLocked">{{ description }}</div>
 
             </div>
 

src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-sub-views.html

@@ -1,10 +1,17 @@
 <div class="umb-editor-sub-views">
-    <div
-       id="sub-view-{{$index}}"
-       ng-repeat="subView in subViews"
-       ng-include="subView.view"
-       ng-show="activeView.name == subView.name"
-       ng-class="'sub-view-' + subView.name"
-       val-sub-view>
+
+    <div 
+        id="sub-view-{{$index}}"
+        class="umb-editor-sub-view"
+        ng-repeat="subView in subViews"
+        ng-class="'sub-view-' + subView.name"
+        val-sub-view>
+
+       <div class="umb-editor-sub-view__content"
+            ng-show="activeView.name == subView.name" 
+            ng-include="subView.view">
+        </div>
+
     </div>
+
 </div>