yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v10/dev' into v11/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
#	src/Umbraco.Web.UI.Client/package.json
This commit is contained in:
Bjarke Berg
2023-06-21 08:41:35 +02:00
parent fba1afe7fe 785390efd7
commit 7ab6598d0b
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Infrastructure/Models/Mapping/EntityMapDefinition.cs
View File

@@ -14,6 +14,7 @@ public class EntityMapDefinition : IMapDefinition
public void DefineMaps(IUmbracoMapper mapper)
{
mapper.Define<IEntitySlim, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<IPropertyType, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<PropertyType, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<PropertyGroup, EntityBasic>((source, context) => new EntityBasic(), Map);
mapper.Define<IUser, EntityBasic>((source, context) => new EntityBasic(), Map);
@@ -77,7 +78,7 @@ public class EntityMapDefinition : IMapDefinition
}
// Umbraco.Code.MapAll -Udi -Trashed
private static void Map(PropertyType source, EntityBasic target, MapperContext context)
private static void Map(IPropertyType source, EntityBasic target, MapperContext context)
{
target.Alias = source.Alias;
target.Icon = "icon-box";

2
src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerPropertyEditor.cs
View File

@@ -43,6 +43,8 @@ public class MultiUrlPickerPropertyEditor : DataEditor
SupportsReadOnly = true;
}
public override IPropertyIndexValueFactory PropertyIndexValueFactory { get; } = new NoopPropertyIndexValueFactory();
protected override IConfigurationEditor CreateConfigurationEditor() =>
new MultiUrlPickerConfigurationEditor(_ioHelper, _editorConfigurationParser);

10
src/Umbraco.Web.UI.Client/src/less/components/umb-color-picker.less
View File

@@ -1,19 +1,15 @@
.umb-color-picker {
.umb-color-picker {
.sp-replacer {
display: inline-flex;
margin-right: 12px;
height: 32px;
padding: 5px;
&.sp-light {
background-color: @white;
}
.sp-preview {
margin: 5px;
height: auto;
}
.sp-dd {
line-height: 2rem;
}
@@ -24,4 +20,4 @@
.sp-replacer {
cursor: not-allowed;
}
}
}