mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-20 07:25:15 +02:00
Merge remote-tracking branch 'origin/master' into brand-name-protection
This commit is contained in:
Bryan Housel
@@ -26,6 +26,9 @@ path.stroke.tag-landuse,
|
||||
path.stroke.tag-natural,
|
||||
path.stroke.tag-leisure-nature_reserve,
|
||||
path.stroke.tag-leisure-pitch,
|
||||
path.stroke.tag-leisure-track,
|
||||
path.stroke.tag-leisure-golf_course,
|
||||
path.stroke.tag-leisure-garden,
|
||||
path.stroke.tag-leisure-park,
|
||||
path.stroke.tag-barrier-hedge,
|
||||
path.stroke.tag-landuse-forest,
|
||||
@@ -37,6 +40,9 @@ path.fill.tag-landuse,
|
||||
path.fill.tag-natural,
|
||||
path.fill.tag-leisure-nature_reserve,
|
||||
path.fill.tag-leisure-pitch,
|
||||
path.fill.tag-leisure-track,
|
||||
path.fill.tag-leisure-golf_course,
|
||||
path.fill.tag-leisure-garden,
|
||||
path.fill.tag-leisure-park,
|
||||
path.fill.tag-landuse-forest,
|
||||
path.fill.tag-natural-wood,
|
||||
@@ -48,6 +54,9 @@ path.fill.tag-landuse-grass {
|
||||
.preset-icon-fill-area.tag-natural,
|
||||
.preset-icon-fill-area.tag-leisure-nature_reserve,
|
||||
.preset-icon-fill-area.tag-leisure-pitch,
|
||||
.preset-icon-fill-area.tag-leisure-track,
|
||||
.preset-icon-fill-area.tag-leisure-golf_course,
|
||||
.preset-icon-fill-area.tag-leisure-garden,
|
||||
.preset-icon-fill-area.tag-leisure-park,
|
||||
.preset-icon-fill-area.tag-landuse-forest,
|
||||
.preset-icon-fill-area.tag-natural-wood,
|
||||
|
||||
+19
-6
@@ -351,22 +351,28 @@ path.stroke.tag-crossing.tag-crossing-zebra {
|
||||
}
|
||||
|
||||
/* Attractions */
|
||||
path.shadow.tag-attraction-summer_toboggan {
|
||||
path.shadow.tag-attraction-summer_toboggan,
|
||||
path.shadow.tag-attraction-water_slide {
|
||||
stroke-width: 16;
|
||||
}
|
||||
path.casing.tag-attraction-summer_toboggan {
|
||||
path.casing.tag-attraction-summer_toboggan,
|
||||
path.casing.tag-attraction-water_slide {
|
||||
stroke-width: 7;
|
||||
}
|
||||
path.stroke.tag-attraction-summer_toboggan {
|
||||
path.stroke.tag-attraction-summer_toboggan,
|
||||
path.stroke.tag-attraction-water_slide {
|
||||
stroke-width: 5;
|
||||
}
|
||||
.low-zoom path.shadow.tag-attraction-summer_toboggan {
|
||||
.low-zoom path.shadow.tag-attraction-summer_toboggan,
|
||||
.low-zoom path.shadow.tag-attraction-water_slide {
|
||||
stroke-width: 12;
|
||||
}
|
||||
.low-zoom path.casing.tag-attraction-summer_toboggan {
|
||||
.low-zoom path.casing.tag-attraction-summer_toboggan,
|
||||
.low-zoom path.casing.tag-attraction-water_slide {
|
||||
stroke-width: 5;
|
||||
}
|
||||
.low-zoom path.stroke.tag-attraction-summer_toboggan {
|
||||
.low-zoom path.stroke.tag-attraction-summer_toboggan,
|
||||
.low-zoom path.stroke.tag-attraction-water_slide {
|
||||
stroke-width: 3;
|
||||
}
|
||||
path.stroke.tag-attraction-summer_toboggan {
|
||||
@@ -375,3 +381,10 @@ path.stroke.tag-attraction-summer_toboggan {
|
||||
path.casing.tag-attraction-summer_toboggan {
|
||||
stroke: #666;
|
||||
}
|
||||
|
||||
path.stroke.tag-attraction-water_slide {
|
||||
stroke: #aae0cb;
|
||||
}
|
||||
path.casing.tag-attraction-water_slide {
|
||||
stroke: #3d6c71;
|
||||
}
|
||||
|
||||
+74
-105
@@ -161,7 +161,6 @@ input[type=email] {
|
||||
border: 1px solid #ccc;
|
||||
padding: 5px 20px 5px 10px;
|
||||
height: 30px;
|
||||
width: 100%;
|
||||
border-radius: 4px;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
@@ -1209,6 +1208,8 @@ a.hide-toggle {
|
||||
}
|
||||
|
||||
.form-field {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
margin-bottom: 10px;
|
||||
width: 100%;
|
||||
-webkit-transition: margin-bottom 200ms;
|
||||
@@ -1228,25 +1229,21 @@ a.hide-toggle {
|
||||
color: #333;
|
||||
background: #f6f6f6;
|
||||
border: 1px solid #cfcfcf;
|
||||
padding: 5px 0 5px 10px;
|
||||
display: block;
|
||||
border-radius: 4px 4px 0 0;
|
||||
overflow: hidden;
|
||||
flex: 1 1 100%;
|
||||
display: flex;
|
||||
}
|
||||
[dir='rtl'] .form-label {
|
||||
.form-label .label-text {
|
||||
flex: 1 1 auto;
|
||||
padding: 5px 0 5px 10px;
|
||||
}
|
||||
[dir='rtl'] .form-label .label-text {
|
||||
padding: 5px 10px 5px 0;
|
||||
}
|
||||
|
||||
.form-label-button-wrap {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 0;
|
||||
height: 100%;
|
||||
background: transparent;
|
||||
}
|
||||
[dir='rtl'] .form-label-button-wrap {
|
||||
right: auto;
|
||||
left: 0;
|
||||
flex: 0 1 auto;
|
||||
}
|
||||
|
||||
.form-label-button-wrap .tag-reference-button {
|
||||
@@ -1268,7 +1265,6 @@ a.hide-toggle {
|
||||
border-left: none;
|
||||
border-right: 1px solid #ccc;
|
||||
border-radius: 4px 0 0 0;
|
||||
width: 31px;
|
||||
}
|
||||
.form-label button:hover {
|
||||
background: #f1f1f1;
|
||||
@@ -1294,6 +1290,7 @@ a.hide-toggle {
|
||||
border-radius: 0 0 4px 4px;
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
flex: 1;
|
||||
}
|
||||
|
||||
.form-field textarea {
|
||||
@@ -1304,6 +1301,27 @@ a.hide-toggle {
|
||||
border-bottom: 1px solid #ccc
|
||||
}
|
||||
|
||||
/* Fields - corner radius for fields with following elements on the same line
|
||||
------------------------------------------------------- */
|
||||
[dir='ltr'] .inspector-wrap:not(.inspector-hover) .form-field .wiki-title,
|
||||
[dir='ltr'] .inspector-wrap:not(.inspector-hover) .form-field .localized-main,
|
||||
[dir='ltr'] .inspector-wrap:not(.inspector-hover) .form-field .member-role,
|
||||
[dir='ltr'] .inspector-wrap:not(.inspector-hover) .form-field .spin-control button:first-child,
|
||||
[dir='ltr'] .inspector-wrap:not(.inspector-hover) .form-field input[type='text'].number,
|
||||
[dir='ltr'] #preset-input-maxspeed,
|
||||
[dir='ltr'] #preset-input-maxspeed_advisory {
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
[dir='rtl'] .inspector-wrap:not(.inspector-hover) .form-field .wiki-title,
|
||||
[dir='rtl'] .inspector-wrap:not(.inspector-hover) .form-field .localized-main,
|
||||
[dir='rtl'] .inspector-wrap:not(.inspector-hover) .form-field .member-role,
|
||||
[dir='rtl'] .inspector-wrap:not(.inspector-hover) .form-field .spin-control button:first-child,
|
||||
[dir='rtl'] .inspector-wrap:not(.inspector-hover) .form-field input[type='text'].number,
|
||||
[dir='rtl'] #preset-input-maxspeed,
|
||||
[dir='rtl'] #preset-input-maxspeed_advisory {
|
||||
border-bottom-left-radius: 0;
|
||||
}
|
||||
|
||||
/* Inspector (hover styles)
|
||||
------------------------------------------------------- */
|
||||
.inspector-hover .checkselect label:last-of-type,
|
||||
@@ -1354,7 +1372,6 @@ a.hide-toggle {
|
||||
}
|
||||
|
||||
/* hide but preserve in layout */
|
||||
.inspector-hover .entity-editor-pane button.minor,
|
||||
.inspector-hover .combobox-caret,
|
||||
.inspector-hover .header button,
|
||||
.inspector-hover .spin-control,
|
||||
@@ -1366,13 +1383,13 @@ a.hide-toggle {
|
||||
.inspector-hover .footer * {
|
||||
opacity: 0;
|
||||
}
|
||||
/* hide and do not affect layout */
|
||||
.inspector-hover .entity-editor-pane button.minor {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Styles for raw tag inspector on hover */
|
||||
.inspector-hover .tag-row .key-wrap,
|
||||
.inspector-hover .tag-row .form-field.input-wrap-position {
|
||||
width: 50%;
|
||||
}
|
||||
.inspector-hover .tag-row .key-wrap,
|
||||
.inspector-hover .tag-row .input-wrap-position {
|
||||
height: 31px;
|
||||
}
|
||||
@@ -1472,10 +1489,6 @@ a.hide-toggle {
|
||||
padding: 5px 10px;
|
||||
}
|
||||
|
||||
[dir='rtl'] .preset-input-wrap .col6 {
|
||||
float: right;
|
||||
}
|
||||
|
||||
|
||||
/* Field - Access, Cycleway, Structure
|
||||
------------------------------------------------------- */
|
||||
@@ -1483,12 +1496,18 @@ a.hide-toggle {
|
||||
.form-field-cycleway .preset-input-wrap li,
|
||||
.form-field-access .preset-input-wrap li {
|
||||
border-bottom: 1px solid #ccc;
|
||||
display: flex;
|
||||
}
|
||||
.structure-extras-wrap li:last-child,
|
||||
.form-field-cycleway .preset-input-wrap li:last-child,
|
||||
.form-field-access .preset-input-wrap li:last-child {
|
||||
border-bottom: 0;
|
||||
}
|
||||
.structure-extras-wrap li > *,
|
||||
.form-field-cycleway .preset-input-wrap li > *,
|
||||
.form-field-access .preset-input-wrap li > * {
|
||||
flex: 1;
|
||||
}
|
||||
.structure-input-type-wrap input,
|
||||
.structure-input-layer-wrap input,
|
||||
.preset-input-cycleway-wrap input,
|
||||
@@ -1496,6 +1515,7 @@ a.hide-toggle {
|
||||
border-radius: 0;
|
||||
border-width: 0;
|
||||
border-left-width: 1px;
|
||||
width: 100%;
|
||||
}
|
||||
[dir='rtl'] .structure-input-type-wrap input,
|
||||
[dir='rtl'] .structure-input-layer-wrap input,
|
||||
@@ -1504,6 +1524,17 @@ a.hide-toggle {
|
||||
border-left-width: 0;
|
||||
border-right-width: 1px;
|
||||
}
|
||||
.structure-extras-wrap .spin-control button {
|
||||
border-bottom: 0;
|
||||
}
|
||||
[dir='ltr'] .structure-extras-wrap .spin-control button {
|
||||
border-right: 0;
|
||||
border-left-width: 1px;
|
||||
}
|
||||
[dir='rtl'] .structure-extras-wrap .spin-control button {
|
||||
border-left: 0;
|
||||
border-right-width: 1px;
|
||||
}
|
||||
|
||||
.preset-input-wrap li:last-child input {
|
||||
border-bottom-right-radius: 4px;
|
||||
@@ -1557,6 +1588,7 @@ a.hide-toggle {
|
||||
display: block;
|
||||
border-radius: 0 0 4px 4px;
|
||||
overflow: hidden;
|
||||
flex: 1 1 auto;
|
||||
}
|
||||
.form-field-multicombo:focus {
|
||||
border-bottom: 0px;
|
||||
@@ -1607,50 +1639,10 @@ a.hide-toggle {
|
||||
|
||||
/* Field - Numeric
|
||||
------------------------------------------------------- */
|
||||
input[type=number] {
|
||||
position: relative;
|
||||
padding-right: 20%;
|
||||
}
|
||||
|
||||
.spin-control {
|
||||
width: 64px;
|
||||
height: 30px;
|
||||
display: inline-block;
|
||||
margin-left: -64px;
|
||||
margin-bottom: -11px;
|
||||
position: relative;
|
||||
display: flex;
|
||||
}
|
||||
[dir='rtl'] .spin-control{
|
||||
margin-left: 0;
|
||||
margin-right: -64px;
|
||||
}
|
||||
|
||||
.spin-control button {
|
||||
right: 1px;
|
||||
position: relative;
|
||||
float: left;
|
||||
height: 100%;
|
||||
width: 32px;
|
||||
border-left: 1px solid #ccc;
|
||||
border-radius: 0;
|
||||
background: rgba(0, 0, 0, 0);
|
||||
}
|
||||
[dir='rtl'] .spin-control button{
|
||||
border-left: 0;
|
||||
border-right: 1px solid #ccc;
|
||||
}
|
||||
|
||||
.spin-control button.decrement {
|
||||
border-bottom-right-radius: 3px;
|
||||
}
|
||||
[dir='rtl'] .spin-control button.decrement {
|
||||
border-bottom-right-radius: 0;
|
||||
}
|
||||
[dir='rtl'] .spin-control button.increment {
|
||||
border-bottom-left-radius: 3px;
|
||||
right: 0;
|
||||
}
|
||||
|
||||
.spin-control button.decrement::after,
|
||||
.spin-control button.increment::after {
|
||||
content:"";
|
||||
@@ -1723,18 +1715,17 @@ input[type=number] {
|
||||
#preset-input-maxspeed_advisory,
|
||||
#preset-input-maxspeed {
|
||||
border-right: none;
|
||||
border-radius: 0 0 0 4px;
|
||||
width: 80%;
|
||||
flex: 1;
|
||||
}
|
||||
[dir='rtl'] #preset-input-maxspeed_advisory,
|
||||
[dir='rtl'] #preset-input-maxspeed {
|
||||
border-right: 1px solid #ccc;
|
||||
border-radius: 0 0 4px 0;
|
||||
}
|
||||
|
||||
.form-field .maxspeed-unit {
|
||||
border-radius: 0 0 4px 0;
|
||||
width: 20%;
|
||||
flex: 0 1 20%;
|
||||
min-width: 70px;
|
||||
}
|
||||
[dir='rtl'] .form-field .maxspeed-unit {
|
||||
border-right: 0;
|
||||
@@ -1746,55 +1737,32 @@ input[type=number] {
|
||||
------------------------------------------------------- */
|
||||
.form-field .wiki-lang {
|
||||
border-radius: 0;
|
||||
}
|
||||
.form-field .wiki-title {
|
||||
padding-right: 20%;
|
||||
}
|
||||
[dir='rtl'] .form-field .wiki-title {
|
||||
padding-left: 20%;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.form-field .wiki-title ~ .combobox-caret {
|
||||
right: 32px;
|
||||
}
|
||||
[dir='rtl'] .form-field .wiki-title ~ .combobox-caret {
|
||||
right: auto;
|
||||
left: 32px;
|
||||
flex-basis: 100%;
|
||||
}
|
||||
|
||||
|
||||
/* Field - Localized Name
|
||||
------------------------------------------------------- */
|
||||
.localized-main {
|
||||
padding-right: 12%;
|
||||
}
|
||||
[dir='rtl'] .localized-main {
|
||||
padding-left: 12%;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
button.localized-add {
|
||||
.form-field .localized-add {
|
||||
position: relative;
|
||||
right: 1px;
|
||||
width: 32px;
|
||||
margin-left: -32px;
|
||||
border: 1px solid #ccc;
|
||||
border-top-width: 0;
|
||||
border-right-width: 0;
|
||||
border-left-width: 0;
|
||||
border-radius: 0 0 4px 0;
|
||||
height: 30px;
|
||||
vertical-align: top;
|
||||
width: 32px;
|
||||
flex: 0 1 auto;
|
||||
}
|
||||
[dir='rtl'] button.localized-add {
|
||||
margin-left: 0;
|
||||
margin-right: -32px;
|
||||
border-right-width: 1px;
|
||||
[dir='rtl'] .form-field .localized-add {
|
||||
border-left-width: 1px;
|
||||
border-right-width: 0;
|
||||
border-radius: 0 0 0 4px;
|
||||
}
|
||||
|
||||
.localized-multilingual {
|
||||
padding: 0 10px;
|
||||
flex-basis: 100%;
|
||||
}
|
||||
.localized-multilingual .entry {
|
||||
position: relative;
|
||||
@@ -1817,13 +1785,12 @@ button.localized-add {
|
||||
.localized-multilingual .entry .localized-lang {
|
||||
border-radius: 0;
|
||||
border-top-width: 0;
|
||||
width: 100%;
|
||||
}
|
||||
.localized-multilingual .entry .localized-value {
|
||||
border-top-width: 0;
|
||||
border-radius: 0 0 4px 4px;
|
||||
}
|
||||
.localized-multilingual .form-label button {
|
||||
border-top-right-radius: 3px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
button.localized-add.disabled,
|
||||
@@ -2183,6 +2150,7 @@ div.combobox {
|
||||
border-radius: 0;
|
||||
border-bottom: 1px solid #ccc;
|
||||
border-left: 1px solid #ccc;
|
||||
width: 100%;
|
||||
}
|
||||
[dir='rtl'] .tag-row input {
|
||||
border-left: none;
|
||||
@@ -2191,7 +2159,7 @@ div.combobox {
|
||||
|
||||
.tag-row .key-wrap,
|
||||
.tag-row .input-wrap-position {
|
||||
flex: 1 0.5 100%;
|
||||
flex: 1;
|
||||
height: 30px;
|
||||
}
|
||||
|
||||
@@ -2222,7 +2190,7 @@ div.combobox {
|
||||
|
||||
.tag-row button {
|
||||
height: 31px;
|
||||
flex: 0 0 33px;
|
||||
width: 32px;
|
||||
border: 1px solid #ccc;
|
||||
border-top-width: 0;
|
||||
border-left-width: 0;
|
||||
@@ -2372,6 +2340,7 @@ img.tag-reference-wiki-image {
|
||||
.member-row-new .member-entity-input {
|
||||
border-radius: 4px 4px 0 0;
|
||||
border: 1px solid #cfcfcf;
|
||||
flex-basis: 100%;
|
||||
}
|
||||
|
||||
.add-relation {
|
||||
|
||||
Reference in New Issue
Block a user