Merge branch 'v8/feature/reintroduce-tabs' of https://github.com/umbraco/Umbraco-CMS into v8/feature/reintroduce-tabs

src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js

@@ -321,6 +321,11 @@
                         scope.sortingButtonKey = "general_reorder";
                     }
 
+                    // When exiting the reorder mode while the generic tab is empty, set the active tab to the first available one
+                    if (scope.tabs.length > 0 && !scope.openTabAlias) {
+                        scope.openTabAlias = scope.tabs[0].alias;
+                    }
+
                 } else {
                     scope.sortingMode = true;
                     scope.sortingButtonKey = "general_reorderDone";

src/Umbraco.Web.UI.Client/src/less/belle.less

@@ -107,7 +107,6 @@
 @import "components/card.less";
 @import "components/editor/umb-editor.less";
 @import "components/editor/umb-variant-switcher.less";
-@import "components/editor/umb-editor-container.less";
 @import "components/umb-sub-views.less";
 @import "components/umb-editor-navigation.less";
 @import "components/umb-editor-navigation-item.less";

src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor-container.less

@@ -1,5 +0,0 @@
-.umb-editor-container.editors-document-type-container {
-    .umb-pane {
-        margin-top: 0;
-    }
-}

src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less

@@ -6,6 +6,7 @@
   border-right-width: 21px;
   margin-left: -20px;
   width: calc(100% + 40px);
+  margin-top: -20px;
 
   .left {
     flex: 1 1 auto;