diff --git a/css/20_map.css b/css/20_map.css index a715b6bf0..6ec2927ba 100644 --- a/css/20_map.css +++ b/css/20_map.css @@ -87,14 +87,8 @@ g.point .stroke { fill: #fff; } +g.point .shadow, g.note .shadow { - fill: none; - stroke: #f6634f; - stroke-width: 8; - stroke-opacity: 0; -} - -g.point .shadow { fill: none; stroke: #f6634f; stroke-width: 16; diff --git a/css/55_cursors.css b/css/55_cursors.css index 8247876db..466e21ae2 100644 --- a/css/55_cursors.css +++ b/css/55_cursors.css @@ -58,7 +58,8 @@ .mode-draw-area #map, .mode-add-line #map, .mode-add-area #map, -.mode-drag-node #map { +.mode-drag-node #map, +.mode-drag-note #map { cursor: crosshair; /* Opera */ cursor: url(img/cursor-draw.png) 9 9, crosshair; /* FF */ } diff --git a/css/65_data.css b/css/65_data.css index 3267a0d5c..bae3c4818 100644 --- a/css/65_data.css +++ b/css/65_data.css @@ -23,7 +23,7 @@ } .note-header-icon.new .note-fill, .layer-notes .note.new .note-fill { - color: #00bcdd; + color: #ffee00; stroke: #333; } .note-header-icon.closed .note-fill, diff --git a/modules/svg/notes.js b/modules/svg/notes.js index f4f5048ec..bc97adb55 100644 --- a/modules/svg/notes.js +++ b/modules/svg/notes.js @@ -19,7 +19,7 @@ export function svgNotes(projection, context, dispatch) { selection .attr('class', klass) .attr('transform', 'translate(-8, -22)') - .attr('d', 'm17.49424,0l-14.99506,0c-1.37845,0 -2.49918,1.12072 -2.49918,2.49918l0,11.24629c0,1.37845 1.12072,2.49918 2.49918,2.49918l3.74876,0l0,3.28017c0,0.38269 0.43736,0.60527 0.74585,0.37878l4.8773,-3.65895l5.62315,0c1.37845,0 2.49918,-1.12072 2.49918,-2.49918l0,-11.24629c0,-1.37845 -1.12072,-2.49918 -2.49918,-2.49918z'); + .attr('d', 'm17.5,0l-15,0c-1.37,0 -2.5,1.12 -2.5,2.5l0,11.25c0,1.37 1.12,2.5 2.5,2.5l3.75,0l0,3.28c0,0.38 0.43,0.6 0.75,0.37l4.87,-3.65l5.62,0c1.37,0 2.5,-1.12 2.5,-2.5l0,-11.25c0,-1.37 -1.12,-2.5 -2.5,-2.5z'); } function init() { @@ -102,10 +102,6 @@ export function svgNotes(projection, context, dispatch) { .attr('class', function(d) { return 'note note-' + d.id + ' ' + d.status; }) .classed('new', function(d) { return d.id < 0; }); - notesEnter - .append('path') - .call(markerPath, 'shadow'); - notesEnter .append('ellipse') .attr('cx', 0.5) @@ -114,6 +110,10 @@ export function svgNotes(projection, context, dispatch) { .attr('ry', 3) .attr('class', 'stroke'); + notesEnter + .append('path') + .call(markerPath, 'shadow'); + notesEnter .append('use') .attr('class', 'note-fill')