Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/3955'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Mar 3, 2023
2 parents 49f99d9 + cc7e82f commit b8ef243
Show file tree
Hide file tree
Showing 38 changed files with 191 additions and 117 deletions.
16 changes: 10 additions & 6 deletions vendor/assets/iD/iD.css.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4965,7 +4965,11 @@
border-color: #f1f1f1;
}
}
.ideditor .form-field-button.colour-selector {
.ideditor input.colour-selector {
visibility: hidden;
position: absolute;
}
.ideditor input.date-selector {
visibility: hidden;
position: absolute;
}
Expand Down Expand Up @@ -5212,19 +5216,19 @@
padding-right: 11px;
}
.ideditor .tag-value-icon .icon {
width: 11px;
height: 17px;
width: 21px;
height: 21px;
margin: auto;
}
.ideditor[dir='ltr'] .form-field-input-combo .tag-value-icon + input {
padding-left: 30px;
padding-left: 40px;
}
.ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon + input {
padding-right: 30px;
padding-right: 40px;
}
.ideditor .combobox-option .tag-value-icon {
display: inline-block;
width: 18px;
width: 28px;
}


Expand Down
222 changes: 145 additions & 77 deletions vendor/assets/iD/iD.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/data/imagery.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/img/fa-sprite.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions vendor/assets/iD/iD/img/roentgen-sprite.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/ar.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/br.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/ca.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/cs.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/de.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/en.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/eo.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/es.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/eu.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/fa.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/fi.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/fr.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/he.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/hu.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/index.min.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"af":{"rtl":false,"pct":0.04},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0},"ar":{"rtl":true,"pct":0.95},"ar-AA":{"rtl":true,"pct":0.01},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.13},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.18},"bg":{"rtl":false,"pct":0.41},"bn":{"rtl":false,"pct":0.06},"bo":{"rtl":false,"pct":0},"br":{"rtl":false,"pct":0.57},"bs":{"rtl":false,"pct":0.02},"ca":{"rtl":false,"pct":0.5},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":1},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.02},"da":{"rtl":false,"pct":0.45},"de":{"rtl":false,"pct":1},"de-AT":{"rtl":false,"pct":0},"de-CH":{"rtl":false,"pct":0},"dv":{"rtl":true,"pct":0.01},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.37},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-CA":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.21},"en-IE":{"rtl":false,"pct":0},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.66},"es":{"rtl":false,"pct":0.99},"et":{"rtl":false,"pct":0.18},"eu":{"rtl":false,"pct":0.05},"fa":{"rtl":true,"pct":0.55},"fa-IR":{"rtl":true,"pct":0},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.37},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.97},"fr-FR":{"rtl":false,"pct":0.08},"fy":{"rtl":false,"pct":0.01},"ga":{"rtl":false,"pct":0},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.54},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.66},"he-IL":{"rtl":true,"pct":0},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.16},"hu":{"rtl":false,"pct":0.89},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.07},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.3},"it":{"rtl":false,"pct":0.59},"ja":{"rtl":false,"pct":0.96},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0.01},"kn":{"rtl":false,"pct":0.06},"ko":{"rtl":false,"pct":0.38},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0},"ky":{"rtl":false,"pct":0},"lb":{"rtl":false,"pct":0.16},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.14},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.23},"mg":{"rtl":false,"pct":0.06},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.36},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.12},"my":{"rtl":false,"pct":0},"nb":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.01},"nl":{"rtl":false,"pct":0.69},"nl-BE":{"rtl":false,"pct":0},"nl-NL":{"rtl":false,"pct":0},"nn":{"rtl":false,"pct":0.02},"no":{"rtl":false,"pct":0.46},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pa-PK":{"rtl":true,"pct":0.12},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.73},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.64},"pt-BR":{"rtl":false,"pct":0.54},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.12},"ru":{"rtl":false,"pct":0.47},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0.03},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.53},"sl":{"rtl":false,"pct":0.15},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.01},"sq":{"rtl":false,"pct":0.07},"sr":{"rtl":false,"pct":0.35},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":1},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.07},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.01},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.03},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.63},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":0.99},"ur":{"rtl":true,"pct":0.05},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.83},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.1},"zh":{"rtl":false,"pct":0.02},"zh-CN":{"rtl":false,"pct":0.73},"zh-HK":{"rtl":false,"pct":0.3},"zh-TW":{"rtl":false,"pct":0.91},"zu":{"rtl":false,"pct":0}}
{"af":{"rtl":false,"pct":0.04},"ak":{"rtl":false,"pct":0},"am":{"rtl":false,"pct":0},"ar":{"rtl":true,"pct":0.95},"ar-AA":{"rtl":true,"pct":0.01},"as":{"rtl":false,"pct":0},"ast":{"rtl":false,"pct":0.13},"ay":{"rtl":false,"pct":0},"az":{"rtl":false,"pct":0},"ba":{"rtl":false,"pct":0},"be":{"rtl":false,"pct":0.18},"bg":{"rtl":false,"pct":0.41},"bn":{"rtl":false,"pct":0.06},"bo":{"rtl":false,"pct":0},"br":{"rtl":false,"pct":0.62},"bs":{"rtl":false,"pct":0.02},"ca":{"rtl":false,"pct":0.5},"ckb":{"rtl":true,"pct":0.04},"cs":{"rtl":false,"pct":1},"cv":{"rtl":false,"pct":0},"cy":{"rtl":false,"pct":0.02},"da":{"rtl":false,"pct":0.45},"de":{"rtl":false,"pct":1},"de-AT":{"rtl":false,"pct":0},"de-CH":{"rtl":false,"pct":0},"dv":{"rtl":true,"pct":0.01},"ee":{"rtl":false,"pct":0},"el":{"rtl":false,"pct":0.36},"en":{"rtl":false,"pct":1},"en-AU":{"rtl":false,"pct":0},"en-CA":{"rtl":false,"pct":0},"en-GB":{"rtl":false,"pct":0.21},"en-IE":{"rtl":false,"pct":0},"en-IN":{"rtl":false,"pct":0},"en-NZ":{"rtl":false,"pct":0},"en-US":{"rtl":false,"pct":1},"eo":{"rtl":false,"pct":0.66},"es":{"rtl":false,"pct":1},"et":{"rtl":false,"pct":0.18},"eu":{"rtl":false,"pct":0.05},"fa":{"rtl":true,"pct":0.55},"fa-IR":{"rtl":true,"pct":0},"ff":{"rtl":false,"pct":0},"fi":{"rtl":false,"pct":0.37},"fil":{"rtl":false,"pct":0},"fr":{"rtl":false,"pct":0.99},"fr-FR":{"rtl":false,"pct":0.08},"fy":{"rtl":false,"pct":0.01},"ga":{"rtl":false,"pct":0},"gan":{"rtl":false,"pct":0},"gl":{"rtl":false,"pct":0.54},"grt":{"rtl":false,"pct":0},"gu":{"rtl":false,"pct":0.01},"ha":{"rtl":false,"pct":0},"he":{"rtl":true,"pct":0.67},"he-IL":{"rtl":true,"pct":0},"hi":{"rtl":false,"pct":0.01},"hr":{"rtl":false,"pct":0.16},"hu":{"rtl":false,"pct":0.89},"hy":{"rtl":false,"pct":0.03},"ia":{"rtl":false,"pct":0},"id":{"rtl":false,"pct":0.07},"ig":{"rtl":false,"pct":0},"is":{"rtl":false,"pct":0.3},"it":{"rtl":false,"pct":0.59},"ja":{"rtl":false,"pct":1},"jam":{"rtl":false,"pct":0},"jv":{"rtl":false,"pct":0},"ka":{"rtl":false,"pct":0},"kbd":{"rtl":false,"pct":0},"kha":{"rtl":false,"pct":0},"ki":{"rtl":false,"pct":0},"kk":{"rtl":false,"pct":0},"km":{"rtl":false,"pct":0.01},"kn":{"rtl":false,"pct":0.05},"ko":{"rtl":false,"pct":0.38},"ks":{"rtl":false,"pct":0},"ku":{"rtl":false,"pct":0},"ky":{"rtl":false,"pct":0},"lb":{"rtl":false,"pct":0.16},"lg":{"rtl":false,"pct":0},"lij":{"rtl":false,"pct":0},"ln":{"rtl":false,"pct":0},"lo":{"rtl":false,"pct":0},"lt":{"rtl":false,"pct":0.14},"lus":{"rtl":false,"pct":0},"lv":{"rtl":false,"pct":0.23},"mg":{"rtl":false,"pct":0.06},"mi":{"rtl":false,"pct":0},"mk":{"rtl":false,"pct":0.36},"ml":{"rtl":false,"pct":0.01},"mn":{"rtl":false,"pct":0},"mr":{"rtl":false,"pct":0},"ms":{"rtl":false,"pct":0.12},"my":{"rtl":false,"pct":0},"nb":{"rtl":false,"pct":0},"nd":{"rtl":false,"pct":0},"ne":{"rtl":false,"pct":0.01},"nl":{"rtl":false,"pct":0.7},"nl-BE":{"rtl":false,"pct":0},"nl-NL":{"rtl":false,"pct":0},"nn":{"rtl":false,"pct":0.02},"no":{"rtl":false,"pct":0.47},"nr":{"rtl":false,"pct":0},"nso":{"rtl":false,"pct":0},"nv":{"rtl":false,"pct":0},"ny":{"rtl":false,"pct":0},"oc":{"rtl":false,"pct":0},"om":{"rtl":false,"pct":0},"or":{"rtl":false,"pct":0},"pa":{"rtl":false,"pct":0},"pa-PK":{"rtl":true,"pct":0.12},"pap":{"rtl":false,"pct":0},"pl":{"rtl":false,"pct":0.83},"ps":{"rtl":true,"pct":0},"pt":{"rtl":false,"pct":0.64},"pt-BR":{"rtl":false,"pct":0.54},"qu":{"rtl":false,"pct":0},"rm":{"rtl":false,"pct":0},"ro":{"rtl":false,"pct":0.12},"ru":{"rtl":false,"pct":0.47},"rw":{"rtl":false,"pct":0},"sat":{"rtl":false,"pct":0.03},"sc":{"rtl":false,"pct":0},"sd":{"rtl":false,"pct":0},"sg":{"rtl":false,"pct":0},"si":{"rtl":false,"pct":0.02},"sk":{"rtl":false,"pct":0.54},"skr":{"rtl":false,"pct":0},"sl":{"rtl":false,"pct":0.15},"sm":{"rtl":false,"pct":0},"sn":{"rtl":false,"pct":0},"so":{"rtl":false,"pct":0.01},"sq":{"rtl":false,"pct":0.07},"sr":{"rtl":false,"pct":0.36},"ss":{"rtl":false,"pct":0},"st":{"rtl":false,"pct":0},"su":{"rtl":false,"pct":0},"sv":{"rtl":false,"pct":1},"sw":{"rtl":false,"pct":0},"ta":{"rtl":false,"pct":0.07},"te":{"rtl":false,"pct":0.02},"tg":{"rtl":false,"pct":0},"th":{"rtl":false,"pct":0.12},"ti":{"rtl":false,"pct":0},"tk":{"rtl":false,"pct":0},"tl":{"rtl":false,"pct":0.03},"tn":{"rtl":false,"pct":0},"tr":{"rtl":false,"pct":0.86},"ts":{"rtl":false,"pct":0},"tt":{"rtl":false,"pct":0},"tum":{"rtl":false,"pct":0},"ug":{"rtl":true,"pct":0},"uk":{"rtl":false,"pct":1},"ur":{"rtl":true,"pct":0.05},"uz":{"rtl":false,"pct":0},"ve":{"rtl":false,"pct":0},"vi":{"rtl":false,"pct":0.83},"wo":{"rtl":false,"pct":0},"xh":{"rtl":false,"pct":0},"yo":{"rtl":false,"pct":0},"yue":{"rtl":false,"pct":0.1},"zh":{"rtl":false,"pct":0.02},"zh-CN":{"rtl":false,"pct":0.72},"zh-HK":{"rtl":false,"pct":0.3},"zh-TW":{"rtl":false,"pct":0.91},"zu":{"rtl":false,"pct":0}}
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/ja.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/ko.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/nl.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/no.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/pl.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/pt-BR.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/pt.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/ru.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/sk.min.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions vendor/assets/iD/iD/locales/skr.min.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"skr":{"icons":{"download":"ڈاؤن لوڈ","information":"ڄاݨکاری","remove":"ہٹاؤ","list":"تندیر","close":"بند"},"modes":{"add_note":{"title":"نوٹ"},"browse":{"title":"براؤز کرو"}},"imagery":{"EsriWorldImagery":{"attribution":{"text":"شرطاں تے فیڈ بیک"}},"EsriWorldImageryClarity":{"attribution":{"text":"شرطاں تے فیڈ بیک"}},"Mapbox":{"attribution":{"text":"شرطاں تے فیڈ بیک"}},"mapbox_locator_overlay":{"attribution":{"text":"شرطاں تے فیڈ بیک"}}},"community":{"_communities":{"geolibres":"جیولیبرا"}}}}
2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/sr.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/sv.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/th.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/tr.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/uk.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/vi.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/zh-CN.min.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion vendor/assets/iD/iD/locales/zh-TW.min.json

Large diffs are not rendered by default.

0 comments on commit b8ef243

Please sign in to comment.