From ecb6c8e52cef50257b4821431f8edf77f852e7c3 Mon Sep 17 00:00:00 2001 From: Simon Busborg Date: Tue, 15 Dec 2015 10:08:19 +0100 Subject: [PATCH] Fix for U4-7373 Error notifications shown are hidden underneath the dialogs http://issues.umbraco.org/issue/U4-7373 --- .../application/navresize.directive.js | 6 +++- src/Umbraco.Web.UI.Client/src/index.html | 7 ++--- .../src/less/application/grid.less | 28 +++++++++++-------- .../notifications/umb-notifications.html | 2 +- .../umbraco/Views/Default.cshtml | 5 ++-- 5 files changed, 28 insertions(+), 20 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/navresize.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/navresize.directive.js index ab683b490d..8fa08a78a2 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/navresize.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/navresize.directive.js @@ -31,6 +31,7 @@ angular.module("umbraco.directives") resize: function(e, ui) { var wrapper = $("#mainwrapper"); var contentPanel = $("#contentwrapper"); + var umbNotification = $("#umb-notifications-wrapper"); var apps = $("#applications"); var bottomBar = contentPanel.find(".umb-bottom-bar"); var navOffeset = $("#navOffset"); @@ -39,6 +40,7 @@ angular.module("umbraco.directives") contentPanel.css({ left: leftPanelWidth }); bottomBar.css({ left: leftPanelWidth }); + umbNotification.css({ left: leftPanelWidth }); navOffeset.css({ "margin-left": ui.element.outerWidth() }); }, @@ -55,11 +57,13 @@ angular.module("umbraco.directives") if (resizeEnabled) { //kill the resize element.resizable("destroy"); - element.css("width", ""); + var navInnerContainer = element.find(".navigation-inner-container"); + navInnerContainer.css("width", ""); $("#contentwrapper").css("left", ""); + $("#umb-notification").css("left" ""); $("#navOffset").css("margin-left", ""); resizeEnabled = false; diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html index 362510e044..50d78c315b 100644 --- a/src/Umbraco.Web.UI.Client/src/index.html +++ b/src/Umbraco.Web.UI.Client/src/index.html @@ -9,18 +9,17 @@ - +
-
-
+
- + diff --git a/src/Umbraco.Web.UI.Client/src/less/application/grid.less b/src/Umbraco.Web.UI.Client/src/less/application/grid.less index a33dbb56a3..a169e2d40e 100644 --- a/src/Umbraco.Web.UI.Client/src/less/application/grid.less +++ b/src/Umbraco.Web.UI.Client/src/less/application/grid.less @@ -47,6 +47,10 @@ body { margin: 0 } +#umb-notifications-wrapper { + left: 80px; +} + #contentcolumn { left: 0px; } @@ -168,12 +172,12 @@ body { border-radius: 0; } -.ui-resizable-e { - cursor: e-resize; - width: 4px; - right: -5px; - top: 0; - bottom: 0; +.ui-resizable-e { + cursor: e-resize; + width: 4px; + right: -5px; + top: 0; + bottom: 0; background-color: @grayLighter; border: solid 1px @grayLight; position:absolute; @@ -182,12 +186,12 @@ body { } @media (min-width: 1101px) { - #contentwrapper {left: 440px;} + #contentwrapper, #umb-notifications-wrapper {left: 440px;} #speechbubble {left: 360px;} } //empty section modification -.emptySection #contentwrapper {left: 80px;} +.emptySection #contentwrapper, .emptySection #umb-notifications-wrapper {left: 80px;} .emptySection #speechbubble {left: 0;} .emptySection #navigation {display: none} @@ -202,7 +206,7 @@ body { @media (max-width: 767px) { - + // make leftcolumn smaller on tablets #leftcolumn { width: 60px; @@ -219,7 +223,7 @@ body { #navigation { left: 60px; } - #contentwrapper, #contentcolumn { + #contentwrapper, #contentcolumn, #umb-notifications-wrapper { left: 30px; } #umbracoMainPageBody .umb-modal-left.fade.in { @@ -230,7 +234,7 @@ body { @media (max-width: 500px) { - + // make leftcolumn smaller on mobiles #leftcolumn { width: 40px; @@ -259,7 +263,7 @@ body { #navigation { left: 40px; } - #contentwrapper, #contentcolumn { + #contentwrapper, #contentcolumn, #umb-notifications-wrapper { left: 20px; } #umbracoMainPageBody .umb-modal-left.fade.in { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html index 169a197999..9962e2dd84 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/notifications/umb-notifications.html @@ -1,4 +1,4 @@ -
+
  • -
    +
    -
    + +
    @Html.BareMinimumServerVariablesScript(Url, Url.Action("ExternalLogin", "BackOffice", new { area = ViewBag.UmbracoPath }))