From 0c9b4565f1d71ef8353d8057eba4cc2c119e505c Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Wed, 13 Jan 2021 11:57:21 +0100 Subject: [PATCH 1/4] updates the css to support items with long titles (cherry picked from commit 8e64fe54b1213bef9e3218064d4b6ba74ebe04d3) --- .../src/less/components/card.less | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/less/components/card.less b/src/Umbraco.Web.UI.Client/src/less/components/card.less index a1a4b4bc5e..7174c0f290 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/card.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/card.less @@ -104,19 +104,18 @@ margin: 0 auto; list-style: none; width: 100%; - display: flex; flex-flow: row wrap; justify-content: flex-start; } .umb-card-grid li { - font-size: 12px; text-align: center; box-sizing: border-box; position: relative; width: 100px; + margin-bottom: 5px; } .umb-card-grid.-six-in-row li { @@ -142,18 +141,20 @@ .umb-card-grid .umb-card-grid-item { position: relative; display: block; - width: 100%; - //height: 100%; - padding-top: 100%; + width: 100%; + height: 100%; + padding: 10px 5px; border-radius: @baseBorderRadius * 2; transition: background-color 120ms; + font-size: 13px; + line-height: 1.3em; + display: flex; + flex-direction: column; + align-items: center; + justify-content: flex-start; > span { - position: absolute; - top: 10px; - bottom: 10px; - left: 10px; - right: 10px; + position: relative; display: flex; align-items: center; justify-content: center; From abb469a404eac06cd00a87ac6ad4295e50dbde46 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 28 Jan 2021 11:47:10 +0100 Subject: [PATCH 2/4] Revert "Updated NPoco from 3.9.4 -> 4.0.2 (#9061)" This reverts commit d9c6584d90955f57752e6dbe535dc3e79957df92. --- src/Umbraco.Core/Umbraco.Core.csproj | 1 + src/Umbraco.Examine/Umbraco.Examine.csproj | 1 + src/Umbraco.Tests/Testing/TestDatabase.cs | 36 +--------------------- src/Umbraco.Tests/Umbraco.Tests.csproj | 1 + src/Umbraco.Web/Umbraco.Web.csproj | 1 + 5 files changed, 5 insertions(+), 35 deletions(-) diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index 94e61c6aa5..c32b3247a3 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -92,6 +92,7 @@ + 2.8.0 diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj index 91a2fdda99..a207556cb7 100644 --- a/src/Umbraco.Examine/Umbraco.Examine.csproj +++ b/src/Umbraco.Examine/Umbraco.Examine.csproj @@ -57,6 +57,7 @@ + 3.3.0 runtime; build; native; contentfiles; analyzers diff --git a/src/Umbraco.Tests/Testing/TestDatabase.cs b/src/Umbraco.Tests/Testing/TestDatabase.cs index 7567f2a5fa..b1ddbd08d4 100644 --- a/src/Umbraco.Tests/Testing/TestDatabase.cs +++ b/src/Umbraco.Tests/Testing/TestDatabase.cs @@ -266,26 +266,6 @@ namespace Umbraco.Tests.Testing throw new NotImplementedException(); } - public Task InsertBatchAsync(IEnumerable pocos, BatchOptions options = null) - { - throw new NotImplementedException(); - } - - public Task UpdateBatchAsync(IEnumerable> pocos, BatchOptions options = null) - { - throw new NotImplementedException(); - } - - public IAsyncUpdateQueryProvider UpdateManyAsync() - { - throw new NotImplementedException(); - } - - public int UpdateBatch(IEnumerable> pocos, BatchOptions options = null) - { - throw new NotImplementedException(); - } - public int Update(string tableName, string primaryKeyName, object poco, object primaryKeyValue) { throw new NotImplementedException(); @@ -381,11 +361,6 @@ namespace Umbraco.Tests.Testing throw new NotImplementedException(); } - public IAsyncDeleteQueryProvider DeleteManyAsync() - { - throw new NotImplementedException(); - } - public void Save(T poco) { throw new NotImplementedException(); @@ -773,21 +748,12 @@ namespace Umbraco.Tests.Testing #endregion #region Stuff + public void BuildPageQueries(long skip, long take, string sql, ref object[] args, out string sqlCount, out string sqlPage) { throw new NotImplementedException(); } - public IAsyncQueryProviderWithIncludes QueryAsync() - { - throw new NotImplementedException(); - } - - int IDatabase.InsertBatch(IEnumerable pocos, BatchOptions options) - { - throw new NotImplementedException(); - } - #endregion } } diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index aa34e29efc..a05eb19ad2 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -102,6 +102,7 @@ + diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 7d758ced24..80179720b5 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -92,6 +92,7 @@ + 3.3.0 runtime; build; native; contentfiles; analyzers From 2999a48a59b9c887d369ff8c9b450353e0b9f627 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 28 Jan 2021 11:48:32 +0100 Subject: [PATCH 3/4] Bump version to 8.11.1 --- src/SolutionInfo.cs | 4 ++-- src/Umbraco.Web.UI/Umbraco.Web.UI.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs index 2110ddf4e0..3ecfd20f03 100644 --- a/src/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -18,5 +18,5 @@ using System.Resources; [assembly: AssemblyVersion("8.0.0")] // these are FYI and changed automatically -[assembly: AssemblyFileVersion("8.11.0")] -[assembly: AssemblyInformationalVersion("8.11.0")] +[assembly: AssemblyFileVersion("8.11.1")] +[assembly: AssemblyInformationalVersion("8.11.1")] diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj index 149630b7cf..01d029cae0 100644 --- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj +++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj @@ -347,9 +347,9 @@ False True - 8110 + 8111 / - http://localhost:8110 + http://localhost:8111 False False From e62cef6151fd6de1e1fce53ad4c1d19467da4068 Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Thu, 28 Jan 2021 12:03:02 +0100 Subject: [PATCH 4/4] Revert "Fixes wrong dependency in nuspec file" This reverts commit 8642b61449ac3cd39b63bcee80ab4615c8c2eac0. --- build/NuSpecs/UmbracoCms.Core.nuspec | 2 +- src/Umbraco.Core/Umbraco.Core.csproj | 1 - src/Umbraco.Examine/Umbraco.Examine.csproj | 1 - src/Umbraco.Tests/Umbraco.Tests.csproj | 1 - src/Umbraco.Web/Umbraco.Web.csproj | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec index 3f19be5f8a..fce15eb487 100644 --- a/build/NuSpecs/UmbracoCms.Core.nuspec +++ b/build/NuSpecs/UmbracoCms.Core.nuspec @@ -43,7 +43,7 @@ - + diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj index c32b3247a3..465ddee6ee 100755 --- a/src/Umbraco.Core/Umbraco.Core.csproj +++ b/src/Umbraco.Core/Umbraco.Core.csproj @@ -91,7 +91,6 @@ - diff --git a/src/Umbraco.Examine/Umbraco.Examine.csproj b/src/Umbraco.Examine/Umbraco.Examine.csproj index a207556cb7..0e0ee62139 100644 --- a/src/Umbraco.Examine/Umbraco.Examine.csproj +++ b/src/Umbraco.Examine/Umbraco.Examine.csproj @@ -56,7 +56,6 @@ all - 3.3.0 diff --git a/src/Umbraco.Tests/Umbraco.Tests.csproj b/src/Umbraco.Tests/Umbraco.Tests.csproj index a05eb19ad2..2ac28aa7d7 100644 --- a/src/Umbraco.Tests/Umbraco.Tests.csproj +++ b/src/Umbraco.Tests/Umbraco.Tests.csproj @@ -101,7 +101,6 @@ - diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 80179720b5..8890d9cf25 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -91,7 +91,6 @@ - 3.3.0