mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-15 05:30:35 +02:00
resolve conflict.
This commit is contained in:
+13
@@ -655,6 +655,19 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
|
||||
}
|
||||
|
||||
.grid-inner {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.preset-grid.filtered .grid-entry:first-child .grid-inner,
|
||||
.preset-grid .grid-entry .grid-inner:hover {
|
||||
background: #ececec;
|
||||
}
|
||||
|
||||
.preset-grid .grid-entry .grid-inner:hover {
|
||||
background: inherit;
|
||||
}
|
||||
|
||||
.grid-entry .grid-inner {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
|
||||
@@ -26,7 +26,13 @@ iD.ui.PresetGrid = function() {
|
||||
presets = filter(value);
|
||||
event.message('' + presets.length + ' results for ' + value);
|
||||
grid.call(drawGrid, presets);
|
||||
grid.classed('filtered', value.length);
|
||||
})
|
||||
.on('change', function() {
|
||||
var chosen = grid.selectAll('.grid-entry:first-child').datum();
|
||||
if (chosen) event.choose(chosen);
|
||||
});
|
||||
search.node().focus();
|
||||
|
||||
|
||||
function filter(value) {
|
||||
|
||||
@@ -111,6 +111,7 @@ iD.ui.TagEditor = function() {
|
||||
.attr('class','inspector-inner col12 fillL2').call(tagList, !tagview);
|
||||
|
||||
tageditor.tags(tags);
|
||||
event.change(tags);
|
||||
}
|
||||
|
||||
function drawHead(selection) {
|
||||
|
||||
Reference in New Issue
Block a user