cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6589 commits 4 branches 1 tag 499 MiB
Commit graph

76 commits

Author SHA1 Message Date
Tom Hughes
f0ecc6312b Revert "Add SOTM advert" 
This reverts commit 15a7276a9f.
 2014-11-09 23:03:04 +00:00
Tom Hughes
e11d734f9f Merge branch 'overpass' 2014-11-07 08:40:18 +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
Tom Hughes
501d13e1c0 Merge branch 'master' into overpass 2014-11-01 12:50:23 +00:00
Tom Hughes
15a7276a9f Add SOTM advert 2014-09-04 15:25:56 +01:00
Paul Norman
5ae33285e0 Make parking icon less blurry 
Fixes #760
 2014-06-17 21:30:42 +01:00
Tom Hughes
a70b61315c Merge branch 'master' into overpass 2014-06-15 14:54:39 +01:00
Tom Hughes
b369d786db Add correct icon for caravan parks 2014-04-27 19:19:03 +01:00
Tom Hughes
078059b76b Initial work on overpass based query API 2014-03-16 16:18:12 +00:00
Aaron Lidman
5ddab68c11 Replace searching.gif with loader from iD 2013-11-15 16:11:44 -08:00
John Firebaugh
07c6d714c5 Remove unused about page code 2013-11-06 11:15:08 -08:00
Eden Halperin
537d72b0f6 responsive secondary pages and fixed map 2013-11-06 12:57:21 -05:00
Aaron Lidman
ca8ef7dd7d Added hover state to close button 2013-11-05 16:02:38 -08:00
John Firebaugh
3ebad9ec2f Add about page 2013-10-13 14:46:05 -07:00
Tom Hughes
4f2e9e0888 Add additional icon tags to the HTML header 2013-09-10 21:36:47 +01:00
Grant Slater
bd1d0ab950 Remove Donate Ad Banner 2013-08-21 15:48:00 +01:00
Saman Bemel-Benrud
8390d1f6c6 reworking terms page + replacing pad classes with inner classes. 2013-08-12 13:34:44 -07:00
John Firebaugh
2a3bc0a387 Hook up user confirmation page 2013-08-12 13:34:44 -07:00
Saman Bemel-Benrud
455d56ed95 replace changeset icon with tag icon 2013-08-12 13:34:43 -07:00
Saman Bemel-Benrud
c0bfc11d03 bring back icon for help questions section.: 
gi
 2013-08-12 13:34:43 -07:00
Saman Bemel-Benrud
a53e5d21cf fix problem with verify illustration. 2013-08-12 13:34:43 -07:00
Saman Bemel-Benrud
ad60ee5c9c adding new verify page, updating graphics. 2013-08-12 13:34:42 -07:00
Saman Bemel-Benrud
580d25b971 touch-ups to icons & layout of welcome page. 2013-08-12 13:34:42 -07:00
Saman Bemel-Benrud
bbc62406b5 basic cleanup of welcome osm page. 2013-08-12 13:34:42 -07:00
Saman Bemel-Benrud
007b985835 making sign-up page fun. 2013-08-12 13:34:42 -07:00
Saman Bemel-Benrud
c031ceb340 reworking new page. 2013-08-12 13:34:42 -07:00
John Firebaugh
5848e7e621 Fix help icon in sprite 2013-08-12 13:34:41 -07:00
John Firebaugh
b4b8154a80 Make all names translatable 2013-08-12 13:34:41 -07:00
John Firebaugh
e3aaa6dd4b Add welcome page based on http://osmlab.github.io/welcome-osm/ 2013-08-12 13:34:40 -07:00
John Firebaugh
49b0dd4af5 Fix heart icon color 2013-08-05 08:37:51 -07:00
Saman Bemel-Benrud
dcbc42b1a4 reversed color on map controls and prepped active toggle 2013-08-05 08:31:46 -07:00
Tom MacWright
761a441e1f Add sprite and geolocate alternate color 2013-07-18 10:45:16 -07:00
Saman Bemel-Benrud
b9a19ab23a starting to cleanup+style map controls. 2013-07-18 10:36:08 -07:00
Saman Bemel-Benrud
7f749e9b18 adding icons to sprite. 2013-07-18 10:31:20 -07:00
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