From 05f6b4dc7c58cabf02a4e05250cb5b1536019f65 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 5 Aug 2021 13:01:47 +0200 Subject: [PATCH 1/3] When exiting the reorder mode while the generic tab is empty, set the active tab to the first available one --- .../directives/components/umbgroupsbuilder.directive.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index 779dc0330e..b83fe2bd76 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -322,6 +322,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"; From 199e3e449caf025c89579c7616797988a3943ab5 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 5 Aug 2021 13:19:51 +0200 Subject: [PATCH 2/3] fix height change when the Generic tab is active without containing items + add white space in the top of the other subviews --- .../src/less/components/editor/umb-editor-container.less | 5 ----- .../src/less/components/umb-group-builder.less | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor-container.less diff --git a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor-container.less b/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor-container.less deleted file mode 100644 index 1e66bc89b8..0000000000 --- a/src/Umbraco.Web.UI.Client/src/less/components/editor/umb-editor-container.less +++ /dev/null @@ -1,5 +0,0 @@ -.umb-editor-container.editors-document-type-container { - .umb-pane { - margin-top: 0; - } -} diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less index ea78783ed9..27bee11a86 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less +++ b/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; From d5dee05514e220f55f9c5d9f5e3b8890aa5f7cc4 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Thu, 5 Aug 2021 13:55:31 +0200 Subject: [PATCH 3/3] remove reference to file --- src/Umbraco.Web.UI.Client/src/less/belle.less | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 1066fded12..6f95608d7a 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/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";