Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
3d2a91c6be
|
@ -271,7 +271,7 @@
|
|||
</div><!--Content end-->
|
||||
<div class="cl"></div>
|
||||
|
||||
<%= render :partial => 'layouts/base_footer_public'%>
|
||||
<%= render :partial => 'layouts/new_footer'%>
|
||||
<div class="cl"></div>
|
||||
</div><!--Container end-->
|
||||
|
||||
|
|
|
@ -436,12 +436,12 @@ a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
|
|||
div.ke-statusbar{height:1px; border-top:none;}
|
||||
|
||||
/*底部*/
|
||||
#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}
|
||||
.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}
|
||||
.footerAbout{ width:585px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }
|
||||
.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}
|
||||
.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}
|
||||
.copyright{ width:390px; margin:0 auto;height:20px;line-height:20px;}
|
||||
a.f_grey {color:#666666;}
|
||||
a.f_grey:hover {color:#000000;}
|
||||
/*#Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}*/
|
||||
/*.footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}*/
|
||||
/*.footerAbout{ width:585px; margin:0 auto;height:35px; line-height:35px; border-bottom:1px solid #efefef; }*/
|
||||
/*.languageBox {width:55px; height:20px; margin-left:5px; outline:none; color:#666666; border:1px solid #d9d9d9;}*/
|
||||
/*.departments{ width:890px; margin:5px auto 0 auto;height:30px;line-height:30px;}*/
|
||||
/*.copyright{ width:390px; margin:0 auto;height:20px;line-height:20px;}*/
|
||||
/*a.f_grey {color:#666666;}*/
|
||||
/*a.f_grey:hover {color:#000000;}*/
|
||||
|
||||
|
|
Loading…
Reference in New Issue