From e72758e04a0485a2b46c4f49e43101948a030c7a Mon Sep 17 00:00:00 2001
From: Bjarne Fyrstenborg <bf@oerskov.dk>
Date: Mon, 6 Nov 2017 22:01:35 +0100
Subject: [PATCH] Ensure box is square when picker is multiple picker

---
 src/Umbraco.Web.UI.Client/src/less/property-editors.less      | 2 +-
 .../propertyeditors/mediapicker/mediapicker.controller.js     | 2 ++
 .../src/views/propertyeditors/mediapicker/mediapicker.html    | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/property-editors.less b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
index 954c6d4ae1..7082c15a14 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -283,7 +283,7 @@ ul.color-picker li a  {
 
 .umb-sortable-thumbnails .umb-sortable-thumbnails__wrapper {
     width: 120px;
-    height: 100px;
+    height: 114px;
     overflow: hidden;
 }
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
index 91777bfc3e..1874a0623e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
@@ -19,6 +19,8 @@ angular.module('umbraco').controller("Umbraco.PropertyEditors.MediaPickerControl
             $scope.images = [];
             $scope.ids = [];
 
+            $scope.isMultiPicker = multiPicker;
+
             if ($scope.model.value) {
                 var ids = $scope.model.value.split(',');
 
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
index ac96ba4674..030849436e 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -2,7 +2,7 @@
 
     <p ng-if="(images|filter:{trashed:true}).length == 1"><localize key="mediaPicker_pickedTrashedItem"></localize></p>
     <p ng-if="(images|filter:{trashed:true}).length > 1"><localize key="mediaPicker_pickedTrashedItems"></localize></p>
-
+    
     <div class="flex error">
         <ul ui-sortable="sortableOptions" ng-model="images" ng-if="images.length > 0" class="umb-sortable-thumbnails">
             <li class="umb-sortable-thumbnails__wrapper" ng-repeat="image in images">
@@ -32,7 +32,7 @@
             </li>
         </ul>
 
-        <a href="#" class="add-link" ng-click="add()" ng-class="{'add-link-square': images.length === 0}" ng-if="showAdd()" prevent-default>
+        <a href="#" class="add-link" ng-click="add()" ng-class="{'add-link-square': (images.length === 0 || isMultiPicker)}" ng-if="showAdd()" prevent-default>
             <i class="icon icon-add large"></i>
         </a>
     </div>