merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -10,7 +10,7 @@
.login_default fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
.login_default fieldset p.SSL a{color:#9CAC74;text-decoration:none}
.login_default fieldset p.keep{margin:1px 0 5px 0;padding:0}
.login_default fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0;padding:0}
.login_default fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0;padding:0;border:0}
.login_default fieldset p.keep label{font:.9em;color:#666;vertical-align:middle}
.login_default fieldset p.keep_msg{color:#666}
.login_default fieldset ul.help{margin:0;border-top:1px solid #e4e4e4;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none;clear:both}