Commit graph

162 commits

Author SHA1 Message Date
Tom Hughes
2880d66eb8 Remove unused CSS rule 2013-04-28 19:06:11 +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
a14abfe90b Tone down the anonymous edit warning for notes
Increase the saturation of our standard warning colour a little so
that it is more visible, and then switch notes to using the warning
colour instead of the error colour.
2013-04-27 16:47:25 +01:00
Tom Hughes
d48b1ccdf2 Replace the title in the note popup with a permalink 2013-04-27 11:51:51 +01:00
Tom Hughes
4a69512ce4 Reduce corner radius on all leaflet popups 2013-04-27 11:31:02 +01:00
Tom Hughes
e2b364d002 Increase whitespace between comments in the note popup 2013-04-27 11:23:58 +01:00
Tom Hughes
aeeb30ce3c Improve wrapping in the data browse on narrow windows 2013-04-25 17:44:40 +01:00
Tom Hughes
0c8ad2f86e Merge branch 'notes'
Conflicts:
	Vendorfile
2013-04-23 22:40:21 +01:00
Tom Hughes
1f8bbc2574 Stop text overflowing the richtext preview pane 2013-04-17 22:39:40 +01:00
Tom Hughes
92210a5be1 Allowing wrapping inside the content of a richtext editor
We disable wrapping on the container to keep the editor and the
help on the same line, but need to turn it back on again inside
the editor so that autogrow can work.
2013-04-17 22:38:20 +01:00
Tom Hughes
52611a5bfa Merge branch 'master' into notes 2013-04-16 18:22:47 +01:00
Saman Bemel-Benrud
7614534bdb Diary cleanup
This commit includes a few basic changes to make the user diaries
friendlier and easier to read. I adjusted the text styles and added
a maximum width, to keep the line length under control.
2013-04-14 17:26:27 +01:00
Tom Hughes
15be6b3ffc Add missing padding at right hand end of greeting menu 2013-03-28 00:40:07 +00:00
Tom Hughes
68044c6054 Separate the links in the bottom right map corner better 2013-02-05 19:18:37 +00:00
Tom Hughes
16a0f14f4a Show anonymous user warning in data browser note view 2013-02-02 16:34:49 +00:00
Tom Hughes
5ad45549e1 Add anonymous comment warning to note popup 2013-02-02 16:18:35 +00:00
Tom Hughes
9d3b419aad Improve styling of the per-user notes list view 2013-02-02 14:29:45 +00:00
Tom Hughes
56db9ca2b7 Merge branch 'master' into notes 2013-02-02 11:00:46 +00:00
Tom Hughes
773f145edc Show the header block on slim layout pages 2013-01-30 18:17:04 +00:00
Saman Bemel-Benrud
a4af16417b Allow non-square user images 2013-01-26 15:44:44 +00:00
Tom Hughes
1f7dd79daf Fix lists in rich text to display properly
Add a "richtext" class to anything which contains text rendered
by our rich text library, and move styles which were only being
applied to diary entries to apply to all rich text.
2013-01-24 14:54:26 +00:00
Tom Hughes
f430d2c6e1 Remove redundant CSS rule - table headings are already bold 2013-01-24 14:31:14 +00:00
Tom Hughes
f8cadaf480 Put some white space back to make things readable 2013-01-24 14:18:18 +00:00
Tom Hughes
e9cb282712 Make maximising work properly again in Potlatch 2013-01-19 11:29:12 +00:00
Tom Hughes
f05da909f5 Remove style rules that are no longer needed 2013-01-17 00:12:59 +00:00
Tom Hughes
f360d77aff Highlight the history tab correctly 2013-01-16 21:31:15 +00:00
Saman Bemel-Benrud
b02844b42f Cleanup followup
Tighter copy on node list for to decrease the chance of an ugly line
break (need better fix here so the line break is smoother). Just changed
also part of way %{related_ways} to part of way %{related_ways}. This
needs a better fix to make line breaks indent properly, but this should
at least help a little (issue #185).

Properly positioned 'nearby users' block on user page to be in the left
column (issue #184).

Removed deemphasized class from search results (issue #181) lighter
highlight yellow on changesets page.
2013-01-16 21:31:05 +00:00
Tom Hughes
76559d3de2 Fix notes page in data browser to match new site style 2013-01-15 22:25:22 +00:00
Tom Hughes
8cd6168b48 Set width of comment entry area in note popups 2013-01-15 21:42:43 +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
00548468ac Remove unused permalink styles 2012-12-13 19:12:07 +00:00
Tom Hughes
0d11ad7415 Style disabled permalinks appropriately 2012-12-04 14:29:42 +00:00
Tom Hughes
c533fb4b74 Display formatted notes in the web UI 2012-12-03 14:50:55 +00:00
Tom Hughes
c3cb1de73e Format note comments correctly in the data browser 2012-12-03 14:50:55 +00:00
Tom Hughes
98475075c7 Add a scrollbar when a note gets too big 2012-12-02 14:14:16 +00:00
Tom Hughes
de78176e04 Rework notes UI using leaflet 2012-12-02 14:13:54 +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
d9352f16a8 Set the z-index on the top bar to keep it in front 2012-11-23 19:38:55 +00:00
Tom Hughes
f978642a58 Revert "Stop the map overlapping the top bar"
This reverts commit 2ef2d7c876.
2012-11-23 19:36:56 +00:00
Tom Hughes
2ef2d7c876 Stop the map overlapping the top bar 2012-11-23 12:23:38 +00:00
Tom Hughes
7d92ec7047 Merge branch 'leaflet' 2012-11-23 10:41:45 +00:00
Tom Hughes
d04e3ac9f8 Move map controls higher in the small screen view 2012-11-22 13:03:49 +00:00
Tom Hughes
0c2d538aa7 Use the small zoom control in the small screen layout 2012-11-22 12:54:37 +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
Tom Hughes
d68368e0d5 Rework RTL handling to keep rules together 2012-11-19 10:39:30 +00:00
John Firebaugh
ed84516db2 Fix user popup styles 2012-11-09 12:59:31 -08:00
John Firebaugh
3e2e62b123 Fix zoom control positioning 2012-11-09 12:59:29 -08:00
Saman Bemel-Benrud
5f8047991b properly positioned leaflet controls and removed old open layers style rules. 2012-11-09 12:59:29 -08:00
Tom Hughes
6b86b716d1 Tweak Potlatch maximisation a bit more 2012-11-01 17:02:11 +00:00