Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-front.git into dev

css/common.css

@charset "utf-8";
@media(max-width:780px ) {
	#header{
		min-width:760px;
	}
}
@media(max-width:1100px ) {
	#header.Nosear{
		width:1100px;
	}
}
/* CSS Document */
.floatL{ float:left;}
.floatR{float:right;}
html, body{}
input{ outline:none;}
/*header部分*/
#header{width:100%;min-width:1100px; height:60px; background:rgba(255,153,0,1); position:fixed; top:0; z-index:999; }
#header{width:100%;height:60px; background:rgba(255,153,0,1); position:fixed; top:0; z-index:999; }
#header.Nosear{position:static;}
.logo{ display:block; width:80px; height:40px; background:url(../images/logo2.png) no-repeat;background-size:100% 100%;  margin-left:80px; margin-top:10px; float:left;}
.searchblock{ width:280px; height:35px; position:absolute; left:50%; top:50%; margin-left:-140px; margin-top:-17.5px; display:none;}
.search-txt{ width:220px;line-height:35px; height:35px; background:#fff; border:none;-moz-border-radius:6px 0 0 6px;-webkit-border-radius:6px 0 0 6px; border-radius:6px 0 0 6px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;padding-left:10px; color:#a3a3a3;}
.search-btn{ width:35px; height:35px; background:#fff; border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;-webkit-border-radius:0 6px 6px 0; float:left; cursor:pointer; behavior:url(../js/ie-css3.htc);cursor:pointer;}
.search-icon{ display:block; width:20px; height:20px; background:url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
/*顶部右边*/
.header-right{ float:right; margin-right:80px;}
/*未登录*/
.contentBody{width:1050px;height:auto; margin:10px auto; padding:80px 0 2px 0; }
/*footer部分*/
#footer{ min-width:1100px;background:#ff9900;clear: both;height:100px; position: relative; z-index: 100; text-align:center;}
#footer .wrapper {margin-left:80px;position: relative;padding: 15px 20px; min-width:1000px;}
#footer .wrapper {margin-left:80px;position: relative;padding: 15px 0; min-width:1000px;}
#footer .footer-logo {display: block;width:80px;height:40px;background: url(../images/logo2.png) 0 0 no-repeat;background-size:100% 100%;}
#footer .word_wrapper {padding-top: 12px;line-height: 14px;white-space: nowrap;margin: 12px 0 0 20px;}

css/login.css

.boxnav-title{font-size: 14px; line-height:40px; font-weight: normal;position:relative;padding-left:6px;}
ul.boxnav{ overflow: hidden;width:100%;}
ul.boxnav li{list-style: none;width:31%;float:left; padding:0 1%;-webkit-box-sizing: border-box;}
ul.boxnav li span{width:100%; font-size:12px;height:28px; line-height:27px; text-align: center; display: block; background: #fff;  border-radius: 5px;cursor: pointer;}
ul.boxnav li span{width:100%; font-size:12px;height:28px; line-height:28px; text-align: center; display: block; background: #fff;  border-radius: 5px;cursor: pointer;}
ul.boxnav li:nth-child(1) span{border:1px solid #ff9900; color: #ff9900; }
ul.boxnav li:nth-child(2) span{border:1px solid #6699ff; color: #6699ff; }
ul.boxnav li:nth-child(3) span{border:1px solid #66cc00; color: #66cc00; }
ul.boxnav li.set span{background:url(../images/choiceIcon.png) no-repeat;pading-left:4px;}
ul.boxnav li.set:nth-child(1) span{border:1px solid #ff9900; color: #fff; background-color: #ff9900; background-position: 11px center; }
ul.boxnav li.set:nth-child(2) span{border:1px solid #6699ff; color: #fff; background-color: #6699ff; background-position: 17px center; }
ul.boxnav li.set:nth-child(3) span{border:1px solid #66cc00; color: #fff; background-color: #66cc00; background-position: 23px center; }
ul.boxnav li.set span{background:url(../images/choiceIcon.png) no-repeat;padding-left:3px;}
ul.boxnav li.set:nth-child(1) span{border:1px solid #ff9900; color: #fff; background-color: #ff9900; background-position: 14px center; }
ul.boxnav li.set:nth-child(2) span{border:1px solid #6699ff; color: #fff; background-color: #6699ff; background-position: 20px center; }
ul.boxnav li.set:nth-child(3) span{border:1px solid #66cc00; color: #fff; background-color: #66cc00; background-position: 26px center; }
.IdentityState{margin: 20px;background: #fff;padding: 100px 10px 100px 10px; text-align:center;}
.IdentityState p{padding:10px; margin:10px;}

information-add.html

</head>
<body>
<div id="header" style="position:static;">
<div id="header" class="Nosear">
	<a href="index.html" alt="科袖" class="logo"></a>	
</div>
<div class="container">

privacy.html

</head>
<body>
	<div id="header" style="position:static;">
	<div id="header" class="Nosear">
		<a href="index.html" alt="科袖" class="logo"></a>
        
	</div>