Commit graph

461 commits

Author SHA1 Message Date
Tom Hughes
4be0e9bd10 Merge branch 'master' into routing 2015-02-01 15:10:21 +00:00
Tom Hughes
c093aa481b Remove typo 2015-02-01 14:18:16 +00:00
Tom Hughes
6f762ae184 Set foreground colour for input fields 2015-02-01 14:10:15 +00:00
Tom Hughes
44a0835487 Move routing "Go" button up alongside the dropdown 2015-02-01 12:58:08 +00:00
Tom Hughes
13d650e2dc Merge branch 'master' into routing 2015-02-01 11:32:02 +00:00
Tom Hughes
959a076b50 Add some padding to select elements 2015-02-01 11:29:38 +00:00
Tom Hughes
2452576333 Drop redundant css extension from scss files 2015-02-01 10:50:50 +00:00
Tom Hughes
d423ae9137 Default background for input fields to white
Some browsers apparently default form fields to a background based
on the desktop theme, and don't inherit from body.

Fixes #883
2015-02-01 10:15:00 +00:00
Matt Amos
b09c14218f Revert some of the selection styling changes which cause bizarre styling regressions to the 80s on FF. 2015-01-26 17:53:24 +00:00
Matt Amos
376a630756 Fix vertical alignment of text within select input on Firefox. 2015-01-26 16:57:34 +00:00
Matt Amos
c3e2e6462f Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2
Conflicts:
	config/locales/de.yml
2015-01-26 13:14:58 +00:00
Tom Hughes
3dbc55fc16 Make sure button_to buttons are separated by whitespace 2014-11-19 00:21:58 +00:00
Matt Amos
91930aa4a5 Consolidated list highlight colours to one parameter. 2014-11-10 20:05:54 +00:00
Matt Amos
e3062aa794 Made top & bottom spacing in directions list consistent. 2014-11-10 19:59:02 +00:00
Matt Amos
4734b9ce5d Added some vertical space in the routing text input boxes. 2014-11-10 19:36:43 +00:00
Matt Amos
3a9db4cf30 Use buttons for switching to/from directions.
Previously, used a small text link which wasn't very usable. Now
it uses larger buttons which are (hopefully) more usable. Also
this sorts out the weird right-hanging text boxes for the to/from
in the directions sidebar - now they look like proper text input
boxes.

However, the "back to search" button and the directions submit
buttons are weirdly large and I don't quite understand why.
Hopefully an easy fix for someone who knows the arcana of CSS
better than I.
2014-11-10 19:17:21 +00:00
Matt Amos
0cb475cc1a Merge remote-tracking branch 'upstream/master' into routing-merge
Conflicts:
	app/assets/javascripts/index.js
	config/locales/en.yml
2014-11-10 16:14:06 +00:00
Tom Hughes
f0ecc6312b Revert "Add SOTM advert"
This reverts commit 15a7276a9f.
2014-11-09 23:03:04 +00:00
Tom Hughes
526ff06172 Allow query mode to be turned off at low zoom
Fixes #830
2014-11-07 15:58:05 +00:00
Tom Hughes
e11d734f9f Merge branch 'overpass' 2014-11-07 08:40:18 +00:00
Dan Stowell
a474c095fd Leave overpass result links coloured blue
Closes #47.
2014-11-05 09:30:09 +00:00
Dan Karran
0440984bc7 Add some missing browse icons
Icons for highway=tertiary, highway=track, highway=path and barrier=wall.
2014-11-04 09:56:59 +00:00
Matt Amos
a3eb48385b Merge remote-tracking branch 'upstream/master' into routing
Conflicts:
	app/assets/javascripts/index.js
	app/assets/javascripts/leaflet.map.js.erb
	config/environments/production.rb
	config/locales/de.yml
2014-11-03 11:08:13 +00:00
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
Tom Hughes
8598db3233 Tidy up changeset comment code 2014-10-23 21:24:51 +01:00
Łukasz Gurdek
14ac1babc2 Changeset discussions
Add support for commenting on changesets with RSS feeds and email
notification of comments to other commenters and people that have
chosen to subscribe to a changeset.
2014-10-23 21:24:51 +01:00
Tom Hughes
1e1baa33ad Move noscript message clear of the sidebar
Fixes #808
2014-09-07 13:48:28 +01:00
Tom Hughes
15a7276a9f Add SOTM advert 2014-09-04 15:25:56 +01:00
Tom Hughes
87d9ef8ea5 Use autoprefixer to generate CSS prefixes 2014-07-25 19:38:03 +01:00
Tom Hughes
052559c5d7 Fix line height for buttons in Firefox 30
This is pretty ugly, but it's the best solution I have at the
current time. Seems to fix Firefox 30 without breaking Chrome
or Opera and doesn't make IE8 any worse.

Fixes #756
2014-06-22 10:25:08 +01:00
Tom Hughes
44d5335e47 Style trace edit form to match trace creation form 2014-06-18 22:48:23 +01:00
Tom Hughes
39e7ec3c4c Increase field widths on trace upload form
Fixes #664
2014-06-18 22:38:22 +01:00
Tom Hughes
a70b61315c Merge branch 'master' into overpass 2014-06-15 14:54:39 +01:00
Tom Hughes
399fe3c12a Highlight search results when the mouse is over them
Fixes #748
2014-06-15 14:11:17 +01:00
John Firebaugh
f2bf38606e Permalinks for directions 2014-05-14 15:52:25 -07:00
Tom Hughes
d56b449bdb Remove unused CSS rules that refer to non-existent images 2014-04-27 19:18:56 +01:00
Tom Hughes
606ac76108 Disable query feature tool below z14 2014-03-16 16:18:13 +00:00
Tom Hughes
dedd87da28 Show a message when no features are found 2014-03-16 16:18:13 +00:00
Tom Hughes
e329bf37c0 Improve styling of feature list 2014-03-16 16:18:13 +00:00
Tom Hughes
078059b76b Initial work on overpass based query API 2014-03-16 16:18:12 +00:00
Richard Fairhurst
9d8ab7dbd1 From->To->Go order as per @samanpwbb's comment 2014-03-10 16:55:01 +00:00
Richard Fairhurst
608ec07b1f Refer to the id for the distance/time summary
(otherwise it fouls up the welcome message spacing)
2014-03-09 20:27:22 +00:00
Tom Hughes
b095b59d5e Merge remote-tracking branch 'origin/master' into routing
Conflicts:
	app/views/layouts/_search.html.erb
2014-03-08 17:44:22 +00:00
Richard Fairhurst
3ef8024b1d Add distance/time summary 2014-03-08 16:14:14 +00:00
Dan Stowell
acf7cf5738 add a credits line for each routing service 2014-02-23 21:56:39 +00:00
Tom Hughes
f9ae6d252f Drop the slim layout
The slim layout is not really needed since the redesign as the
pages it was used for in the OAuth flow now have less chrome and
work fine on small screens with the normal layout.

Fixes #689
2014-02-16 16:03:00 +00:00
Richard Fairhurst
08837b2f8b Start work on drag-and-drop start/end markers 2014-01-23 00:49:00 +00:00
Richard Fairhurst
15c1564832 Start to make turn-by-turn instructions clickable 2014-01-21 21:44:09 +00:00
Richard Fairhurst
ad01a61b6d Query options presentation 2014-01-21 20:57:55 +00:00
Richard Fairhurst
c6e8775dba Presentation of directions 2014-01-21 20:42:31 +00:00