From 2e990a7869a7b2c75dec8e884d83b9834734995c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 11 Dec 2013 18:05:04 +1100
Subject: [PATCH] All working now, Fixes: U4-3722 Images in Media folder are
 huge

---
 .../directives/html/umbphotofolder.directive.js       |  2 +-
 .../src/less/property-editors.less                    | 11 ++++++-----
 .../src/views/directives/html/umb-photo-folder.html   |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
index 262cb63c26..9ea600214f 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/html/umbphotofolder.directive.js
@@ -95,7 +95,7 @@ angular.module("umbraco.directives.html")
                 newHeight = minDisplayHeight;
             }
             //always take the rounded down width so we know it will fit
-            return Math.floor(newHeight) - 1;
+            return Math.floor(newHeight);
         }
         else {
             
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 aea56c7581..66df7fd83f 100644
--- a/src/Umbraco.Web.UI.Client/src/less/property-editors.less
+++ b/src/Umbraco.Web.UI.Client/src/less/property-editors.less
@@ -243,11 +243,12 @@ ul.color-picker li a  {
   position: relative;
 }
 
-.umb-photo-folder .picrow div.pic:first-child {
-    margin-left:0px !important;
-}
-.umb-photo-folder .picrow div.pic:last-child {
-    margin-right:0px !important;
+.umb-photo-folder .picrow div.pic {
+    margin: 0px; 
+    padding: 0px; 
+    border: none; 
+    display: inline-block; 
+    overflow: hidden;
 }
 
 .umb-photo-folder .picrow div a:first-child {    
diff --git a/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-photo-folder.html b/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-photo-folder.html
index 05c01224f4..525f95c134 100644
--- a/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-photo-folder.html
+++ b/src/Umbraco.Web.UI.Client/src/views/directives/html/umb-photo-folder.html
@@ -2,7 +2,6 @@
     <div class="picrow" ng-repeat="row in rows">
 
         <div class="pic"
-            style="margin: 0px; padding: 0px; border: none; display: inline-block; overflow: hidden"
             ng-style="img.style" ng-repeat="img in row">
 
             <a href="#media/media/edit/{{img.id}}"