From 975d538d23b1f6996d3d262fb5664e4924bdf706 Mon Sep 17 00:00:00 2001
From: Saman Bemel-Benrud <samanpwbb@gmail.com>
Date: Thu, 23 May 2013 17:15:38 -0400
Subject: [PATCH] relations styles for relation selection.

---
 js/id/ui/raw_member_editor.js     | 32 ++++++++++++-------------------
 js/id/ui/raw_membership_editor.js | 10 ----------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/js/id/ui/raw_member_editor.js b/js/id/ui/raw_member_editor.js
index 9e63c2a92..d33b09061 100644
--- a/js/id/ui/raw_member_editor.js
+++ b/js/id/ui/raw_member_editor.js
@@ -61,42 +61,34 @@ iD.ui.RawMemberEditor = function(context, entity) {
             .data(memberships, function(d) { return iD.Entity.key(entity) + ',' + d.index; });
 
         var row = li.enter().append('li')
-            .attr('class', 'member-row');
+            .attr('class', 'member-row form-field');
 
         row.each(function(d) {
             if (d.entity) {
-                var member = d3.select(this).append('a')
+                var member = d3.select(this).append('label')
+                    .attr('class', 'form-label')
+                    .append('a')
                     .attr('href', '#')
-                    .attr('class', 'member-entity')
                     .on('click', selectMember);
 
-                member.append('span')
-                    .attr('class', 'member-entity-icon')
-                    .each(function(d) {
-                        return d3.select(this)
-                            .call(iD.ui.PresetIcon(context.geometry(d.entity.id)));
-                    });
-
-                member.append('span')
-                    .attr('class', 'member-entity-name')
-                    .text(function(d) { return iD.util.localeName(d.entity); });
-
                 member.append('span')
                     .attr('class', 'member-entity-type')
                     .text(function(d) { return context.presets().match(d.entity, context.graph()).name(); });
 
+                member.append('span')
+                    .attr('class', 'member-entity-name')
+                    .text(function(d) { return iD.util.localeName(d.entity); });
+
             } else {
-                d3.select(this).append('span')
-                    .attr('class', 'member-incomplete')
+                d3.select(this).append('label')
+                    .attr('class', 'form-label member-incomplete')
                     .text(t('inspector.incomplete'));
             }
         });
 
-        row.append('span')
+        row.append('input')
             .attr('class', 'member-role')
-            .append('input')
             .property('type', 'text')
-            .attr('class', 'member-role-input')
             .attr('maxlength', 255)
             .attr('placeholder', t('inspector.role'))
             .property('value', function(d) { return d.member.role; })
@@ -104,7 +96,7 @@ iD.ui.RawMemberEditor = function(context, entity) {
 
         row.append('button')
             .attr('tabindex', -1)
-            .attr('class', 'member-delete')
+            .attr('class', 'remove button-input-action member-delete minor')
             .on('click', deleteMember)
             .append('span')
             .attr('class', 'icon delete');
diff --git a/js/id/ui/raw_membership_editor.js b/js/id/ui/raw_membership_editor.js
index 559f62a80..415592455 100644
--- a/js/id/ui/raw_membership_editor.js
+++ b/js/id/ui/raw_membership_editor.js
@@ -64,16 +64,6 @@ iD.ui.RawMembershipEditor = function(context, entity) {
         var row = li.enter().append('li')
             .attr('class', 'member-row form-field');
 
-        // var relation = row.append('div')
-        //     .attr('class', 'member-entity cf');
-
-        // relation.append('span')
-        //     .attr('class', 'member-entity-icon')
-        //     .each(function(d) {
-        //         return d3.select(this)
-        //             .call(iD.ui.PresetIcon(context.geometry(d.relation.id)));
-        //     });
-
         relationLabel = row.append('label')
             .attr('class', 'form-label')
             .append('a')