From fcbb4e819e5927ec48b411a8ec076a4ac867dfa2 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Fri, 19 Jun 2015 09:10:05 +0200
Subject: [PATCH] Revert "Move property classes to be able to remove
 margin-bottom from last property in list. Set margin-bottom on last property
 to 0."

This reverts commit d982ca111dea5186df88d66e2ce73829a9f349d2.
---
 .../src/less/pages/document-type-editor.less        | 13 +++----------
 .../src/views/documenttype/views/design/design.html |  6 +++---
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/less/pages/document-type-editor.less b/src/Umbraco.Web.UI.Client/src/less/pages/document-type-editor.less
index c9e14f2678..ca0fc2b4c1 100644
--- a/src/Umbraco.Web.UI.Client/src/less/pages/document-type-editor.less
+++ b/src/Umbraco.Web.UI.Client/src/less/pages/document-type-editor.less
@@ -195,8 +195,10 @@
     min-height: 50px;
   }
 
-  .edt-property {
+  .edt-property{
     position: relative;
+    display: flex;
+    flex-flow: row;
     -webkit-transition: all 0.5s;
     transition: all 0.5s;
     margin-bottom: 5px;
@@ -208,15 +210,6 @@
     }
   }
 
-  .edt-property:last-child {
-    margin-bottom: 0;
-  }
-
-  .edt-property-content {
-    display: flex;
-    flex-flow: row;
-  }
-
   .edt-property-meta {
     flex: 0 0 175px;
     margin-right: 20px;
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/views/design/design.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/views/design/design.html
index a0ce3be962..8a8c51241c 100644
--- a/src/Umbraco.Web.UI.Client/src/views/documenttype/views/design/design.html
+++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/views/design/design.html
@@ -42,10 +42,10 @@
             <div class="edt-property-group">
                 <ul class="edt-property-list no-style-list" ui-sortable="sortableOptionsEditor"
                     ng-model="tab.properties" class="no-style-list">
-                    <li ng-repeat="property in tab.properties" class="edt-property" ng-class="{'active': property.dialogIsOpen, 'property-state-active animated fadeIn': property.propertyState=='active', 'property-state-init animated fadeIn': property.propertyState=='init', 'property-is-inherited': property.inherited, 'edt-property-handle': sortingMode}">
+                    <li ng-repeat="property in tab.properties">
 
                         <!-- Init property / Property placeholder / add new property -->
-                        <div class="edt-property-content" ng-if="property.propertyState=='init'" ng-click="editPropertyTypeSettings(property)">
+                        <div class="edt-property" ng-show="property.propertyState=='init'" ng-class="{'property-state-init animated fadeIn': property.propertyState=='init'}" ng-click="editPropertyTypeSettings(property)">
 
                             <div class="edt-property-meta">
                                 <div class="placeholder-input-small"></div>
@@ -65,7 +65,7 @@
 
                         </div>
 
-                        <div class="edt-property-content" ng-if="property.propertyState!=='init'">
+                        <div class="edt-property" ng-show="property.propertyState!=='init'" ng-class="{'active': property.dialogIsOpen, 'property-state-active animated fadeIn': property.propertyState=='active', 'property-is-inherited': property.inherited, 'edt-property-handle': sortingMode}">
 
                             <!-- property meta text -->
                             <div class="edt-property-meta">