merge from branch 1.5.3.2 (~r11282)

git-svn-id: http://xe-core.googlecode.com/svn/branches/luminous@11380 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-09-19 07:56:40 +00:00
commit 9f5e25a15e
136 changed files with 414 additions and 317 deletions

View file

@ -1,4 +1,4 @@
<style>
<style type="text/css">
.sorry{width:50%;margin:2em auto;padding:2em 3em;border:4px solid #444;font-family:Tahoma, Geneva, sans-serif;background:#666;border-radius:10px;box-shadow:0 0 10px #999;overflow:hidden}
.sorry .hx{float:left;margin:0 20px 0 0;color:#fff}
.sorry .msg{float:left;border-left:1px solid #fff;padding:0 0 0 20px;color:#eee}

View file

@ -69,7 +69,7 @@
</div>
</div>
<script>
<script type="text/javascript">
jQuery(function($){
var keep_msg = $('#keep_msg');
keep_msg.hide();

View file

@ -1,4 +1,4 @@
<style>
<style type="text/css">
.sorry{width:50%;margin:2em auto;padding:2em 3em;border:4px solid #444;font-family:Tahoma, Geneva, sans-serif;background:#666;border-radius:10px;box-shadow:0 0 10px #999;overflow:hidden}
.sorry .hx{float:left;margin:0 20px 0 0;color:#fff}
.sorry .msg{float:left;border-left:1px solid #fff;padding:0 0 0 20px;color:#eee}