diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
index 255c914d44..bc6f69e389 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtree.directive.js
@@ -30,7 +30,7 @@ angular.module("umbraco.directives")
if(!hideheader){
template +='
';
}
template += '' +
diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
index a12300389f..e349ea81d4 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
@@ -34,8 +34,8 @@ angular.module("umbraco.directives")
'' +
'' +
'' +
- '{{node.name}}' +
- '' +
+ '{{node.name}}' +
+ '' +
'' +
'' +
'',
diff --git a/src/Umbraco.Web.UI.Client/src/less/animations.less b/src/Umbraco.Web.UI.Client/src/less/animations.less
index 9966ae0081..73592f74d0 100644
--- a/src/Umbraco.Web.UI.Client/src/less/animations.less
+++ b/src/Umbraco.Web.UI.Client/src/less/animations.less
@@ -21,26 +21,38 @@
}
.slide-hide, .slide-show {
- -webkit-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
- -moz-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
- -o-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
- transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.3s;
+ -webkit-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
+ -moz-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
+ -o-transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
+ transition: all cubic-bezier(0.770, 0.000, 0.175, 1.000) 0.5s;
}
.slide-hide {
- margin-left: 0;
+ -webkit-transform: translateX(0%);
+ -moz-transform: translateX(0%);
+ -ms-transform: translateX(0%);
+ transform: translateX(0%);
}
.slide-hide.slide-hide-active {
- margin-left: -100%;
+ -webkit-transform: translateX(-100%);
+ -moz-transform: translateX(-100%);
+ -ms-transform: translateX(-100%);
+ transform: translateX(-100%);
}
.slide-show {
- margin-left: -100%;
+ -webkit-transform: translateX(-100%);
+ -moz-transform: translateX(-100%);
+ -ms-transform: translateX(-100%);
+ transform: translateX(-100%);
}
.slide-show.slide-show-active {
- margin-left: 0;
+ -webkit-transform: translateX(0%);
+ -moz-transform: translateX(0%);
+ -ms-transform: translateX(0%);
+ transform: translateX(0%);
}
.tree-node-delete-leave {
diff --git a/src/Umbraco.Web.UI.Client/src/less/tree.less b/src/Umbraco.Web.UI.Client/src/less/tree.less
index 0375a918cf..747238f94d 100644
--- a/src/Umbraco.Web.UI.Client/src/less/tree.less
+++ b/src/Umbraco.Web.UI.Client/src/less/tree.less
@@ -15,7 +15,7 @@
.umb-tree li.current > div, .umb-tree div.selected {
background: #2e8aea;
}
-.umb-tree li.current > div i.umb-options i, .umb-tree div.selected i{
+.umb-tree li.current > div a.umb-options i, .umb-tree div.selected i{
background: #fff;
border-color: #2e8aea;
}
@@ -64,10 +64,10 @@
background-position: 0
}
-.umb-tree div > i.umb-options {
+.umb-tree div > a.umb-options {
visibility: hidden;
}
-.umb-tree div:hover > i.umb-options {
+.umb-tree div:hover > a.umb-options {
visibility: visible;
}
@@ -107,7 +107,7 @@
background: @grayLighter
}
-i.umb-options {
+a.umb-options {
visibility: hidden;
cursor: pointer;
display: inline-block;
@@ -119,7 +119,7 @@ i.umb-options {
top: 0px;
}
-i.umb-options i {
+a.umb-options i {
height: 6px !important;
width: 6px !important;
border-radius: 20px;
@@ -129,11 +129,11 @@ i.umb-options i {
margin: 10px -2px 0 0;
}
-li.root > div > i.umb-options {
+li.root > div > a.umb-options {
top: 10px;
}
-.hide-options .umb-options{display: none !important}
+.hide-options a.umb-options{display: none !important}
.hide-header h5{display: none !important}
.umb-icon-item {
@@ -167,7 +167,7 @@ li.root > div > i.umb-options {
font-size: 10px;
display: block
}
-.umb-icon-item:hover .umb-options {
+.umb-icon-item:hover a.umb-options {
visibility: visible
}
.umb-icon-item .umb-spr {
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
index 6416cf7083..fde0880eef 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.controller.js
@@ -16,7 +16,6 @@ angular.module("umbraco")
editor.on('blur', function(e) {
$scope.$apply(function() {
- //$scope.model.value = e.getBody().innerHTML;
$scope.model.value = editor.getContent();
});
});
@@ -31,7 +30,6 @@ angular.module("umbraco")
$(data.selection).each(function (i, img) {
var imagePropVal = umbImageHelper.getImagePropertyVaue({imageModel: img, scope: $scope});
-
var data = {
src: (imagePropVal != null && imagePropVal != "") ? imagePropVal: "nothing.jpg",
id: '__mcenew'
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
index 30765cfd42..6234d73fe1 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/rte/rte.html
@@ -1,3 +1,3 @@
-
+
\ No newline at end of file