Merge branch 'dev-v7.6' into dev-v7

# Conflicts: # src/Umbraco.Web/Editors/MediaController.cs
2017-10-16 16:14:54 +02:00
parent 80f172e3fb dc937ec942
commit 04f64cd804
2 changed files with 5 additions and 1 deletions
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -165,6 +165,10 @@ ul.color-picker li a  {
  text-decoration: none;
 }

+.umb-mediapicker .add-link-square {
+  height: 120px;
+}
+


 .umb-thumbnails{
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
@@ -32,7 +32,7 @@
            </li>

        </ul>
-        <a href="#" class="add-link" ng-click="add()"  ng-if="showAdd()" prevent-default>
+        <a href="#" class="add-link" ng-click="add()" ng-class="{'add-link-square': images.length === 0}" ng-if="showAdd()" prevent-default>
            <i class="icon icon-add large"></i>
        </a>
    </div>