Commit Graph

2797 Commits

Author SHA1 Message Date
Ansis Brammanis
cdfd5dfc27 use road category, and other line icons 2013-03-21 11:57:00 -04:00
Saman Bemel-Benrud
e96bb2eae0 better canal icon. 2013-03-21 11:38:00 -04:00
Saman Bemel-Benrud
773db5add7 fixes to line preset icons. 2013-03-21 11:34:07 -04:00
Ansis Brammanis
91e1d6c7a2 show back icon when hovering over the header
instead of just when hovering over the button.
Hopefully this makes the button a bit more discoverable.
2013-03-21 10:51:23 -04:00
Ansis Brammanis
217da9ad3b Merge pull request #1098 from 1ec5/patch-1
Corrected highway=bridleway preset
2013-03-21 07:33:06 -07:00
Minh Nguyễn
88f3cbe6ba Corrected highway=bridleway preset
It was copy-pasted from highway=steps.
2013-03-21 04:41:38 -07:00
Ansis Brammanis
dcc60cb497 inline categories for preset grid 2013-03-21 00:22:50 -04:00
saman bb
79014025ef hover state for back button, closes #1094 2013-03-20 23:58:31 -04:00
Saman Bemel-Benrud
ee10ffeb60 Merge branch 'master' of github.com:systemed/iD 2013-03-20 19:12:18 -04:00
Saman Bemel-Benrud
4794fe4895 making things actually fit in the header. 2013-03-20 19:12:06 -04:00
John Firebaugh
55108a21c8 Fix preset search 2013-03-20 15:56:03 -07:00
John Firebaugh
d4065cde86 Build, update translations 2013-03-20 15:55:53 -07:00
Ansis Brammanis
0a989b2eae add presets and icons for line icons 2013-03-20 18:45:37 -04:00
Saman Bemel-Benrud
bafc02076a Merge branch 'fixos' 2013-03-20 18:07:44 -04:00
Saman Bemel-Benrud
566414f698 resolved conflict, tweaked some icons. 2013-03-20 18:02:06 -04:00
John Firebaugh
a9926d4a83 Few more presets, build 2013-03-20 14:54:44 -07:00
John Firebaugh
855156ce7d Historic presets 2013-03-20 14:54:44 -07:00
John Firebaugh
b0951f7669 Barrier presets 2013-03-20 14:54:44 -07:00
John Firebaugh
541870c202 Power presets 2013-03-20 14:54:43 -07:00
John Firebaugh
c3a68dc32d Add presets for 50 most common shop values 2013-03-20 14:54:43 -07:00
Ansis Brammanis
cf2e111fcb add preset icon to back button, and fix margins 2013-03-20 17:46:22 -04:00
Ansis Brammanis
d9f12f7942 make map cursor selectors more specific 2013-03-20 17:35:34 -04:00
Saman Bemel-Benrud
4a13114cc7 minor tweak to line preset svg. 2013-03-20 17:32:51 -04:00
Saman Bemel-Benrud
27f18793e7 one more i forgot, highway-track 2013-03-20 17:32:25 -04:00
Saman Bemel-Benrud
9dec370af4 re-organizing line-presets 2013-03-20 17:15:22 -04:00
Ansis Brammanis
9a309c5009 don't hardcode sprite size
it can change any time the sprite is rebaked
2013-03-20 17:09:25 -04:00
Saman Bemel-Benrud
bd76219da7 more line-presets 2013-03-20 17:07:54 -04:00
Saman Bemel-Benrud
362159e7fa more preset icons. 2013-03-20 17:02:04 -04:00
Saman Bemel-Benrud
e1bf242ec6 more preset icons. 2013-03-20 16:42:40 -04:00
Ansis Brammanis
395a0689d8 build sprite directly from svg
`makesprite` now reads ids from the line-presets svg,
exports them as pngs using inkscape,
and then builds the sprite with  maki icons
2013-03-20 16:34:36 -04:00
Tom MacWright
69650c8e98 Merge pull request #1093 from systemed/layers
Layers
2013-03-20 13:12:44 -07:00
Tom MacWright
5c5c250838 Detect file and drag and drop support 2013-03-20 16:12:14 -04:00
Tom MacWright
f6fe9bfdbf Merge branch 'master' into layers 2013-03-20 16:04:09 -04:00
Tom MacWright
0d2295817d Fix tests 2013-03-20 16:03:07 -04:00
Tom MacWright
51d915c8a6 Refactoring and fixing layers
* Fixed opacity control
* Reorganize layer switcher
* Add GPX item to menu
* Allow user to cinch to GPX extent

Needs:

* Moderate refactoring
* Possibly a specific 'layerchange event'
* Dropping GPX on the map should be a behavior, probably, instead of in
  the layer
* Layers, if we want them, should be named rather than just have list
  indices
* A better icon for zoom to extent and for that icon to be properly
  placed
2013-03-20 15:59:15 -04:00
John Firebaugh
b517dcaa41 Add ref field to highways 2013-03-20 12:50:52 -07:00
Ansis Brammanis
d8967d5015 Remove name seperator in editor 2013-03-20 15:40:07 -04:00
Ansis Brammanis
64ad80c5c6 move preset icon and type name into header 2013-03-20 15:29:30 -04:00
Saman Bemel-Benrud
440706145d adding more line presets, resizing them. 2013-03-20 15:21:01 -04:00
Saman Bemel-Benrud
6b7a0ec058 more line icons. 2013-03-20 13:38:24 -04:00
Saman Bemel-Benrud
279ff5fba0 adding more line presets. 2013-03-20 13:38:24 -04:00
Ansis Brammanis
febe8dc224 hide preset descriptions when updating grid 2013-03-20 12:49:02 -04:00
Saman Bemel-Benrud
e988ffea14 adding delete back into tag editor, closes #1088 2013-03-20 11:30:48 -04:00
Ansis Brammanis
110427a186 Re-add area as a geometry for tagless other preset
Without it, areas without area=yes don't match any preset
fix #1087
2013-03-20 11:15:48 -04:00
Ansis Brammanis
aa4d54c329 stop adding extra line break when building locales.js
fixes #1090
2013-03-20 10:57:54 -04:00
Tom MacWright
a16b677fb3 Merge branch 'master' into layers 2013-03-20 10:39:24 -04:00
saman bb
7e4d005b14 updating mockups. 2013-03-19 23:23:11 -04:00
saman bb
19e51be71a minor style tweak 2013-03-19 23:23:11 -04:00
John Firebaugh
17d9a37bc4 Optimize road category for 3 column layout 2013-03-19 19:50:38 -07:00
John Firebaugh
80b6e4325f Circularize preserves direction (fixes #1082) 2013-03-19 16:42:30 -07:00