Merge branch 'dev-v7' into dev-v7.8

# Conflicts: # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2017-11-16 12:01:26 +01:00
parent 31f6bd4c02 7eca99e249
commit 4bfb2d219b
18 changed files with 139 additions and 35 deletions
--- a/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
@@ -36,7 +36,7 @@
            <umb-overlay
               ng-if="vm.childNodeSelectorOverlay.show"
               model="vm.childNodeSelectorOverlay"
-               position="center"
+               position="target"
               view="vm.childNodeSelectorOverlay.view">
            </umb-overlay>

--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
@@ -299,7 +299,7 @@
      ng-if="editorOverlay.show"
      model="editorOverlay"
      view="editorOverlay.view"
-      position="center">
+      position="target">
    </umb-overlay>

    <umb-overlay