Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

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

@@ -7,7 +7,7 @@
 // --------------------------------------------------
 
 // Core
-.btn {
+.btn, input[type=submit] {
   display: inline-block;
   .ie7-inline-block();
   padding: 4px 12px;
@@ -30,6 +30,7 @@
   // Hover/focus state
   &:hover,
   &:focus {
+    background: @btnBackgroundHighlight;
     color: @grayDark;
     text-decoration: none;
     background-position: 0 -15px;

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

@@ -107,7 +107,7 @@ body {
   z-index: 100;
   background: @white;
   height: 100%;
-  border-right: 1px solid @grayLight;   
+   
 }
 
 .navigation-inner-container{
@@ -117,6 +117,7 @@ body {
     left: 0px;
     right: 0px;
     padding-top: 100px;
+    border-right: 1px solid @grayLight;  
 }
 
 #dialog {

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

@@ -167,6 +167,10 @@ a.umb-options i {
 	margin: 0 2px 0 0;
 }
 
+a.umb-options:hover {
+	background: @btnBackgroundHighlight
+}
+
 li.root > div > a.umb-options {
     top: 13px;
 }
@@ -266,19 +270,15 @@ div.not-allowed > i.icon,div.not-allowed > a{
 	white-space: nowrap;
 	display: block;
 	font-size: 14px;
-	color: #414141;
+	color: @black;
 	padding: 4px 25px 4px 20px;
 	text-decoration: none;
 	cursor: pointer;
 }
 .umb-actions a:hover, .umb-actions a:focus,
 .umb-actions li.selected {
-	color: #fff !important;
-	background: #2e8aea !important;
-}
-
-.umb-actions a:hover i {
-	color: #fff;
+	color: @black !important;
+	background: @grayLighter !important;
 }
 
 .umb-actions .menu-label {
@@ -319,14 +319,6 @@ div.not-allowed > i.icon,div.not-allowed > a{
 	margin-left: 20px;
 }
 
-.umb-actions-child li a:hover {
-	color: #fff;
-	background-color: #2E8AEA
-}
-.umb-actions-child li a:hover * {
-	color: #fff !important
-}
-
 .umb-actions-child li .menu-label small {
 	font-size: 12px;
 	display: block;

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

@@ -88,7 +88,7 @@
 // Buttons
 // -------------------------
 @btnBackground:                     #f2f2f2;
-@btnBackgroundHighlight:            #f2f2f2;
+@btnBackgroundHighlight:            #e4e4e4;
 @btnBorder:                         #ccc;
 
 //@btnPrimaryBackground:              #297aff;