Merge branch 'develop' of github.com:ether/etherpad-lite into focus-on-password

This commit is contained in:
John McLear 2012-12-03 11:37:01 +00:00
commit bef25b40f8
9 changed files with 92 additions and 117 deletions

View file

@ -585,15 +585,20 @@ table#otheruserstable {
#exportdokuwiki {
background-position: 0px -459px
}
#importstatusball {
display: none
/* hidden element */
#importstatusball,
#importarrow,
#importmessagesuccess,
#importmessageabiword {
display: none;
}
#importarrow {
display: none
}
#importmessagesuccess {
display: none
#importmessageabiword {
color: #900;
font-size: small;
}
#importsubmitinput {
height: 25px;
width: 85px;