From 9bed0cde9a84a07cd59757b4b338c3fb8dc9cb66 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 29 Nov 2022 09:30:11 +0100 Subject: [PATCH 1/6] Move login.svg file --- .../umbraco => Umbraco.Web.UI.Client/src}/assets/img/login.svg | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{Umbraco.Cms.StaticAssets/wwwroot/umbraco => Umbraco.Web.UI.Client/src}/assets/img/login.svg (100%) diff --git a/src/Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/img/login.svg b/src/Umbraco.Web.UI.Client/src/assets/img/login.svg similarity index 100% rename from src/Umbraco.Cms.StaticAssets/wwwroot/umbraco/assets/img/login.svg rename to src/Umbraco.Web.UI.Client/src/assets/img/login.svg From b9990f23db13fccfc3288bdb60d5268d8aa1607a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Nov 2022 09:58:59 +0100 Subject: [PATCH 2/6] Make sure contexbar fits within the available space (#13467) * Make sure contexbar fits within the available space * Ensuring context bar moves above, no matter size of it. * Fixing apperance of connection-fixers --- .../blockgrid/blockgridui.less | 60 +++++++++++++------ .../blockgrid/umb-block-grid-entry.html | 14 +---- 2 files changed, 45 insertions(+), 29 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less index ce7dcf3faa..f1d12287e0 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridui.less @@ -95,18 +95,13 @@ ng-form.ng-invalid-val-server-match-content > .umb-block-grid__block:not(.--acti &::after { display: var(--umb-block-grid--block-ui-display, block); - animation: umb-block-grid__block__border-pulse 400ms ease-in-out alternate infinite; - @keyframes umb-block-grid__block__border-pulse { - 0% { border-color: rgba(@blueDark, 1); } - 100% { border-color: rgba(@blueDark, 0.66); } - } + border-color: @blueDark; } } &.--active { &::after { display: block; border-color: @pinkLight; - animation: none; } > .umb-block-grid__block--context { @@ -223,15 +218,16 @@ ng-form.ng-invalid > .umb-block-grid__block:not(.--active) > .umb-block-grid__bl .umb-block-grid__block--context { position: absolute; - top: -21px; + bottom: 100%; right: -1px; + max-width: 100%; font-size: 12px; z-index: 4; display: var(--umb-block-grid--block-ui-display, flex); justify-content: end; /** prevent interaction with inline-create button just beneath the context-bar: */ - ::after { + &::after { content: ''; position: absolute; top: 100%; @@ -243,34 +239,62 @@ ng-form.ng-invalid > .umb-block-grid__block:not(.--active) > .umb-block-grid__bl .__context-bar { padding: 0 9px; padding-top: 1px; - background-color: #3544B1; + background-color: @blueDark; color: white; border-top: rgba(255, 255, 255, .7) 1px solid; border-left: rgba(255, 255, 255, .7) 1px solid; border-right: rgba(255, 255, 255, .7) 1px solid; border-top-left-radius: 3px; border-top-right-radius: 3px; - display: inline-block; + display: inline-flex; + box-sizing: border-box; + + max-width: 100%; + white-space: nowrap; + + /* Ensure that the bar is visually connected with the border **/ + &::before { + content: ''; + position: absolute; + left: 0; + bottom: -1px; + width: 1px; + border-top: 1px solid @blueDark; + box-sizing: border-box; + background: none; + } + &::after { + content: ''; + position: absolute; + right: 1px; + bottom: -2px; + height: 2px; + width: 2px; + border-top: 1px solid @blueDark; + border-right: 1px solid @blueDark; + box-sizing: border-box; + background: none; + } + .action { color: currentColor; font-size: 12px; + line-height: inherit; + + overflow: hidden; + text-overflow: ellipsis; } .__divider { - display: inline-block; margin: 0 3px; } .__label { - display: inline-flex; align-items: center; padding: 0; font-weight: 700; user-select: none; - - .icon { - font-size: 22px; - margin-right: 5px; - display: inline-block; - } + + overflow: hidden; + text-overflow: ellipsis; } } } diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html index d8621f7a5b..567d20ff25 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/umb-block-grid-entry.html @@ -76,18 +76,10 @@ title="blockEditor_focusParentBlock" ng-click="vm.parentBlock.showBlockUI()" ng-class="{ '--error': false && vm.valFormManager.isShowingValidation() }" - > - - {{vm.parentBlock.label}} - - - Focus parent block - - + ng-bind="vm.parentBlock.label" + >
/
-
- {{vm.layoutEntry.$block.label}} -
+
From b5a3dcb81eda9db74d9a9c28d28e0bc5d2279523 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Tue, 29 Nov 2022 10:07:52 +0100 Subject: [PATCH 3/6] Info panes not loading prerequisites (#13486) * load relations immediately on init and remove call to non-existing function `appTabChange` on destroy * load relations immediately on init and remove now not-used eventsService --- .../views/datatype.info.controller.js | 25 +++---------------- .../views/relationTypes/edit.controller.js | 9 +------ 2 files changed, 4 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js b/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js index be8ddba592..2cb075e80d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dataTypes/views/datatype.info.controller.js @@ -6,10 +6,9 @@ * @description * The controller for the info view of the datatype editor */ -function DataTypeInfoController($scope, $routeParams, dataTypeResource, eventsService, $timeout, editorService) { +function DataTypeInfoController($scope, $routeParams, dataTypeResource, $timeout, editorService) { var vm = this; - var evts = []; var referencesLoaded = false; vm.references = {}; @@ -48,7 +47,7 @@ function DataTypeInfoController($scope, $routeParams, dataTypeResource, eventsSe function open(id, event, type) { // targeting a new tab/window? - if (event.ctrlKey || + if (event.ctrlKey || event.shiftKey || event.metaKey || // apple (event.button && event.button === 1) // middle click, >IE9 + everyone else @@ -85,25 +84,7 @@ function DataTypeInfoController($scope, $routeParams, dataTypeResource, eventsSe } } - // load data type references when the references tab is activated - evts.push(eventsService.on("app.tabChange", function (event, args) { - $timeout(function () { - if (args.alias === "info") { - loadRelations(); - } - }); - })); - - //ensure to unregister from all events! - $scope.$on('$destroy', function () { - for (var e in evts) { - eventsService.unsubscribe(evts[e]); - } - }); - - - - + loadRelations(); } angular.module("umbraco").controller("Umbraco.Editors.DataType.InfoController", DataTypeInfoController); diff --git a/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js index 1f0c054257..43f33e0d32 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/relationTypes/edit.controller.js @@ -54,14 +54,7 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource, }); // load references when the 'relations' tab is first activated/switched to - var appTabChange = eventsService.on("app.tabChange", function (event, args) { - if (args.alias === "relations") { - loadRelations(); - } - }); - $scope.$on('$destroy', function () { - appTabChange(); - }); + loadRelations(); // Inital page/overview API call of relation type relationTypeResource.getById($routeParams.id) From acbaaecbcc6cfd40e1c7d508a9ab856324401e2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20Lyngs=C3=B8?= Date: Tue, 29 Nov 2022 13:35:07 +0100 Subject: [PATCH 4/6] do not set layout gaps (#13496) --- .../gridblock/gridblock.editor.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html index 710dd15e53..bceef66e37 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blockgrid/blockgridentryeditors/gridblock/gridblock.editor.html @@ -55,19 +55,19 @@ } :host { - --inherited--column-gap: var(--umb-block-grid--column-gap, 10px); - --inherited--row-gap: var(--umb-block-grid--row-gap, 10px); - --inherited--areas-column-gap: var(--umb-block-grid--areas-column-gap, 10px); - --inherited--areas-row-gap: var(--umb-block-grid--areas-row-gap, 10px); + --inherited--areas-column-gap: var(--umb-block-grid--areas-column-gap, 0); + --inherited--areas-row-gap: var(--umb-block-grid--areas-row-gap, 0); } [part='area-container'] { box-sizing: border-box; padding: 10px; - --umb-block-grid--column-gap: var(--inherited--column-gap, 10px); - --umb-block-grid--row-gap: var(--inherited--row-gap, 10px); - --umb-block-grid--areas-column-gap: var(--inherited--areas-column-gap, 10px); - --umb-block-grid--areas-row-gap: var(--inherited--areas-row-gap, 10px); + --umb-block-grid--areas-column-gap: 10px; + --umb-block-grid--areas-row-gap: 10px; + } + [part='area-container'] slot { + --umb-block-grid--areas-column-gap: var(--inherited--areas-column-gap, 0); + --umb-block-grid--areas-row-gap: var(--inherited--areas-row-gap, 0); } From 18fd0c9ed70daf5f9579b6a78591a5d21cf4fc11 Mon Sep 17 00:00:00 2001 From: Bjarke Berg Date: Tue, 29 Nov 2022 14:16:49 +0100 Subject: [PATCH 5/6] Nuget updates (#13478) * Updated nuget packages * Remove npoco update Co-authored-by: nikolajlauridsen --- .../Umbraco.Cms.Persistence.SqlServer.csproj | 2 +- src/Umbraco.Core/Umbraco.Core.csproj | 2 +- src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj | 6 +++--- .../Umbraco.PublishedCache.NuCache.csproj | 4 ++-- src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj | 2 +- .../Umbraco.Tests.Integration.csproj | 4 ++-- .../Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj index 7d477069ed..24d17d34a3 100644 --- a/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj +++ b/src/Umbraco.Cms.Persistence.SqlServer/Umbraco.Cms.Persistence.SqlServer.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 908c0bf2e0..e236980d1d 100644 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj index f2d8a23b86..a858d53e86 100644 --- a/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj +++ b/src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj @@ -13,7 +13,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj index a4230fca4d..46e69122ac 100644 --- a/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj +++ b/src/Umbraco.PublishedCache.NuCache/Umbraco.PublishedCache.NuCache.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj index 57082eb0e2..2dc22d54a5 100644 --- a/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj +++ b/src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj @@ -12,7 +12,7 @@ - + diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj index 6a96686b52..7792358c13 100644 --- a/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj +++ b/tests/Umbraco.Tests.Integration/Umbraco.Tests.Integration.csproj @@ -11,9 +11,9 @@ - + - + diff --git a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj index 1714bece2d..c5bc8d7c50 100644 --- a/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj +++ b/tests/Umbraco.Tests.UnitTests/Umbraco.Tests.UnitTests.csproj @@ -8,8 +8,8 @@ - - + + From d713b383c97ced18ecc53651952484735a011c29 Mon Sep 17 00:00:00 2001 From: nikolajlauridsen Date: Tue, 29 Nov 2022 16:40:47 +0100 Subject: [PATCH 6/6] Bump version to final --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 7c1db72b53..ca704c0138 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json", - "version": "11.0.0-rc6", + "version": "11.0.0", "assemblyVersion": { "precision": "build" },