Styling for conflict resolution buttons

css/app.css

@@ -2375,10 +2375,25 @@ img.wiki-image {
 .error-detail-item {
     padding-left: 10px;
 }
+
 .error-detail-item:before {
     content: '- ';
 }
 
+.error-detail-container .error-choices {
+    padding: 5px;
+}
+
+.error-detail-container .error-choices .error-choice.action {
+    display: inline-block;
+    margin: 0 5px;
+    text-align: center;
+    vertical-align: middle;
+    font-size: 12px;
+    font-weight: normal;
+    height: 30px;
+}
+
 .modal-section:last-child {
     border-bottom: 0;
 }

js/id/modes/save.js

@@ -243,12 +243,12 @@ iD.modes.Save = function(context) {
 
             details
                 .append('div')
-                .attr('class', 'error-choices')
-                .selectAll('a')
+                .attr('class', 'error-choices cf')
+                .selectAll('button')
                 .data(function(d) { return d.choices || []; })
                 .enter()
-                .append('a')
-                .attr('class', 'error-choice')
+                .append('button')
+                .attr('class', 'error-choice action col2')
                 .text(function(d) { return d.text; })
                 .on('click', function(d) {
                     d.action();