Commit graph

51 commits

Author SHA1 Message Date
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
Tom Hughes
96712f1dd4 Tidy up some CSS to match house style 2012-10-02 19:51:30 +01:00
Tom MacWright
be8617dfdc Redesign inbox
Cuts down on buttons, grey, and bold clutter.
2012-10-02 19:34:49 +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
Tom Hughes
ebcb038c1c Suppress any border on the logo 2012-09-19 12:12:45 +01:00
Tom Hughes
b507f6c887 Make active highlighting work properly again 2012-09-07 09:40:05 +01:00
Tom Hughes
ec4ef1ad2b Remove controller_action class from the content div
It's duplicated by the new controller-action class on the body
element, so just use that instead.
2012-09-06 22:01:49 +01:00
Tom MacWright
02de53eb45 Refactor view and css code around homepage links
This adds a new class to the body which we can use to do more styling
in CSS rather than erb-embedded Ruby. The only visual change is that
there's now a subtle transition for homepage links becoming active.
2012-09-06 20:28:23 +01:00
Tom Hughes
51f5984c1c Use CSS to centre the images in the key 2012-08-31 10:27:45 +01:00
Tom Hughes
18238dd31e Prevent scrollbars showing up on the edit view 2012-08-29 15:36:51 +01:00
Tom Hughes
2184e6310a Set an explicit 0px border on the map
The JS code which resizes the map relies on being able to parse
the border widths as a number, and by default IE7 seems to have
a border of "medium" which fails to parse.
2012-08-29 14:02:54 +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
221ca3c1fa Improve user page navigation menu
Add counts to edits, blocks, and traces; don't show blocks if there
are none; and move OAuth to the settings page.
2012-08-10 08:26:48 +01:00
Tom Hughes
ada8b184ea Preserve background colour when marking messages read/unread 2012-08-09 00:26:38 +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
442b6d5a86 Hide the SimplePanZoom control on the user page map 2012-08-08 18:20:27 +01:00
Tom MacWright
f08259a529 Improve styling of inbox counter in greeting bar 2012-08-07 22:57:41 +01:00
Tom Hughes
888a0be790 Don't try and fix the height of the search box
We have no idea how much space a given browser will need for an input
field so stop pretending we do as we just get it wrong.
2012-07-30 13:41:11 +01:00
Sarah Hoffmann
d97d3f76a6 Replace PanZoom control with Zoom control for small maps
In OpenLayers 2.12 the event handling of PanZoom and PanZoomBar clashes
with the result that the zoom level changes by two steps every time one
of the zoom buttons is pressed. Using the Zoom control fixes this issue.
2012-07-16 18:05:02 +01:00
Tom Hughes
e2cb47f1ae Fix some issues with the new edit menu code
Make sure that the arrow icons are always displayed, and that menus
are aligned in the requested way.
2012-04-23 20:59:27 +01:00
Tom MacWright
c45dbdae36 Rework the edit tab and it's associated drop down menu
This changes the behavior of the editing tabs in three places. Instead
of the current hovering behavior, you can click on the arrow and get the
drop-down menu. Any click outside that on the page will deactivate the
menu, following the UI paradigm of most desktop environments.

This also simplifies the javascript code significantly.
2012-04-23 20:59:26 +01:00
Tom Hughes
d65c12b5ad Improve styling of notice and alert boxes 2012-03-29 18:32: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
365163929d Make sure text in Markdown help is aligned correctly 2012-03-23 00:19:06 +00:00
Tom Hughes
66caf92bd9 Improve styling of notice boxes to match new sidebar styling 2012-03-21 10:43:05 +00:00
Tom Hughes
be585d1403 Improve styling of alert boxes to match new sidebar styling 2012-03-21 10:38:12 +00:00
Tristen Brown
cf1d12fe7d Make the disabled state of the primary menu items more obvious 2012-03-18 00:08:19 +00:00
Tom Hughes
eb789dbf75 Show an animation while a preview is loading 2012-03-17 16:36:58 +00:00
Tom Hughes
561f2f694a Add preview functionality to rich text controls 2012-03-17 16:36:57 +00:00
Tom Hughes
fe5cbadf3d Adjust width of donate box so it centres properly 2012-03-14 17:44:45 +00:00
Tom MacWright
dc48c9a510 Front page copy revision
This edits the front page copy to be more direct, link off to more
useful resources, and guide people to register for an account. It
also moves partner links to below the donate link.
2012-03-14 17:33:00 +00:00
Tom Hughes
05aa7f377e Adjust left and right padding on the introductory text
The sidebar changes have increased the padding for the search box
and links menu, so change the introductory text to match.
2012-03-14 10:13:28 +00:00
Tom MacWright
ae8cc604a1 Move the diary link to the sidebar
Restructure the links section in the sidebar to split it into two
major groups, help and community and move the diary link from a tab
to the community section of the sidebar.
2012-03-14 10:12:36 +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 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 MacWright
839b6daf05 Restyle the tabs as simple blocks 2012-03-04 10:37:26 +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 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
9c10e6703e Add attribution to the MapQuest layer 2011-11-25 11:55:38 +00:00
Tom Hughes
d70fd8ab1a Use HTML5 email and url field types where appropriate 2011-11-14 09:42:57 +00:00