From 90c359779e150d7d256d3b74a5957844b1727734 Mon Sep 17 00:00:00 2001
From: iRouge <bfavreault@inverse.ca>
Date: Wed, 4 Mar 2015 21:02:06 -0500
Subject: [PATCH] Fix Contact editor layout

---
 .../ContactsUI/UIxContactEditorTemplate.wox   | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
index 55c91284f..41b28c52e 100644
--- a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -78,6 +78,34 @@
       </label>
     </div>
 
+    <!-- emails -->
+    <div class="section">
+      <div class="attr" ng-repeat="email in card.emails">
+        <div class="md-layout-margin" layout="row" layout-align="space-between end">
+          <md-select ng-model="email.type" label:placeholder="Type">
+            <md-option ng-repeat="type in allEmailTypes" ng-value="type">{{ type }}</md-option>
+          </md-select>
+          <md-input-container>
+            <label class="pseudo-input-label"><var:string label:value="Email Address"/></label>
+            <input type="email" ng-model="email.value"
+                   sg-focus-on="email_{{$index}}"/>
+          </md-input-container>
+          <md-button class="iconButton" ng-click="card.$delete('emails', $index)">
+            <i class="md-icon-remove-circle"><!-- remove --></i>
+          </md-button>
+        </div>
+
+      </div>
+      <div class="md-layout-margin" layout="row" layout-align="start center">
+        <md-button class="iconButton" type="button" ng-click="addEmail()">
+          <i class="md-icon-add"><!-- new --></i>
+        </md-button>
+        <label class="button-label">
+          <var:string label:value="New Email Address"/>
+        </label>
+      </div>
+    </div>
+
     <!-- birthday -->
     <md-input-container>
           <label class="pseudo-input-label--no-margin">
@@ -112,34 +140,6 @@
             </label>
         </div>
 
-    <!-- emails -->
-    <div class="section">
-      <div class="attr" ng-repeat="email in card.emails">
-        <div class="md-layout-margin" layout="row" layout-align="space-between end">
-          <md-select ng-model="email.type" label:placeholder="Type">
-            <md-option ng-repeat="type in allEmailTypes" ng-value="type">{{ type }}</md-option>
-          </md-select>
-          <md-input-container>
-            <label class="pseudo-input-label"><var:string label:value="Email Address"/></label>
-            <input type="email" ng-model="email.value"
-                   sg-focus-on="email_{{$index}}"/>
-          </md-input-container>
-          <md-button class="iconButton" ng-click="card.$delete('emails', $index)">
-            <i class="md-icon-remove-circle"><!-- remove --></i>
-          </md-button>
-        </div>
-
-      </div>
-      <div class="md-layout-margin" layout="row" layout-align="start center">
-        <md-button class="iconButton" type="button" ng-click="addEmail()">
-          <i class="md-icon-add"><!-- new --></i>
-        </md-button>
-        <label class="button-label">
-          <var:string label:value="New Email Address"/>
-        </label>
-      </div>
-    </div>
-
     <!-- phones -->
       <div class="section">
         <div class="attr" ng-repeat="phone in card.phones">
@@ -183,9 +183,9 @@
               </label>
                 <input type="url" ng-model="url.value" sg-focus-on="url_{{$index}}"/>
             </md-input-container>
-            <span class="button alert icon" ng-click="card.$delete('urls', $index)">
-              <i class="md-icon-remove-circle-outline"><!-- remove --></i>
-            </span>
+            <md-button class="iconButton" ng-click="card.$delete('urls', $index)">
+              <i class="md-icon-remove-circle"><!-- remove --></i>
+            </md-button>
           </div>
         </div>
         <div class="md-layout-margin" layout="row" layout-align="start center">