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

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

@@ -123,6 +123,11 @@
 	background: none;
 	padding: 0
 }
+
+.umb-modal .breadcrumb input {
+	height: 12px
+}
+
 .umb-modal .thumbnail {
 	padding: 0;
 	border:none;

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

@@ -26,7 +26,7 @@
 @green:                 #46a546;
 @red:                   #9d261d;
 @yellow:                #ffc40d;
-@orange:                #f89406;
+@orange:                #f57020;
 @pink:                  #c3325f;
 @purple:                #7a43b6;
 

src/Umbraco.Web.UI/umbraco/Views/common/dialogs/mediapicker.html

@@ -18,7 +18,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
 
 		    <div class="pull-right umb-btn-toolbar">
 				    	<span class="btn fileinput-button" ng-class="{disabled: disabled}">
-				    	    <i class="icon-upload"></i>
+				    	    <i class="icon-add"></i>Add
 				    	    <input type="file" name="files[]" multiple ng-disabled="disabled">
 				    	</span>
 
@@ -39,7 +39,7 @@ data-file-upload="options" data-file-upload-progress="" data-ng-class="{'fileupl
 
 				<li>
 					<a href ng-hide="showFolderInput" ng-click="showFolderInput = true">
-						<i class="icon icon-expand-alt"></i>
+						<i class="icon icon-add"></i>
 					</a>
 
 					<input type="text"