From 0cf857e8bcfbc7d7a7297a88b6174e844c4ebb8c Mon Sep 17 00:00:00 2001 From: Stephan Date: Tue, 23 Apr 2019 12:09:13 +0200 Subject: [PATCH] Cleanup --- src/Umbraco.Core/EnumerableExtensions.cs | 11 +++------- .../src/less/modals.less | 22 +++++-------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/src/Umbraco.Core/EnumerableExtensions.cs b/src/Umbraco.Core/EnumerableExtensions.cs index 00bb783486..3719bb0750 100644 --- a/src/Umbraco.Core/EnumerableExtensions.cs +++ b/src/Umbraco.Core/EnumerableExtensions.cs @@ -15,13 +15,8 @@ namespace Umbraco.Core var hs = new HashSet(); foreach (var item in items) { - if (item != null || includeNull) - { - if (!hs.Add(item)) - { - return true; - } - } + if ((item != null || includeNull) && !hs.Add(item)) + return true; } return false; } @@ -117,7 +112,7 @@ namespace Umbraco.Core } } - + /// /// Returns true if all items in the other collection exist in this collection /// diff --git a/src/Umbraco.Web.UI.Client/src/less/modals.less b/src/Umbraco.Web.UI.Client/src/less/modals.less index c86ca7e2d7..52a573d8c4 100644 --- a/src/Umbraco.Web.UI.Client/src/less/modals.less +++ b/src/Umbraco.Web.UI.Client/src/less/modals.less @@ -52,17 +52,7 @@ bottom: 0px; left: 0px; right: 0px; - position: absolute; -} - -.--notInFront .umb-modalcolumn::after { - content: ''; - position: absolute; - top: 0; - bottom: 0; - right: 0; - left: 0; - background: rgba(0,0,0,.4); + position: absolute; } .--notInFront .umb-modalcolumn::after { @@ -77,7 +67,7 @@ /* re-align loader */ .umb-modal .umb-loader-wrapper, .umb-modalcolumn .umb-loader-wrapper, .umb-dialog .umb-loader-wrapper{ - position:relative; + position:relative; margin: 20px -20px; } @@ -116,7 +106,7 @@ .umb-dialog-footer{ position: absolute; overflow:auto; - text-align: right; + text-align: right; height: 32px; left: 0px; right: 0px; @@ -136,7 +126,7 @@ .umbracoDialog form{height: 100%;} /*ensures dialogs doesnt have side-by-side labels*/ -.umbracoDialog .controls-row, +.umbracoDialog .controls-row, .umb-modal .controls-row{margin-left: 0px !important;} /* modal and umb-modal are used for right.hand dialogs */ @@ -184,7 +174,7 @@ padding: 20px; background: @white; border: none; - height: auto; + height: auto; } .umb-modal .umb-panel-body{ padding: 0px 20px 0px 20px; @@ -196,7 +186,7 @@ } .umb-modal i { font-size: 20px; -} +} .umb-modal .breadcrumb { background: none; padding: 0