CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-26 07:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:systemed/iD

Browse Source
This commit is contained in:
Ansis Brammanis
2013-03-01 15:46:38 -05:00
parent 513eeac280 00cd9c7e98
commit abc477d279
6 changed files with 37 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
css/app.css
View File

@@ -33,7 +33,8 @@ div, textarea, input, form, span, ul, li, ol, a, button {
a, button, input, textarea {
-webkit-tap-highlight-color:rgba(0,0,0,0);
-webkit-touch-callout:none;
cursor:url(../img/cursor-pointer.png) 6 1, auto;
cursor: pointer;
cursor: url(../img/cursor-pointer.png) 6 1, pointer;
}
h2 {
@@ -284,7 +285,8 @@ button:hover {
}
button.active {
cursor:url(../img/cursor-pointing.png) 6 1, auto;
cursor: pointer;
cursor: url(../img/cursor-pointing.png) 6 1, pointer;
}
button.disabled {
@@ -636,7 +638,8 @@ div.combobox {
margin-left: -15px;
margin-right: 5px;
display:inline-block;
cursor:url(../img/cursor-pointer.png) 6 1, auto;
cursor: pointer;
cursor: url(../img/cursor-pointer.png) 6 1, pointer;
border-top: 5px solid #ccc;
border-left: 5px solid transparent;
border-right: 5px solid transparent;
@@ -1648,7 +1651,8 @@ a.success-action {
.radial-menu-item {
fill: white;
cursor:url(../img/cursor-pointer.png) 6 1, auto;
cursor: pointer;
cursor: url(../img/cursor-pointer.png) 6 1, pointer;
}
.radial-menu-item:hover {

19
css/map.css
View File

@@ -682,11 +682,11 @@ text.point {
/* Cursors */
#map:hover {
cursor:url(../img/cursor-grab.png) 9 9, auto;
cursor: url(../img/cursor-grab.png) 9 9, auto;
}
#map:active {
cursor:url(../img/cursor-grabbing.png) 9 9, auto;
cursor: url(../img/cursor-grabbing.png) 9 9, auto;
}
.mode-browse .point,
@@ -727,7 +727,8 @@ text.point {
.mode-draw-area #map:hover,
.mode-add-line #map:hover,
.mode-add-area #map:hover {
cursor:url(../img/cursor-draw.png) 9 9, auto;
cursor: crosshair;
cursor: url(../img/cursor-draw.png) 9 9, crosshair;
}
.mode-draw-line .behavior-hover .way,
@@ -735,7 +736,8 @@ text.point {
.mode-add-line .behavior-hover .way,
.mode-add-area .behavior-hover .way,
.behavior-drag-node.behavior-hover .way {
cursor:url(../img/cursor-draw-connect-line.png) 9 9, auto;
cursor: crosshair;
cursor: url(../img/cursor-draw-connect-line.png) 9 9, crosshair;
}
.mode-draw-line .behavior-hover .vertex,
@@ -743,17 +745,20 @@ text.point {
.mode-add-line .behavior-hover .vertex,
.mode-add-area .behavior-hover .vertex,
.behavior-drag-node.behavior-hover .vertex {
cursor:url(../img/cursor-draw-connect-vertex.png) 9 9, auto;
cursor: crosshair;
cursor: url(../img/cursor-draw-connect-vertex.png) 9 9, crosshair;
}
.mode-add-point #map:hover {
cursor:url(../img/cursor-draw-point.png) 18 18, auto;
cursor: crosshair;
cursor: url(../img/cursor-draw-point.png) 18 18, crosshair;
}
.lasso #map:hover,
.lasso .way,
.lasso .vertex {
cursor:url(../img/cursor-draw.png) 9 9, auto;
cursor: crosshair;
cursor: url(../img/cursor-draw.png) 9 9, crosshair;
}
.lasso #map {

25
js/id/modes/select.js
View File

@@ -87,9 +87,10 @@ iD.modes.Select = function(context, selection, initial) {
}), true));
if (entity) {
context.container()
.select('.inspector-wrap')
.style('display', 'block')
var wrap = context.container()
.select('.inspector-wrap');
wrap.style('display', 'block')
.style('opacity', 1)
.datum(entity)
.call(inspector);
@@ -97,14 +98,14 @@ iD.modes.Select = function(context, selection, initial) {
if (d3.event) {
// Pan the map if the clicked feature intersects with the position
// of the inspector
var inspector_size = context.container().select('.inspector-wrap').size(),
map_size = context.map().size(),
var inspectorSize = wrap.size(),
mapSize = context.map().size(),
offset = 50,
shift_left = d3.event.clientX - map_size[0] + inspector_size[0] + offset,
center = (map_size[0] / 2) + shift_left + offset;
shiftLeft = d3.event.clientX - mapSize[0] + inspectorSize[0] + offset,
center = (mapSize[0] / 2) + shiftLeft + offset;
if (shift_left > 0 && inspector_size[1] > d3.event.clientY) {
context.map().centerEase(context.projection.invert([center, map_size[1]/2]));
if (shiftLeft > 0 && inspectorSize[1] > d3.event.clientY) {
context.map().centerEase(context.projection.invert([center, mapSize[1]/2]));
}
}
@@ -189,12 +190,6 @@ iD.modes.Select = function(context, selection, initial) {
};
mode.exit = function() {
/*
if (singular()) {
changeTags(singular(), inspector.tags());
}
*/
if (timeout) window.clearTimeout(timeout);
context.container()

3
js/id/svg/points.js
View File

@@ -52,7 +52,8 @@ iD.svg.Points = function(projection) {
// sets the data (point entity) on the element
groups.select('image')
.attr('xlink:href', imageHref);
groups.select('.shadow, .stroke');
groups.select('.shadow');
groups.select('.stroke');
groups.exit()
.remove();

6
js/id/svg/vertices.js
View File

@@ -39,8 +39,10 @@ iD.svg.Vertices = function(projection) {
.classed('shared', function(entity) { return graph.isShared(entity); });
// Selecting the following implicitly
// sets the data (vertix entity) on the elements
groups.select('circle.fill, circle.stroke, circle.shadow');
// sets the data (vertex entity) on the elements
groups.select('circle.fill');
groups.select('circle.stroke');
groups.select('circle.shadow');
groups.exit()
.remove();

2
locale/en.js
View File

@@ -8,7 +8,7 @@ locale.en = {
add_line: {
title: "Line",
description: "Lines can be highways, streets, pedestrian paths, or even canals.",
tail: "Click on the map to start drawing an road, path, or route."
tail: "Click on the map to start drawing a road, path, or route."
},
add_point: {
title: "Point",