Merge branch 'master' of github.com:systemed/iD

css/app.css

@@ -831,22 +831,27 @@ div.combobox {
     background: #ececec;
 }
 
+.grid-entry:hover .preset-help {
+    display: block;
+}
+
 .grid-entry .preset-help {
-    display:none;
+    display: none;
     position: absolute;
     bottom: 0px;
     right: 0px;
     width: 20px;
     height: 20px;
-    background: black;
+    background: #aaa;
 }
 
 .grid-entry .preset-help:hover {
-  background: grey;
+  background: #888;
 }
 
 .preset-inspect {
   position: relative;
+  background: #fff;
 }
 
 .grid-entry .preset-icon-fill.area {

js/id/ui/preset_grid.js

@@ -78,7 +78,7 @@ iD.ui.PresetGrid = function(context) {
 
         function drawGrid(selection, presets) {
 
-            var entries = selection
+            var entries = selection.html('')
                 .selectAll('button.grid-entry')
                 .data(presets.collection.slice(0, 12), name);
 
@@ -132,7 +132,7 @@ iD.ui.PresetGrid = function(context) {
                     var selector = '.grid-entry:nth-child(' + (Math.floor(index/4) * 4 + 5 ) + ')';
 
                     presetinspect = selection.insert('div', selector)
-                        .attr('class', 'preset-inspect col12')
+                        .attr('class', 'inspector-inner preset-inspect col12')
                         .datum(d);
 
                     presetinspect.append('h2').text(d.title || d.name);
@@ -149,6 +149,7 @@ iD.ui.PresetGrid = function(context) {
                     }
 
                     taginfo.docs(params, function(err, data) {
+                        if (err) return description.text(t('inspector.no_documentation_combination'));
                         var doc = _.find(data, function(d) { return d.lang === locale; }) ||
                             _.find(data, function(d) { return d.lang === 'en'; });
                         description.text(doc.description);