Merge remote-tracking branch 'upstream/pull/2294'

[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 03c942bb2d578448760d72015b01fd5cc1dc178f..0b837c6eafcec5ab448e00bcbfb8cb6328164213 100644 (file)
--- a/vendor/assets/iD/iD.css.erb
+++ b/vendor/assets/iD/iD.css.erb
@@ -1581,8 +1581,8 @@ path.line.stroke.tag-railway-subway {
     color: #7dd;
     fill: #7dd;
 }
-.preset-icon .icon.tag-type-waterway,
-.preset-icon .icon.tag-waterway {
+.preset-icon .icon.tag-type-waterway:not(.tag-waterway-dam),
+.preset-icon .icon.tag-waterway:not(.tag-waterway-dam) {
     color: #7dd;
     fill: #fff;
 }
@@ -1608,14 +1608,14 @@ path.area.fill.tag-waterway-fuel {
 }
 
 /* lines */
-path.line.fill.tag-waterway {
+path.line.fill.tag-waterway:not(.tag-waterway-dam) {
     stroke: rgba(119, 211, 222, 0.3);
     fill: rgba(119, 211, 222, 0.3);
 }
-path.line.casing.tag-waterway {
+path.line.casing.tag-waterway:not(.tag-waterway-dam) {
     stroke: #444;
 }
-path.line.stroke.tag-waterway {
+path.line.stroke.tag-waterway:not(.tag-waterway-dam) {
     stroke: #7dd;
 }