CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-16 05:49:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'multiselect-remove-item' of https://github.com/ebrelsford/iD into ebrelsford-multiselect-remove-item

Browse Source
This commit is contained in:
Bryan Housel
2016-07-30 20:57:19 -04:00
parent 328889758e 6083ce2d14
commit 1fd79ade15
2 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
css/app.css
+18 -7
View File
@@ -722,9 +722,24 @@ button.save.has-count .count::before {
border-radius: 0;
}
.feature-list-item {
background-color: white;
font-weight: bold;
height: 40px;
line-height: 20px;
}
.feature-list-item:hover {
background-color: #ececec;
}
.feature-list-item button {
background: transparent;
}
.feature-list-item .label {
text-align: left;
padding: 5px 10px;
padding: 10px 10px;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
@@ -735,18 +750,14 @@ button.save.has-count .count::before {
opacity: .5;
}
.feature-list-item .label .close {
.feature-list-item .close {
float: right;
}
.feature-list-item .label .close .icon {
.feature-list-item .close .icon {
opacity: 1;
}
.feature-list-item:hover .label {
background-color: #ececec;
}
.feature-list-item .entity-type {
color:#7092ff;
}
modules/ui/selection_list.js
+7 -7
View File
@@ -45,14 +45,19 @@ export function SelectionList(context, selectedIDs) {
var items = list.selectAll('.feature-list-item')
.data(entities, Entity.key);
var enter = items.enter().append('button')
var enter = items.enter().append('div')
.attr('class', 'feature-list-item')
.on('click', selectEntity);
// Enter
var label = enter.append('div')
var label = enter.append('button')
.attr('class', 'label');
enter.append('button')
.attr('class', 'close')
.on('click', deselectEntity)
.call(Icon('#icon-close'));
label.append('span')
.attr('class', 'entity-geom-icon')
.call(Icon('', 'pre-text'));
@@ -63,11 +68,6 @@ export function SelectionList(context, selectedIDs) {
label.append('span')
.attr('class', 'entity-name');
label.append('span')
.attr('class', 'close')
.on('click', deselectEntity)
.call(Icon('#icon-close'));
// Update
items.selectAll('.entity-geom-icon use')
.attr('href', function() {