diff --git a/css/app.css b/css/app.css index 247fab1b5..865c92a70 100644 --- a/css/app.css +++ b/css/app.css @@ -1036,6 +1036,7 @@ button.save.has-count .count::before { min-height: 30px; border-top: 0; border-radius: 0 0 4px 4px; + overflow: hidden; } .form-field textarea { diff --git a/css/map.css b/css/map.css index 6f6aae0dd..6750da041 100644 --- a/css/map.css +++ b/css/map.css @@ -24,8 +24,14 @@ img.tile-removing { use { pointer-events: none; } /* base styles */ -.layer path:not(.oneway) { fill: none; } -.layer use path { fill: #333; } /* FF svg icons */ +.layer path:not(.oneway) { fill: none; } /* IE needs :not(.oneway) */ + +/* the above fill: none rule affects paths in shadow dom only in Firefox */ +.layer use.icon path { fill: #333; } /* FF svg Maki icons */ +.layer .turn use path { fill: #000; } /* FF turn restriction icons */ +#turn-only-shape2, #turn-only-u-shape2 { fill: #7092FF; } /* FF turn-only, turn-only-u */ +#turn-no-shape2, #turn-no-u-shape2 { fill: #E06D5F; } /* FF turn-no, turn-no-u */ +#turn-yes-shape2, #turn-yes-u-shape2 { fill: #8CD05F; } /* FF turn-yes, turn-yes-u */ g.point .shadow, g.vertex .shadow, @@ -1560,7 +1566,7 @@ text.gpx { } .fill-wireframe .point, -.fill-wireframe .icon, +.fill-wireframe .areaicon, .fill-wireframe path.casing, .fill-wireframe path.fill, .fill-wireframe path.oneway { diff --git a/js/id/svg/labels.js b/js/id/svg/labels.js index cdaff2d10..e85a9df9c 100644 --- a/js/id/svg/labels.js +++ b/js/id/svg/labels.js @@ -167,6 +167,7 @@ iD.svg.Labels = function(projection, context) { icons.enter() .append('use') + .attr('class', 'icon areaicon') .attr('width', '18px') .attr('height', '18px'); diff --git a/js/id/svg/turns.js b/js/id/svg/turns.js index e8f08ff71..98955ec98 100644 --- a/js/id/svg/turns.js +++ b/js/id/svg/turns.js @@ -28,6 +28,7 @@ iD.svg.Turns = function(projection) { .attr('height', '24'); nEnter.append('use') + .attr('transform', 'translate(-22, -12)') .attr('width', '44') .attr('height', '24'); @@ -38,6 +39,7 @@ iD.svg.Turns = function(projection) { .attr('r', '16'); uEnter.append('use') + .attr('transform', 'translate(-16, -16)') .attr('width', '32') .attr('height', '32'); diff --git a/js/id/svg/vertices.js b/js/id/svg/vertices.js index 8739c8280..73b971880 100644 --- a/js/id/svg/vertices.js +++ b/js/id/svg/vertices.js @@ -70,7 +70,7 @@ iD.svg.Vertices = function(projection, context) { return icons[entity.id]; } - function classCircle(klass) { + function setClass(klass) { return function(entity) { this.setAttribute('class', 'node vertex ' + klass + ' ' + entity.id); }; @@ -110,10 +110,10 @@ iD.svg.Vertices = function(projection, context) { .attr('class', function(d) { return 'node vertex ' + klass + ' ' + d.id; }); enter.append('circle') - .each(classCircle('shadow')); + .each(setClass('shadow')); enter.append('circle') - .each(classCircle('stroke')); + .each(setClass('stroke')); // Vertices with icons get a `use`. enter.filter(function(d) { return icon(d); }) @@ -121,12 +121,13 @@ iD.svg.Vertices = function(projection, context) { .attr('transform', 'translate(-6, -6)') .attr('xlink:href', function(d) { return '#' + icon(d) + '-12'; }) .attr('width', '12px') - .attr('height', '12px'); + .attr('height', '12px') + .each(setClass('icon')); // Vertices with tags get a fill. enter.filter(function(d) { return d.hasInterestingTags(); }) .append('circle') - .each(classCircle('fill')); + .each(setClass('fill')); groups .attr('transform', iD.svg.PointTransform(projection)) diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json index ec3eec18e..35c830866 100644 --- a/svg/iD-sprite.json +++ b/svg/iD-sprite.json @@ -239,12 +239,12 @@ "restriction": { "viewBox": "480 260 60 60" }, "multipolygon": { "viewBox": "540 260 60 60" }, - "turn-yes": { "viewBox": "200 320 44 24", "x": "-22", "y": "-12" }, - "turn-no": { "viewBox": "244 320 44 24", "x": "-22", "y": "-12" }, - "turn-only": { "viewBox": "288 320 44 24", "x": "-22", "y": "-12" }, - "turn-yes-u": { "viewBox": "200 344 32 32", "x": "-16", "y": "-16" }, - "turn-no-u": { "viewBox": "232 344 32 32", "x": "-16", "y": "-16" }, - "turn-only-u": { "viewBox": "264 344 32 32", "x": "-16", "y": "-16" }, + "turn-yes": { "viewBox": "200 320 44 24" }, + "turn-no": { "viewBox": "244 320 44 24" }, + "turn-only": { "viewBox": "288 320 44 24" }, + "turn-yes-u": { "viewBox": "200 344 32 32" }, + "turn-no-u": { "viewBox": "232 344 32 32" }, + "turn-only-u": { "viewBox": "264 344 32 32" }, "preset-icon-frame": { "viewBox": "340 320 45 45" }, diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw index 5383b6c02..72f84151a 100644 Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg index 1132d2fe9..2ffb8b581 100644 --- a/svg/iD-sprite.src.svg +++ b/svg/iD-sprite.src.svg @@ -181,34 +181,34 @@ - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + +