mirror of
https://github.com/FoggedLens/iD.git
synced 2026-05-27 18:32:25 +02:00
Merge branch 'master' into validation
This commit is contained in:
Quincy Morgan
+58
-41
@@ -1,7 +1,7 @@
|
||||
|
||||
/* Default - light gray */
|
||||
path.area.stroke {
|
||||
stroke: #ddd;
|
||||
stroke: rgb(170, 170, 170);
|
||||
stroke-width: 1;
|
||||
}
|
||||
path.area.fill {
|
||||
@@ -21,6 +21,7 @@ path.stroke.old-multipolygon {
|
||||
stroke-linecap: butt;
|
||||
}
|
||||
|
||||
|
||||
/* Green things */
|
||||
path.stroke.tag-landuse,
|
||||
path.stroke.tag-natural,
|
||||
@@ -73,18 +74,21 @@ path.fill.tag-landuse-grass {
|
||||
fill: rgba(140, 208, 95, 0.3);
|
||||
}
|
||||
|
||||
|
||||
/* Blue things */
|
||||
path.stroke.tag-amenity-fountain,
|
||||
path.stroke.tag-amenity-swimming_pool,
|
||||
path.stroke.tag-leisure-swimming_pool,
|
||||
path.stroke.tag-natural-water,
|
||||
path.stroke.tag-landuse-aquaculture,
|
||||
path.stroke.tag-landuse-basin,
|
||||
path.stroke.tag-landuse-harbour,
|
||||
path.stroke.tag-landuse-reservoir,
|
||||
path.stroke.tag-man_made-groyne,
|
||||
path.stroke.tag-man_made-breakwater {
|
||||
path.stroke.tag-man_made-breakwater,
|
||||
path.stroke.tag-natural-water {
|
||||
stroke: rgb(119, 211, 222);
|
||||
}
|
||||
path.fill.tag-amenity-fountain,
|
||||
path.fill.tag-amenity-swimming_pool,
|
||||
path.fill.tag-leisure-swimming_pool,
|
||||
path.fill.tag-landuse-aquaculture,
|
||||
@@ -95,9 +99,7 @@ path.fill.tag-natural-water {
|
||||
stroke: rgba(119, 211, 222, 0.3);
|
||||
fill: rgba(119, 211, 222, 0.3);
|
||||
}
|
||||
path.fill.tag-amenity-fountain {
|
||||
fill: rgba(119, 211, 222, 0.3);
|
||||
}
|
||||
.preset-icon-fill-area.tag-amenity-fountain,
|
||||
.preset-icon-fill-area.tag-amenity-swimming_pool,
|
||||
.preset-icon-fill-area.tag-leisure-swimming_pool,
|
||||
.preset-icon-fill-area.tag-landuse-aquaculture,
|
||||
@@ -114,13 +116,12 @@ path.fill.tag-amenity-fountain {
|
||||
fill: rgba(119, 211, 222, 0.3);
|
||||
}
|
||||
|
||||
|
||||
/* Yellow things */
|
||||
.pattern-color-beach,
|
||||
.pattern-color-sand,
|
||||
.pattern-color-scrub {
|
||||
fill: rgba(255, 255, 148, 0.2);
|
||||
}
|
||||
path.stroke.tag-leisure-pitch.tag-sport-beachvolleyball,
|
||||
path.stroke.tag-leisure-pitch.tag-sport-baseball,
|
||||
path.stroke.tag-leisure-pitch.tag-sport-softball,
|
||||
path.stroke.tag-leisure-track,
|
||||
path.stroke.tag-natural-beach,
|
||||
path.stroke.tag-natural-sand,
|
||||
path.stroke.tag-natural-scrub,
|
||||
@@ -132,6 +133,9 @@ path.stroke.tag-amenity-university {
|
||||
stroke: rgba(255, 255, 148, 0.75);
|
||||
}
|
||||
path.fill.tag-leisure-pitch.tag-sport-beachvolleyball,
|
||||
path.fill.tag-leisure-pitch.tag-sport-baseball,
|
||||
path.fill.tag-leisure-pitch.tag-sport-softball,
|
||||
path.fill.tag-leisure-track,
|
||||
path.fill.tag-natural-beach,
|
||||
path.fill.tag-natural-sand,
|
||||
path.fill.tag-natural-scrub,
|
||||
@@ -140,10 +144,13 @@ path.fill.tag-amenity-kindergarten,
|
||||
path.fill.tag-amenity-school,
|
||||
path.fill.tag-amenity-college,
|
||||
path.fill.tag-amenity-university {
|
||||
stroke: rgba(255, 255, 148, 0.15);
|
||||
fill: rgba(255, 255, 148, 0.15);
|
||||
stroke: rgba(255, 255, 148, 0.25);
|
||||
fill: rgba(255, 255, 148, 0.25);
|
||||
}
|
||||
.preset-icon-fill-area.tag-leisure-pitch.tag-sport-beachvolleyball,
|
||||
.preset-icon-fill-area.tag-leisure-pitch.tag-sport-baseball,
|
||||
.preset-icon-fill-area.tag-leisure-pitch.tag-sport-softball,
|
||||
.preset-icon-fill-area.tag-leisure-track,
|
||||
.preset-icon-fill-area.tag-natural-beach,
|
||||
.preset-icon-fill-area.tag-natural-sand,
|
||||
.preset-icon-fill-area.tag-natural-scrub,
|
||||
@@ -153,13 +160,16 @@ path.fill.tag-amenity-university {
|
||||
.preset-icon-fill-area.tag-amenity-college,
|
||||
.preset-icon-fill-area.tag-amenity-university {
|
||||
border-color: rgb(232, 232, 0);
|
||||
background-color: rgba(255, 255, 148, 0.15);
|
||||
background-color: rgba(255, 255, 148, 0.25);
|
||||
}
|
||||
.pattern-color-beach,
|
||||
.pattern-color-sand,
|
||||
.pattern-color-scrub {
|
||||
fill: rgba(255, 255, 148, 0.2);
|
||||
}
|
||||
|
||||
|
||||
/* Gold things */
|
||||
.pattern-color-construction {
|
||||
fill: rgba(196, 189, 25, 0.3);
|
||||
}
|
||||
path.stroke.tag-landuse-residential,
|
||||
path.stroke.tag-landuse-construction {
|
||||
stroke: rgb(196, 189, 25);
|
||||
@@ -173,6 +183,10 @@ path.fill.tag-landuse-residential {
|
||||
border-color: rgb(196, 189, 25);
|
||||
background: rgba(196, 189, 25, 0.3);
|
||||
}
|
||||
.pattern-color-construction {
|
||||
fill: rgba(196, 189, 25, 0.3);
|
||||
}
|
||||
|
||||
|
||||
/* Orange things */
|
||||
path.stroke.tag-landuse-retail,
|
||||
@@ -198,8 +212,7 @@ path.fill.tag-landuse-military {
|
||||
border-color: rgb(214, 136, 26);
|
||||
background-color: rgba(214, 136, 26, 0.3);
|
||||
}
|
||||
.pattern-color-landfill
|
||||
{
|
||||
.pattern-color-landfill {
|
||||
fill: rgba(214, 136, 26, 0.3);
|
||||
}
|
||||
|
||||
@@ -220,14 +233,8 @@ path.fill.tag-power-plant {
|
||||
background-color: rgba(228, 164, 245, 0.3);
|
||||
}
|
||||
|
||||
|
||||
/* Teal things */
|
||||
.pattern-color-wetland,
|
||||
.pattern-color-wetland_marsh,
|
||||
.pattern-color-wetland_swamp,
|
||||
.pattern-color-wetland_bog,
|
||||
.pattern-color-wetland_reedbed {
|
||||
fill: rgba(153, 225, 170, 0.3);
|
||||
}
|
||||
path.stroke.tag-natural-wetland {
|
||||
stroke: rgb(153, 225, 170);
|
||||
}
|
||||
@@ -235,19 +242,16 @@ path.stroke.tag-natural-wetland {
|
||||
border-color: rgb(153, 225, 170);
|
||||
background-color: rgba(153, 225, 170, 0.2);
|
||||
}
|
||||
.pattern-color-wetland,
|
||||
.pattern-color-wetland_marsh,
|
||||
.pattern-color-wetland_swamp,
|
||||
.pattern-color-wetland_bog,
|
||||
.pattern-color-wetland_reedbed {
|
||||
fill: rgba(153, 225, 170, 0.3);
|
||||
}
|
||||
|
||||
|
||||
/* Light Green things */
|
||||
.pattern-color-cemetery,
|
||||
.pattern-color-cemetery_christian,
|
||||
.pattern-color-cemetery_buddhist,
|
||||
.pattern-color-cemetery_muslim,
|
||||
.pattern-color-cemetery_jewish,
|
||||
.pattern-color-orchard,
|
||||
.pattern-color-vineyard,
|
||||
.pattern-color-meadow,
|
||||
.pattern-color-farmland {
|
||||
fill: rgba(191, 232, 63, 0.2);
|
||||
}
|
||||
path.stroke.tag-landuse-cemetery,
|
||||
path.stroke.tag-landuse-orchard,
|
||||
path.stroke.tag-landuse-vineyard,
|
||||
@@ -262,6 +266,18 @@ path.stroke.tag-landuse-farmland {
|
||||
.preset-icon-fill-area.tag-landuse-farmland {
|
||||
background-color: rgba(191, 232, 63, 0.2);
|
||||
}
|
||||
.pattern-color-cemetery,
|
||||
.pattern-color-cemetery_christian,
|
||||
.pattern-color-cemetery_buddhist,
|
||||
.pattern-color-cemetery_muslim,
|
||||
.pattern-color-cemetery_jewish,
|
||||
.pattern-color-orchard,
|
||||
.pattern-color-vineyard,
|
||||
.pattern-color-meadow,
|
||||
.pattern-color-farmland {
|
||||
fill: rgba(191, 232, 63, 0.2);
|
||||
}
|
||||
|
||||
|
||||
/* Tan things */
|
||||
path.stroke.tag-landuse-farmyard {
|
||||
@@ -279,6 +295,7 @@ path.fill.tag-landuse-farmyard {
|
||||
fill: rgba(245, 220, 186, 0.3);
|
||||
}
|
||||
|
||||
|
||||
/* Dark Gray things */
|
||||
path.stroke.tag-amenity-parking,
|
||||
path.stroke.tag-leisure-pitch.tag-sport-basketball,
|
||||
@@ -287,7 +304,7 @@ path.stroke.tag-natural-bare_rock,
|
||||
path.stroke.tag-natural-scree,
|
||||
path.stroke.tag-landuse-railway,
|
||||
path.stroke.tag-landuse-quarry {
|
||||
stroke: #bbb;
|
||||
stroke: rgb(170, 170, 170);
|
||||
}
|
||||
path.fill.tag-amenity-parking,
|
||||
path.fill.tag-leisure-pitch.tag-sport-basketball,
|
||||
@@ -309,15 +326,15 @@ path.fill.tag-landuse-quarry {
|
||||
border-color: rgb(170, 170, 170);
|
||||
background-color: rgba(140, 140, 140, 0.5);
|
||||
}
|
||||
.pattern-color-quarry
|
||||
{
|
||||
.pattern-color-quarry {
|
||||
fill: rgba(140, 140, 140, 0.5);
|
||||
}
|
||||
|
||||
|
||||
/* Light gray overrides */
|
||||
path.stroke.tag-natural-cave_entrance,
|
||||
path.stroke.tag-natural-glacier {
|
||||
stroke: #ddd;
|
||||
stroke: rgb(170, 170, 170);
|
||||
}
|
||||
path.fill.tag-natural-cave_entrance,
|
||||
path.fill.tag-natural-glacier {
|
||||
|
||||
+71
-46
@@ -452,6 +452,7 @@ button[disabled].action:hover {
|
||||
align-items: center;
|
||||
padding: 0 10px;
|
||||
min-width: 30px;
|
||||
white-space: nowrap;
|
||||
}
|
||||
.tool-group button .icon {
|
||||
flex: 0 0 20px;
|
||||
@@ -1420,52 +1421,73 @@ img.tag-reference-wiki-image {
|
||||
.form-field-input-combo > input:only-of-type {
|
||||
border-radius: 0 0 4px 4px;
|
||||
}
|
||||
.form-field-input-combo.empty-combobox input,
|
||||
.form-field-input-multicombo .empty-combobox input {
|
||||
padding-right: 10px;
|
||||
padding-left: 10px;
|
||||
}
|
||||
.form-field-input-combo.empty-combobox .combobox-caret,
|
||||
.form-field-input-multicombo .empty-combobox .combobox-caret {
|
||||
display: none;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo ul.chiplist {
|
||||
padding: 5px 0 5px 10px;
|
||||
padding: 5px 7px 5px 7px;
|
||||
background: #fff;
|
||||
display: block;
|
||||
border-radius: 0 0 4px 4px;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo li.chips {
|
||||
background-color: #eff2f7;
|
||||
border: 1px solid #ccd5e3;
|
||||
line-height: 25px;
|
||||
padding: 2px 0px 2px 5px;
|
||||
}
|
||||
.form-field-input-multicombo li {
|
||||
display: inline-flex;
|
||||
flex-flow: row nowrap;
|
||||
align-items: center;
|
||||
background-color: #eff2f7;
|
||||
border: 1px solid #ccd5e3;
|
||||
border-radius: 4px;
|
||||
line-height: 25px;
|
||||
padding: 2px 5px;
|
||||
margin: 3px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo a {
|
||||
font-family: Arial, Helvetica, sans-serif !important;
|
||||
font-size: 16px !important;
|
||||
line-height: 24px;
|
||||
line-height: 22px;
|
||||
float: right;
|
||||
margin: 1px 0 0 5px;
|
||||
padding: 0;
|
||||
padding: 0px 5px 0px 5px;
|
||||
margin: 0;
|
||||
cursor: pointer;
|
||||
color: #a6b4ce;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo input {
|
||||
.form-field-input-multicombo .input-wrap {
|
||||
border: 1px solid #ddd;
|
||||
width: 100px;
|
||||
margin: 3px;
|
||||
height: 31px;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo .combobox-caret {
|
||||
margin: 3px 3px 3px -30px;
|
||||
.form-field-input-multicombo input {
|
||||
border: none;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo input:focus {
|
||||
border-radius: 4px !important;
|
||||
}
|
||||
|
||||
.form-field-input-multicombo .full-line-chips li {
|
||||
display: block;
|
||||
}
|
||||
.form-field-input-multicombo .full-line-chips li:not(:last-child) {
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
.form-field-input-multicombo .full-line-chips .input-wrap {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
|
||||
/* Field - Text / Numeric
|
||||
------------------------------------------------------- */
|
||||
@@ -2106,7 +2128,7 @@ div.combobox {
|
||||
}
|
||||
.tag-row .key-wrap,
|
||||
.tag-row .value-wrap {
|
||||
flex: 1 1 auto;
|
||||
flex: 1 1 50%;
|
||||
}
|
||||
|
||||
.tag-row.readonly,
|
||||
@@ -2203,22 +2225,6 @@ div.combobox {
|
||||
border-right-width: 0;
|
||||
}
|
||||
|
||||
/* Adding form fields to tag editor */
|
||||
.raw-tag-editor .add-tag {
|
||||
width: 40%;
|
||||
height: 30px;
|
||||
border-top: 0;
|
||||
background: rgba(0,0,0,.5);
|
||||
border-radius: 0 0 4px 4px;
|
||||
}
|
||||
.raw-tag-editor .add-tag:focus,
|
||||
.raw-tag-editor .add-tag:hover {
|
||||
background: rgba(0,0,0,.8);
|
||||
}
|
||||
.raw-tag-editor .add-tag .label {
|
||||
display: none;
|
||||
}
|
||||
|
||||
/* Tag reference */
|
||||
.tag-reference-loading {
|
||||
background-color: #f5f5f5;
|
||||
@@ -2303,18 +2309,6 @@ div.combobox {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.add-relation {
|
||||
width: 40%;
|
||||
height: 30px;
|
||||
background: rgba(0,0,0,.5);
|
||||
border-radius: 4px;
|
||||
margin-top: 10px;
|
||||
}
|
||||
.add-relation:focus,
|
||||
.add-relation:hover {
|
||||
background: rgba(0,0,0,.8);
|
||||
}
|
||||
|
||||
/* preserve extra space at bottom of inspector to allow for dropdown options - #5280 */
|
||||
.raw-membership-editor.inspector-inner {
|
||||
margin-bottom: 150px;
|
||||
@@ -2329,6 +2323,38 @@ input.key-trap {
|
||||
}
|
||||
|
||||
|
||||
/* add tag, add relation buttons */
|
||||
.add-row {
|
||||
display: flex;
|
||||
width: 100%;
|
||||
flex-flow: row nowrap;
|
||||
}
|
||||
.add-row .add-tag,
|
||||
.add-row .add-relation,
|
||||
.add-row .space-value {
|
||||
flex: 1 1 50%;
|
||||
}
|
||||
.add-row .space-buttons {
|
||||
flex: 0 0 62px;
|
||||
}
|
||||
.add-row button {
|
||||
height: 30px;
|
||||
background: rgba(0,0,0,.5);
|
||||
}
|
||||
.add-row button:focus,
|
||||
.add-row button:hover {
|
||||
background: rgba(0,0,0,.8);
|
||||
}
|
||||
|
||||
.add-tag {
|
||||
border-radius: 0 0 4px 4px;
|
||||
}
|
||||
.add-relation {
|
||||
margin-top: 10px;
|
||||
border-radius: 4px;
|
||||
}
|
||||
|
||||
|
||||
/* Inspector (hover styles)
|
||||
------------------------------------------------------- */
|
||||
.inspector-hover .form-field-input-wrap .label,
|
||||
@@ -2369,12 +2395,11 @@ input.key-trap {
|
||||
.inspector-hover .preset-list-button-wrap .tag-reference-button,
|
||||
.inspector-hover label input[type="checkbox"],
|
||||
.inspector-hover label input[type="radio"],
|
||||
.inspector-hover .form-field-input-multicombo .combobox-input,
|
||||
.inspector-hover .form-field-input-multicombo .input-wrap,
|
||||
.inspector-hover .form-field-input-radio label,
|
||||
.inspector-hover .form-field-input-radio label span,
|
||||
.inspector-hover .form-field-input-radio label.remove .icon,
|
||||
.inspector-hover .inspector-inner .add-tag,
|
||||
.inspector-hover .inspector-inner .add-relation {
|
||||
.inspector-hover .inspector-inner .add-row {
|
||||
display: none;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user