Commit graph

1246 commits

Author SHA1 Message Date
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
2012-03-08 18:23:27 +00:00
Tom MacWright
40402fcdb8 Fix some issues with the new tab styling
Uses the parent of the tabnav element to do its positioning, and fixes
this style in RTL and small.

Also move the greetings block into the top-bar div in order to cleanly
have it share a border with tabs.
2012-03-04 10:37:46 +00:00
Tom MacWright
86946536ec Set overflow to auto to gracefully hide tabs before small mode is engaged 2012-03-04 10:37:39 +00:00
Tom Hughes
48ad9eff45 Remove unused image 2012-03-04 10:37:33 +00:00
Tom MacWright
839b6daf05 Restyle the tabs as simple blocks 2012-03-04 10:37:26 +00:00
Tom Hughes
b61e414356 Rename "Mapnik" to "Standard" in the layer switcher 2012-03-01 12:18:55 +00:00
Tom Hughes
acbd254e4a Remove the osmarender map layer 2012-03-01 09:45:41 +00:00
Tom MacWright
7b6d0f0313 Simplify login page
Moves action buttons to be with the form instead of way over on
the opposite side of the page.

Reorganizes "remember me" to a more typical spot on the page.

Get rid of separate "create account" panel and replace it with an
above the fold link.
2012-02-29 00:13:09 +00:00
Tom Hughes
bdf476d8cf Make sure we don't attach alert handler multiple times
Before adding a "not zoomed in enough" alert handler, make sure any
existing handler is removed. Fixes #17.
2012-02-21 19:22:01 +00:00
Tom Hughes
f2150a94cf Serve up paperclip attachments in a cache friendly way 2012-02-21 12:31:38 +00:00
Tom Hughes
3d01016980 Restore borders to maps on various pages 2012-02-15 17:47:42 +00:00
Tom Hughes
a3c83f8623 Don't remove the content area border on the copyright page 2012-02-14 12:03:54 +00:00
Tom Hughes
73b8e6f0ad Use the same subhead style for search results as export 2012-02-12 15:36:02 +00:00
Tom Hughes
daae34672e Tidy up the stylesheets 2012-02-12 15:17:43 +00:00
Tom Hughes
2e6852b1a6 Improve sidebar styling a little 2012-02-12 15:17:43 +00:00
Tom MacWright
3c4b20c160 Fix sidebar border and padding, tweak styles to simplify borders
Move font sizes and line heights up in the stylesheet structure
to make the left element more uniform. Make the padding of the
menu the same as the other elements.
2012-02-12 15:17:43 +00:00
Tom Hughes
55e0c231cf Tidy up the stylesheets 2012-02-12 15:17:43 +00:00
Tom MacWright
c241c3c312 Cleanup style
This is a mild restyling of OpenStreetMap. Changes include:

  * Remove margin from map, add more margin to text content
  * Rearrange permalink & link buttons and gives them a background
  * Pull OpenStreetMap text below logo along with subtitle
  * Simplify sidebar styling
  * Move towards a baseline, start to consolidate text size and line height

This is tested with LTR, RTL, and the compact mode, and looks good. Looks
more uniform in older browsers because it relies less on round corners.
2012-02-12 15:17:43 +00:00
Tom MacWright
eb8efa0a4b Fixes and cleanups suggested by JSHint 2012-02-01 00:25:10 +00:00
Tom Hughes
3ecf431f7e Move notes resources to assets directory 2012-01-07 16:36:58 +00:00
Tom Hughes
52e5fa6ad7 Merge branch 'master' into openstreetbugs
Conflicts:
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
	config/initializers/mime_types.rb
	config/routes.rb
	lib/map_boundary.rb
	lib/migrate.rb
	lib/osm.rb
	vendor/assets/openlayers/OpenLayers.js
2012-01-05 20:15:53 +00:00
Tom Hughes
ae9131bc8e Allow OpenStreetMap.js to work with an unpatched OpenLayers 2011-12-31 00:25:04 +00:00
Tom Hughes
2a84871de6 Serve OpenSearch definition though the assets pipeline 2011-12-30 22:37:11 +00:00
Tom Hughes
b8445ad3b2 Serve the favicon through the assets pipeline 2011-12-30 22:32:55 +00:00
Tom Hughes
4fb53e9619 Fix OpenLayers image URL rewriting 2011-12-30 19:05:40 +00:00
Tom Hughes
da78800060 Patch OpenLayers to make URL rewriting easier
This provides a single routine that can be overridden to rewrite
all image URLs to use the asset pipeine.
2011-12-30 18:32:53 +00:00
Tom Hughes
90f119d976 Fix loading of blank tiles on some browsers to use the asset pipeline 2011-12-19 17:56:00 +00:00
Tom Hughes
6e508a7b70 Get the print stylesheet working again 2011-12-08 00:28:08 +00:00
Tom Hughes
9afbaf1984 Avoid having to condition on mobile mode 2011-11-26 18:12:58 +00:00
Dan Karran
080d347d8f Mobile layout improvements
Make the map fill the available space on smaller screens, and
style the search results sidebar a bit better when ?query= is
added to the URL to trigger the search.
2011-11-26 17:38:00 +00:00
Tom Hughes
13289d4041 Switch from Prototype to jQuery 2011-11-26 00:22:31 +00:00
Tom Hughes
4368ba9f11 Wrap the OpenLayers.Util.createDiv routine 2011-11-26 00:15:12 +00:00
Tom Hughes
5275794aec Wrap another OpenLayers image creation routine 2011-11-26 00:07:45 +00:00
Tom Hughes
61e756c625 Handle openlayers.js as a template 2011-11-25 23:14:16 +00:00
Tom Hughes
477b765c42 Force all OpenLayers resources to load through the asset pipeline 2011-11-25 23:00:30 +00:00
Tom Hughes
716262f211 Serve OpenLayers through the asset pipeline 2011-11-25 20:07:50 +00:00
Tom Hughes
759f51a57c Never disable a base layer 2011-11-25 13:45:25 +00:00
Tom Hughes
8af92f463b Add attribution to cycle and transport layers 2011-11-25 11:59:17 +00:00
Tom Hughes
9c10e6703e Add attribution to the MapQuest layer 2011-11-25 11:55:38 +00:00
Tom Hughes
671fe0bb91 Remove the noname layer and add the transport and MapQuest layers 2011-11-25 11:55:12 +00:00
Matt Amos
64030a40ac Replace @ with ~ in the shortlink
This should help Twitter's horribly broken URL detection algorithm
not screw up shortlinks from OSM.
2011-11-24 22:27:16 +00:00
Tom Hughes
87d38efbb0 Make the text direction style come before the screen size style 2011-11-16 15:55:33 +00:00
Tom Hughes
c61d24f08e Use asset_path to find the arrow icon 2011-11-15 10:48:30 +00:00
Tom Hughes
d70fd8ab1a Use HTML5 email and url field types where appropriate 2011-11-14 09:42:57 +00:00
Tom Hughes
1f383dcbd7 Serve swfobject via the assets pipeline 2011-11-14 09:42:56 +00:00
Tom Hughes
8acdba8bdd Upgrade to rails 3.1.0 2011-11-14 09:42:52 +00:00