cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into openid

Browse source 
Conflicts:
	app/controllers/user_controller.rb
	app/views/user/new.html.erb
	config/locales/en.yml
	public/stylesheets/common.css
This commit is contained in:
Tom Hughes 2010-05-11 21:22:43 +01:00
commit 64f373dc59
17 changed files with 282 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

41
public/stylesheets/common.css
View file

@ -614,6 +614,47 @@ hr {
margin-bottom: 20px;
}
/* Rules for the account confirmation page */
div#contributorTerms {
border: 1px solid black;
padding: 4px;
overflow: auto;
width: 80%;
height: 60%;
}
div#contributorTerms p#first {
margin-top: 0px;
}
div#contributorTerms p#last {
margin-bottom: 0px;
}
div#contributorTerms ol {
margin-bottom: 0px;
}
div#contributorTerms img {
display: block;
margin-left: auto;
margin-right: auto;
margin-top: 10%;
}
form#termsForm {
width: 80%;
}
form#termsForm div#buttons {
float: right;
}
form#termsForm input#agree {
margin-left: 50px;
}
/* Rules for the account settings page */
#accountForm td {