Merge branch 'master' into overpass

[rails.git] / vendor / assets / iD / iD.css.erb

diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb
index f4a802698d3fed9fe5a428222066100833591dce..8dc575aa85f029243eb3859a8bb856fa1e7c218c 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -404,6 +404,10 @@ path.stroke.tag-landuse-quarry {
     stroke: #a6957b;
 }
 
+path.stroke.tag-landuse-landfill {
+    stroke: #ff9933;
+}
+
 path.stroke.tag-landuse-residential,
 path.stroke.tag-landuse-construction {
     stroke: #e06e5f;
@@ -472,6 +476,12 @@ path.fill.tag-landuse-reservoir {
 
 path.fill.tag-landuse-quarry {
     fill: #a6957b;
+    fill-opacity: 0.2;
+}
+
+path.fill.tag-landuse-landfill {
+    fill: #ff8800;
+    fill-opacity: 0.2;
 }
 
 path.fill.tag-landuse-residential {
@@ -1585,7 +1595,7 @@ button {
     display: inline-block;
     height:40px;
     border-radius:4px;
-    /* Crashes Safari: https://github.com/systemed/iD/issues/1188 */
+    /* Crashes Safari: https://github.com/openstreetmap/iD/issues/1188 */
     /*-webkit-transition: all 100ms;*/
        -moz-transition: all 100ms;
          -o-transition: all 100ms;
@@ -2732,14 +2742,13 @@ input[type=number] {
 
 .form-field .addr-number {
     width: 33.3333%;
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 0;
+    border: 0;
     border-radius: 0;
 }
 
 .form-field .addr-street {
     width: 66.6666%;
+    border-top: 0;
     border-right: 0;
     border-bottom: 0;
     border-radius: 0;
@@ -2929,6 +2938,7 @@ button.minor.tag-reference-loading {
 
 .tag-reference-body {
     overflow: hidden;
+    clear: both;
 }
 
 .tag-reference-body p,