mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-14 21:28:11 +02:00
Merge branch 'develop' into vegbilder
This commit is contained in:
+1
-1
@@ -362,7 +362,7 @@ label.streetside-hires {
|
||||
.kartaview-image-wrap {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
transform-origin:0 0;
|
||||
transform-origin: 0 0;
|
||||
}
|
||||
|
||||
.vegbilder-wrapper {
|
||||
|
||||
+48
-7
@@ -1640,10 +1640,14 @@ input.date-selector {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.form-field-input-combo input.raw-value {
|
||||
.form-field-input-combo input.raw-value,
|
||||
.form-field-input-semicombo input.raw-value,
|
||||
.form-field-input-multicombo input.raw-value {
|
||||
font-family: monospace;
|
||||
}
|
||||
.form-field-input-combo input.known-value {
|
||||
.form-field-input-combo input.known-value,
|
||||
.form-field-input-semicombo input.known-value,
|
||||
.form-field-input-multicombo input.known-value {
|
||||
color: #7092ff;
|
||||
}
|
||||
|
||||
@@ -1676,6 +1680,12 @@ input.date-selector {
|
||||
max-width: 100%;
|
||||
color: #7092ff;
|
||||
}
|
||||
.form-field-input-multicombo li.chip.negated span {
|
||||
text-decoration: line-through;
|
||||
}
|
||||
.form-field-input-multicombo li.chip input {
|
||||
width: 1em;
|
||||
}
|
||||
.ideditor[dir='ltr'] .form-field-input-multicombo li.chip {
|
||||
padding: 2px 0px 2px 5px;
|
||||
}
|
||||
@@ -1700,7 +1710,7 @@ input.date-selector {
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo li.chip span {
|
||||
.form-field-input-multicombo li.chip > span {
|
||||
display: block;
|
||||
flex: 1 1 auto;
|
||||
overflow: hidden;
|
||||
@@ -1739,7 +1749,9 @@ input.date-selector {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.form-field-input-combo .tag-value-icon {
|
||||
.form-field-input-combo .tag-value-icon,
|
||||
.form-field-input-semicombo .input-wrap .tag-value-icon,
|
||||
.form-field-input-multicombo .input-wrap .tag-value-icon {
|
||||
display: inline-block;
|
||||
position: relative;
|
||||
height: 24px;
|
||||
@@ -1750,7 +1762,9 @@ input.date-selector {
|
||||
z-index: 1;
|
||||
padding-left: 11px;
|
||||
}
|
||||
.ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon {
|
||||
.ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon,
|
||||
.ideditor[dir='rtl'] .form-field-input-semicombo .input-wrap .tag-value-icon,
|
||||
.ideditor[dir='rtl'] .form-field-input-multicombo .input-wrap .tag-value-icon {
|
||||
margin-right: 0;
|
||||
margin-left: -30px;
|
||||
padding-left: 0;
|
||||
@@ -1761,16 +1775,30 @@ input.date-selector {
|
||||
height: 21px;
|
||||
margin: auto;
|
||||
}
|
||||
.ideditor[dir='ltr'] .form-field-input-combo .tag-value-icon + input {
|
||||
.ideditor[dir='ltr'] .form-field-input-combo .tag-value-icon + input,
|
||||
.ideditor[dir='ltr'] .form-field-input-semicombo .input-wrap .tag-value-icon + input,
|
||||
.ideditor[dir='ltr'] .form-field-input-multicombo .input-wrap .tag-value-icon + input {
|
||||
padding-left: 40px;
|
||||
}
|
||||
.ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon + input {
|
||||
.ideditor[dir='rtl'] .form-field-input-combo .tag-value-icon + input,
|
||||
.ideditor[dir='rtl'] .form-field-input-semicombo .input-wrap .tag-value-icon + input,
|
||||
.ideditor[dir='rtl'] .form-field-input-multicombo .input-wrap .tag-value-icon + input {
|
||||
padding-right: 40px;
|
||||
}
|
||||
.combobox-option .tag-value-icon {
|
||||
display: inline-block;
|
||||
width: 28px;
|
||||
}
|
||||
.form-field-input-multicombo li.chip .tag-value-icon .icon {
|
||||
margin: 0;
|
||||
margin-right: 6px;
|
||||
display: inline-block;
|
||||
vertical-align: center;
|
||||
}
|
||||
.ideditor[dir='rtl'] .form-field-input-multicombo li.chip .tag-value-icon .icon {
|
||||
margin-right: 6px;
|
||||
margin-left: 0;
|
||||
}
|
||||
|
||||
|
||||
/* Field - Text / Numeric
|
||||
@@ -2100,6 +2128,19 @@ input.date-selector {
|
||||
.ideditor[dir='rtl'] .addr-row:last-of-type input:last-of-type {
|
||||
border-radius: 0 0 0 4px;
|
||||
}
|
||||
.combobox-address-street-place .combobox-option.address-street,
|
||||
.combobox-address-street-place .combobox-option.address-place {
|
||||
padding-right: 20px;
|
||||
}
|
||||
.combobox-address-street-place .combobox-option.address-street::after,
|
||||
.combobox-address-street-place .combobox-option.address-place::after {
|
||||
position: absolute;
|
||||
right: 2px;
|
||||
opacity: 0.4;
|
||||
}
|
||||
.combobox-address-street-place .combobox-option.address-place::after {
|
||||
content: url(data:image/svg+xml;charset=utf-8;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMCIgeT0iMCIgd2lkdGg9IjIwIiBoZWlnaHQ9IjIwIiB2aWV3Qm94PSIwIDAgMjAgMjAiPg0KICAgIDxwYXRoIGQ9Ik0xMCwzIEM2LjY4NiwzIDQsNS42MTIgNCw4LjgzMyBDNCwxMi4wNTUgMTAsMTcgMTAsMTcgQzEwLDE3IDE2LDEyLjA1NSAxNiw4LjgzMyBDMTYsNS42MTIgMTMuMzE0LDMgMTAsMyB6IE0xMC4xODcsNi41IEMxMS41MTMsNi41IDEyLjU4Nyw3LjU0NSAxMi41ODcsOC44MzMgQzEyLjU4NywxMC4xMjIgMTEuNTEzLDExLjE2NyAxMC4xODcsMTEuMTY3IEM4Ljg2MiwxMS4xNjcgNy43ODcsMTAuMTIyIDcuNzg3LDguODMzIEM3Ljc4Nyw3LjU0NSA4Ljg2Miw2LjUgMTAuMTg3LDYuNSB6IiBmaWxsPSJjdXJyZW50Q29sb3IiLz4NCjwvc3ZnPg==);
|
||||
}
|
||||
|
||||
|
||||
/* Field - Wikipedia
|
||||
|
||||
Reference in New Issue
Block a user