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

This commit is contained in:
Tom MacWright
2013-03-05 14:46:50 -05:00
4 changed files with 10 additions and 9 deletions

View File

@@ -569,14 +569,14 @@ a.selected:hover .toggle.icon { background-position: -40px -180px;}
right: -10px;
}
.inspector-body.line .type button {
height: 100px;
}
.inspector-body .type button {
height: 70px;
}
.inspector-body-line .type button {
height: 100px;
}
.inspector-body .head .name {
padding-left: 10px;
}
@@ -819,7 +819,7 @@ div.combobox {
border-radius: 0;
}
.line .grid-entry {
.inspector-body-line .grid-entry {
min-height: 120px;
}
@@ -866,7 +866,7 @@ div.combobox {
margin: auto;
}
.line .grid-entry .icon {
.inspector-body-line .grid-entry .icon {
top: 10%;
}
@@ -883,7 +883,7 @@ div.combobox {
overflow: hidden;
}
.line .grid-entry .label {
.inspector-body-line .grid-entry .label {
top: 80%;
}

View File

@@ -99,6 +99,7 @@ iD.ui.LayerSwitcher = function(context) {
if (d.data.terms_url) {
provided_by.append('a')
.attr('href', (d.data.terms_url || ''))
.attr('target', '_blank')
.classed('disabled', !d.data.terms_url)
.text(' provided by ' + (d.data.sourcetag || d.data.name));
} else {

View File

@@ -20,7 +20,7 @@ iD.ui.PresetGrid = function(context) {
.attr('class', 'preset-grid-search-wrap inspector-inner');
var grid = selection.append('div')
.attr('class', 'preset-grid fillD inspector-body ' + entity.geometry(context.graph()))
.attr('class', 'preset-grid fillD inspector-body inspector-body-' + entity.geometry(context.graph()))
.call(drawGrid, context.presets().defaults(entity, 12));
var search = searchwrap.append('input')

View File

@@ -38,7 +38,7 @@ iD.ui.TagEditor = function(context) {
.text(t('inspector.choose'));
var editorwrap = selection.append('div')
.attr('class', 'tag-wrap inspector-body ' + entity.geometry(context.graph()));
.attr('class', 'tag-wrap inspector-body inspector-body-' + entity.geometry(context.graph()));
var headerwrap = editorwrap.append('div').attr('class','col12 inspector-inner head');