diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
index d1cde628e4..3afa32d099 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.less
@@ -75,14 +75,14 @@ umb-block-card {
.__info {
width: 100%;
background-color: #fff;
- padding-bottom: 6px;
+ padding-bottom: 11px;// 10 + 1 to compentiate for the -1 substraction in margin-bottom.
.__name {
font-weight: bold;
font-size: 14px;
color: @ui-action-type;
margin-left: 16px;
- margin-top: 8px;
+ margin-top: 10px;
margin-bottom: -1px;
}
.__subname {
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
index c0758aa2df..761e7c28ae 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js
@@ -14,9 +14,38 @@
}
});
- function BlockCardController() {
+ function BlockCardController($scope, umbRequestHelper) {
var vm = this;
+ vm.styleBackgroundImage = "none";
+
+ var unwatch = $scope.$watch("vm.blockConfigModel.thumbnail", (newValue, oldValue) => {
+ if(newValue !== oldValue) {
+ vm.updateThumbnail();
+ }
+ });
+
+ vm.$onInit = function () {
+
+ vm.updateThumbnail();
+
+ }
+ vm.$onDestroy = function () {
+ unwatch();
+ }
+
+ vm.updateThumbnail = function () {
+ if (vm.blockConfigModel.thumbnail == null || vm.blockConfigModel.thumbnail === "") {
+ vm.styleBackgroundImage = "none";
+ return;
+ }
+
+ var path = umbRequestHelper.convertVirtualToAbsolutePath(vm.blockConfigModel.thumbnail);
+ if (path.toLowerCase().endsWith(".svg") === false) {
+ path += "?upscale=false&width=400";
+ }
+ vm.styleBackgroundImage = 'url(\''+path+'\')';
+ }
}
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less
index f4d9caa73b..878f6a8ef8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/prevalue/blocklist.blockconfiguration.less
@@ -4,7 +4,7 @@
position: relative;
display: inline-flex;
width: 100%;
- height: auto;
+ height: 100%;
margin-right: 20px;
margin-bottom: 20px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
index 489c1353ff..d3099154c7 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
@@ -456,6 +456,7 @@
blockPickerModel.clipboardItems.push(
{
type: "elementType",
+ date: entry.date,
pasteData: entry.data,
blockConfigModel: modelObject.getScaffoldFromAlias(entry.alias),
elementTypeModel: {
@@ -471,6 +472,7 @@
blockPickerModel.clipboardItems.push(
{
type: "elementTypeArray",
+ date: entry.date,
pasteData: entry.data,
blockConfigModel: {}, // no block configuration for paste items of elementTypeArray.
elementTypeModel: {
@@ -481,6 +483,10 @@
);
});
+ blockPickerModel.clipboardItems.sort( (a, b) => {
+ return b.date - a.date
+ });
+
// open block picker overlay
editorService.open(blockPickerModel);
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
index 11a3b58c55..4aa1ed2af2 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
@@ -27,7 +27,7 @@
}
}
}
-
+
clipboardService.registrerClearPropertyResolver(clearNestedContentPropertiesForStorage)
@@ -49,7 +49,7 @@
}
}
}
-
+
clipboardService.registrerClearPropertyResolver(clearInnerNestedContentPropertiesForStorage)
}]);
@@ -187,7 +187,7 @@
};
vm.openNodeTypePicker = function ($event) {
-
+
if (vm.nodes.length >= vm.maxItems) {
return;
}
@@ -243,6 +243,7 @@
_.each(singleEntriesForPaste, function (entry) {
dialog.pasteItems.push({
type: "elementType",
+ date: entry.date,
name: entry.label,
data: entry.data,
icon: entry.icon
@@ -253,6 +254,7 @@
_.each(arrayEntriesForPaste, function (entry) {
dialog.pasteItems.push({
type: "elementTypeArray",
+ date: entry.date,
name: entry.label,
data: entry.data,
icon: entry.icon