瀏覽代碼

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

happy 8 年之前
父節點
當前提交
d90c27797d
共有 4 個文件被更改,包括 21 次插入9 次删除
  1. 14 2
      css/common.css
  2. 5 5
      css/login.css
  3. 1 1
      information-add.html
  4. 1 1
      privacy.html

+ 14 - 2
css/common.css

@ -1,4 +1,14 @@
1 1
@charset "utf-8";
2
@media(max-width:780px ) {
3
	#header{
4
		min-width:760px;
5
	}
6
}
7
@media(max-width:1100px ) {
8
	#header.Nosear{
9
		width:1100px;
10
	}
11
}
2 12
/* CSS Document */
3 13
.floatL{ float:left;}
4 14
.floatR{float:right;}
@ -41,12 +51,14 @@
41 51
html, body{}
42 52
input{ outline:none;}
43 53
/*header部分*/
44
#header{width:100%;min-width:1100px; height:60px; background:rgba(255,153,0,1); position:fixed; top:0; z-index:999; }
54
#header{width:100%;height:60px; background:rgba(255,153,0,1); position:fixed; top:0; z-index:999; }
55
#header.Nosear{position:static;}
45 56
.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;}
46 57
.searchblock{ width:280px; height:35px; position:absolute; left:50%; top:50%; margin-left:-140px; margin-top:-17.5px; display:none;}
47 58
.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;}
48 59
.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;}
49 60
.search-icon{ display:block; width:20px; height:20px; background:url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
61

50 62
/*顶部右边*/
51 63
.header-right{ float:right; margin-right:80px;}
52 64
/*未登录*/
@ -76,7 +88,7 @@ input{ outline:none;}
76 88
.contentBody{width:1050px;height:auto; margin:10px auto; padding:80px 0 2px 0; }
77 89
/*footer部分*/
78 90
#footer{ min-width:1100px;background:#ff9900;clear: both;height:100px; position: relative; z-index: 100; text-align:center;}
79
#footer .wrapper {margin-left:80px;position: relative;padding: 15px 20px; min-width:1000px;}
91
#footer .wrapper {margin-left:80px;position: relative;padding: 15px 0; min-width:1000px;}
80 92
#footer .footer-logo {display: block;width:80px;height:40px;background: url(../images/logo2.png) 0 0 no-repeat;background-size:100% 100%;}
81 93

82 94
#footer .word_wrapper {padding-top: 12px;line-height: 14px;white-space: nowrap;margin: 12px 0 0 20px;}

+ 5 - 5
css/login.css

@ -218,14 +218,14 @@ html,body{ cursor:default; margin:0; height:100%;}
218 218
.boxnav-title{font-size: 14px; line-height:40px; font-weight: normal;position:relative;padding-left:6px;}
219 219
ul.boxnav{ overflow: hidden;width:100%;}
220 220
ul.boxnav li{list-style: none;width:31%;float:left; padding:0 1%;-webkit-box-sizing: border-box;}
221
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;}
221
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;}
222 222
ul.boxnav li:nth-child(1) span{border:1px solid #ff9900; color: #ff9900; }
223 223
ul.boxnav li:nth-child(2) span{border:1px solid #6699ff; color: #6699ff; }
224 224
ul.boxnav li:nth-child(3) span{border:1px solid #66cc00; color: #66cc00; }
225
ul.boxnav li.set span{background:url(../images/choiceIcon.png) no-repeat;pading-left:4px;}
226
ul.boxnav li.set:nth-child(1) span{border:1px solid #ff9900; color: #fff; background-color: #ff9900; background-position: 11px center; }
227
ul.boxnav li.set:nth-child(2) span{border:1px solid #6699ff; color: #fff; background-color: #6699ff; background-position: 17px center; }
228
ul.boxnav li.set:nth-child(3) span{border:1px solid #66cc00; color: #fff; background-color: #66cc00; background-position: 23px center; }
225
ul.boxnav li.set span{background:url(../images/choiceIcon.png) no-repeat;padding-left:3px;}
226
ul.boxnav li.set:nth-child(1) span{border:1px solid #ff9900; color: #fff; background-color: #ff9900; background-position: 14px center; }
227
ul.boxnav li.set:nth-child(2) span{border:1px solid #6699ff; color: #fff; background-color: #6699ff; background-position: 20px center; }
228
ul.boxnav li.set:nth-child(3) span{border:1px solid #66cc00; color: #fff; background-color: #66cc00; background-position: 26px center; }
229 229

230 230
.IdentityState{margin: 20px;background: #fff;padding: 100px 10px 100px 10px; text-align:center;}
231 231
.IdentityState p{padding:10px; margin:10px;}

+ 1 - 1
information-add.html

@ -17,7 +17,7 @@
17 17
</head>
18 18

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

+ 1 - 1
privacy.html

@ -16,7 +16,7 @@
16 16
</head>
17 17

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