Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to iD 1.9.4 #1214

Merged
merged 2 commits into from May 4, 2016
Merged

Upgrade to iD 1.9.4 #1214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
935c207
Update to iD v1.9.4
bhousel May 4, 2016
a6b88fe
Support passing imagery offset parameter to iD
bhousel May 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/views/site/_id.html.erb
View file
Open in desktop
Expand Up @@ -25,10 +25,12 @@
if (hashParams.background) {
params.background = hashParams.background;
}

if (hashParams.comment) {
params.comment = hashParams.comment;
}
if (hashParams.offset) {
params.offset = hashParams.offset;
}

<% if params[:gpx] -%>
params.gpx = '<%= trace_data_url(params[:gpx], :format => :xml) %>';
Expand Down
73 changes: 70 additions & 3 deletions vendor/assets/iD/iD.css.erb
View file
Open in desktop
Expand Up @@ -2107,6 +2107,7 @@ ul li { list-style: none;}
.al { left: 0; }
.ar { right: 0; }

input.hide,
div.hide,
form.hide,
button.hide,
Expand Down Expand Up @@ -2827,7 +2828,7 @@ button.save.has-count .count::before {
}

.form-label button {
border-left: 1px solid #CCC;
border-left: 1px solid #ccc;
width: 10%;
height: 100%;
border-radius: 0;
Expand All @@ -2850,7 +2851,7 @@ button.save.has-count .count::before {
.form-field > input,
.form-field > textarea,
.form-field .preset-input-wrap {
border: 1px solid #CCC;
border: 1px solid #ccc;
min-height: 30px;
border-top: 0;
border-radius: 0 0 4px 4px;
Expand All @@ -2862,23 +2863,30 @@ button.save.has-count .count::before {
}

.inspector-border {
border-bottom: 1px solid #CCC
border-bottom: 1px solid #ccc
}

/* Preset form (hover mode) */

.inspector-hover .checkselect label:last-of-type,
.inspector-hover .preset-input-wrap .label,
.inspector-hover .form-field-multicombo,
.inspector-hover input,
.inspector-hover label {
background: #ececec;
}

.inspector-hover a,
.inspector-hover .form-field-multicombo .chips,
.inspector-hover .checkselect label:last-of-type {
color: #666;
}

.inspector-hover .form-field-multicombo .chips {
background: #eee;
border: 1px solid #ccc;
}

/* hide and remove from layout */
.inspector-hidden,
.inspector-hover label input[type="checkbox"],
Expand All @@ -2887,6 +2895,7 @@ button.save.has-count .count::before {
.inspector-hover .toggle-list label span,
.inspector-hover .inspector-inner .add-tag,
.inspector-hover .inspector-inner .add-relation,
.inspector-hover .form-field-multicombo .combobox-input,
.inspector-hover .toggle-list label.remove .icon {
height: 0;
width: 0;
Expand All @@ -2902,6 +2911,7 @@ button.save.has-count .count::before {
.inspector-hover .combobox-caret,
.inspector-hover .entity-editor-pane .header button,
.inspector-hover .spin-control,
.inspector-hover .form-field-multicombo .chips .remove,
.inspector-hover .hide-toggle:before,
.inspector-hover .more-fields,
.inspector-hover .form-label-button-wrap,
Expand Down Expand Up @@ -3002,6 +3012,63 @@ button.save.has-count .count::before {
border-bottom-right-radius: 4px;
}

/* preset form multicombo */

.form-field-multicombo {
border: 1px solid #cfcfcf;
border-top: 0px;
padding: 5px 0 5px 10px;
background: #fff;
display: block;
border-radius: 0 0 4px 4px;
overflow: hidden;
}

.form-field-multicombo:focus {
border-bottom: 0px;
}

.form-field-multicombo.active {
border-bottom-left-radius: 0px;
border-bottom-right-radius: 0px;
}

.form-field-multicombo li {
background-color: #eff2f7;
border: 1px solid #ccd5e3;
border-radius: 4px;
line-height: 25px;
display: inline-block;
padding: 2px 5px;
margin: 3px;
height: 30px;
}

.form-field-multicombo a {
font-family: Arial, Helvetica, sans-serif !important;
font-size: 16px !important;
line-height: 24px;
float: right;
margin: 1px 0 0 5px;
padding: 0;
cursor: pointer;
color: #a6b4ce;
}

.form-field-multicombo input {
border: 1px solid #ddd;
width: 100px;
margin: 3px;
}

.form-field-multicombo .combobox-caret {
margin: 3px 3px 3px -30px;
}

.form-field-multicombo input:focus {
border-radius: 4px !important;
}

/* preset form cycleway */

.form-field-cycleway .preset-input-wrap li {
Expand Down