diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js index a0816b1379..f042138576 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js @@ -440,7 +440,7 @@ scope.editPropertyTypeSettings = function(property, group) { - if (!property.inherited) { + if (!property.inherited && !property.locked) { scope.propertySettingsDialogModel = {}; scope.propertySettingsDialogModel.title = "Property settings"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less index 002e857b3c..ba817db398 100644 --- a/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-group-builder.less @@ -190,6 +190,16 @@ input.umb-group-builder__group-sort-value { border: transparent; } +.umb-group-builder__property.-locked { + border: transparent; + background: #FDFDFD; + animation: fadeIn 0.5s; +} + +.umb-group-builder__property.-locked:hover { + border: transparent; +} + .umb-group-builder__property.-sortable, .umb-group-builder__property.-sortable-locked { min-height: 35px; @@ -337,6 +347,18 @@ input.umb-group-builder__group-sort-value { top: 0; } +.umb-group-builder__property-locked-label { + font-size: 11px; + background-color: #E9E9E9; + margin-left: 5px; + position: absolute; + right: 0; + z-index: 100; + padding: 0 10px 0 5px; + top: 0; +} + + /* ---------- PLACEHOLDER BOX ---------- */ .umb-group-builder__placeholder-box { diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html index 660660cf90..ddab851447 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-groups-builder.html @@ -93,7 +93,7 @@