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

@ -2,7 +2,7 @@
#spot { padding-left:10px; margin-bottom:20px; }
#spot .search * { vertical-align:middle;}
#spot .search .inputText { border:4px solid #b6b6b6; padding:2px; width:252px; font-size:16px; font-weight:bold; }
#spot .search .iText { border:4px solid #b6b6b6; padding:2px; width:252px; font-size:16px; font-weight:bold; }
.localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; padding-left:10px; }
.localNavigation:after {content:""; display:block; clear:both;}