Commit graph

42 commits

Author SHA1 Message Date
Leo Koppelkamm
890153b2a6 Replace note markers with ones styled like the other markers 2013-06-02 18:44:09 +01:00
Grant Slater
afa44979b2 Add Server Donation Banner 2013-05-17 21:37:45 +01:00
John Firebaugh
370f4bf562 Add SotM ads 2013-05-13 20:17:10 +01:00
Tom Hughes
3e92f1991e Restore rule for landuse=tourism and rename tourist.png to tourism.png 2013-05-12 14:25:04 +01:00
Tom MacWright
6453310d4d Redesign notes permalink
This adds a small permalink icon to the sprite and updates the CSS for
the permalink. The text is hidden by default and shown on hover.
2013-04-28 17:06:48 +01:00
Tom Hughes
56db9ca2b7 Merge branch 'master' into notes 2013-02-02 11:00:46 +00:00
Paweł Paprota
9762fbff50 Missing aerodrome symbol (referenced in browse.css.scss). 2013-02-02 10:46:48 +00:00
Paweł Paprota
a03d9c0a1b Rename historic=ruins tag symbol to match the CSS rule in browse.css. 2013-01-21 09:43:11 +00:00
Tom Hughes
3d7eb387a7 Merge branch 'master' into notes
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
2013-01-15 21:11:35 +00:00
Saman Bemel-Benrud
a36f3558dd Site cleanup
I set out to do a quick and dirty typography overhaul to make things
more consistent and a bit cleaner, but I kept running into things I
didn't like, so this lead me down something of a rabbit hole of design
tweaks to the OSM site.

Goals here are to have better content hierarchy, better vertical
rhythm, more consistent UI, cleaner markup with less tables, all while
keeping the basics pretty much intact. There are a lot of things I
didn't touch even though they need to be updated (lots of tables where
stuff shouldn't be tables, mostly).

Basic overview of changes:

I added a new persistent header that helps segment pages. It's now
a lot easier to know what you're looking at. The header has a page
title, a description, plus a submenu of actions.

There is now a pattern of 20px/10px margins and padding for more
rhythm and breathing room throughout the site.

I know there are other problems here or things I've missed - would
love another set of eyes to look over this! I am still getting comfortable
working on the site - it's my first time ever digging into a ruby or rails
so I'm not familiar with the templating language yet.
2013-01-14 21:27:08 +00:00
Tom Hughes
78f608b114 Merge branch 'master' into notes
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
2012-12-01 18:22:30 +00:00
Tom Hughes
8aa6d575ff Remove unused image 2012-11-21 22:52:53 +00:00
Tom Hughes
62ba6b50ba Replace OSM markers with recolured versions of the Leaflet marker 2012-11-21 18:43:20 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
2012-11-20 19:08:30 +00:00
John Firebaugh
f913b7d8a5 Use nicer markers 2012-11-09 13:31:29 -08:00
John Firebaugh
cc7753896c Move non-vendor leaflet assets into app 2012-11-09 12:59:30 -08:00
John Firebaugh
30ad58c01f Port to Leaflet 2012-11-09 12:59:27 -08:00
Saman Bemel-Benrud
2e2ebbf959 Minor style overhaul to sidebar
A number of small usability improvements / fixes, including:

* Small inconsistencies in spacing fixed
* Links now visually differentiated from headings in the menu
* Search bar actually looks right (or at least not as broken) in IE7 now
* New heart on the donate button + larger click area on the donate button!
2012-10-26 21:24:36 +01:00
Saman Bemel-Benrud
1104f6997b Improved user icons 2012-10-22 22:50:17 +01:00
Grant Slater
49666ecf11 Revert "Add SoTM Scotland banner"
This reverts commit 749caaff73.
2012-10-22 21:07:22 +01:00
Grant Slater
749caaff73 Add SoTM Scotland banner 2012-10-18 19:00:25 +01:00
Tom Hughes
3fb931f9a8 Merge branch 'master' into notes 2012-10-15 22:38:13 +01:00
Tom Hughes
bfcc3235c5 Remove SOTM US advert 2012-10-15 19:15:54 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
2012-10-13 15:55:34 +01:00
Richard Fairhurst
012d5b69c6 Provide example of correct attribution 2012-10-12 21:06:56 +01:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
2012-09-20 16:01:24 +01:00
Martijn van Exel
5f0c590c32 Add a banner for SOTM US 2012-09-16 16:20:53 +01:00
Tom Hughes
3787918d68 Remove SOTM advert 2012-09-08 14:32:27 +01:00
Tom Hughes
a5f5dcce5d Remove unused osmarender key data 2012-08-31 09:30:44 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
2012-08-22 20:52:08 +01:00
Tom MacWright
a9a5b6ef38 Revise SOTM logo design 2012-08-21 22:19:56 +01:00
Tom Hughes
3445f447cd Add a SOTM advert to the sidebar 2012-08-08 21:37:29 +01:00
Tom MacWright
f436a5cd2b Improve presentation of homepage
Collapse search button into icon, deemphasize copy and remove
extraneous borders.
2012-08-08 18:20:48 +01:00
Tom Hughes
bd14832cb5 Rearrange layer switcher assets 2012-03-28 21:18:47 +01:00
Tom MacWright
8f4ed911e0 Introduce a new layer switcher
The new layer switcher behaves the same as the standard one but
has less cruft and more attractive styling.
2012-03-28 21:06:08 +01:00
Tom Hughes
eb789dbf75 Show an animation while a preview is loading 2012-03-17 16:36:58 +00:00
Tom Hughes
e660e60966 Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile
	Gemfile.lock
	lib/migrate.rb
2012-03-08 18:23:27 +00:00
Tom Hughes
48ad9eff45 Remove unused image 2012-03-04 10:37:33 +00:00
Tom Hughes
f2150a94cf Serve up paperclip attachments in a cache friendly way 2012-02-21 12:31:38 +00:00
Tom Hughes
3ecf431f7e Move notes resources to assets directory 2012-01-07 16:36:58 +00:00
Tom Hughes
b8445ad3b2 Serve the favicon through the assets pipeline 2011-12-30 22:32:55 +00:00
Tom Hughes
8acdba8bdd Upgrade to rails 3.1.0 2011-11-14 09:42:52 +00:00