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
This commit is contained in:
Tom Hughes 2010-10-17 10:59:29 +01:00
commit e09b187cae
13 changed files with 259 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

12
public/stylesheets/common.css
View file

@ -335,12 +335,12 @@ hr {
display: none !important;
}
#map #permalink {
z-index:10000;
position:absolute;
bottom:15px;
right:15px;
font-size:smaller;
#permalink {
z-index: 10000;
position: absolute;
bottom: 15px;
right: 15px;
font-size: smaller;
text-align: right;
}