Merge branch 'bjarnef-dev-v7-U4-6898' into dev-v7

src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js

@@ -37,8 +37,7 @@ angular.module("umbraco.directives")
         template: '<li ng-class="{\'current\': (node == currentNode)}" on-right-click="altSelect(node, $event)">' +
             '<div ng-class="getNodeCssClass(node)" ng-swipe-right="options(node, $event)" >' +
             //NOTE: This ins element is used to display the search icon if the node is a container/listview and the tree is currently in dialog
-            //'<ins ng-if="tree.enablelistviewsearch && node.metaData.isContainer" class="umb-tree-node-search icon-search" ng-click="searchNode(node, $event)" alt="searchAltText"></ins>' +            
-            '<ins style="width:18px;"></ins>' +
+            //'<ins ng-if="tree.enablelistviewsearch && node.metaData.isContainer" class="umb-tree-node-search icon-search" ng-click="searchNode(node, $event)" alt="searchAltText"></ins>' + 
             '<ins ng-class="{\'icon-navigation-right\': !node.expanded, \'icon-navigation-down\': node.expanded}" ng-click="load(node)"></ins>' +
             '<i class="icon umb-tree-icon sprTree"></i>' +
             '<a ng-click="select(node, $event)"></a>' +

src/Umbraco.Web.UI.Client/src/less/tree.less

@@ -3,14 +3,13 @@
 
 
 .umb-item-list {
-	margin: 0px;
+	margin: 0;
 	width: auto;
 	display: block
 }
 .umb-item-list li {
 	display: block;
 	width: auto;
-	display: block
 }
 
 
@@ -20,7 +19,7 @@
 // -------------------------
 
 .umb-tree {
-	margin: 0px;
+	margin: 0;
 	min-width: 100%;
 	width: auto;
 }
@@ -29,17 +28,17 @@
 	display: block;
 	min-width: 100%;
 	width: auto;
-	display: block
 }
 .umb-tree li.current > div, .umb-tree div.selected {
 	background: @blue;
 }
-.umb-tree li.current > div a.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: @blue;
 }
 .umb-tree li.current > div a,
-.umb-tree li.current > div i.icon{
+.umb-tree li.current > div i.icon,
+.umb-tree li.current > div ins {
 	color: white !important;
 	background: @blue;
 	border-color: @blue;
@@ -57,8 +56,8 @@
 	white-space: nowrap
 }
 .umb-tree ul {
-	padding: 0px;
-	margin: 0px;
+	padding: 0;
+	margin: 0;
 	min-width: 100%;
 	width: 100%;
 	//display: table
@@ -111,16 +110,14 @@
 	display: inline-block;
 	visibility: hidden;
 	text-decoration: none;
+    font-size: 12px;
 }
+
 .umb-tree li:hover ins {
 	visibility: visible;
 	cursor: pointer
 }
 
-.umb-tree ins {
-	font-size: 12px;
-}
-
 .umb-tree .icon {
 	vertical-align: middle;
 	margin: 1px 13px 1px 0px;