Merge branch 'master' of github.com:Pita/etherpad-lite

This commit is contained in:
Peter 'Pita' Martischka 2011-11-25 16:08:24 -08:00
commit dc6d0cda68
7 changed files with 47 additions and 24 deletions

View file

@ -786,11 +786,15 @@ padding: 10px;
border-radius: 6px;
}
#embedcode, #readonlyUrl {
#embedreadonly {
float:right;
}
#embedcode, #readonlyUrl, #linkcode {
margin-left:10px;
}
#embedinput, #readonlyInput{
#embedinput, #readonlyInput, #linkinput {
width:375px;
height:24px;
display:inline;
@ -1146,4 +1150,4 @@ width:33px !important;
#editbar ul li {
padding: 4px 1px;
}
}
}