Home Explore Help
Register Sign In
jiapeng
/
portal-front
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 317 Releases 0 Wiki
Browse Source

可视区域的调整，文字溢出的隐藏

luyanan 8 years ago
parent
8057de54bc
commit
85602e8ae9
8 changed files with 26 additions and 26 deletions
Split View Show Diff Stats
  1. 4 4
      css/common.css
  2. 2 2
      css/genindex.css
  3. 8 8
      css/index.css
  4. 1 1
      css/newsciresource.css
  5. 4 4
      css/workspace.css
  6. 3 3
      js/information.js
  7. 1 1
      js/needList.js
  8. 3 3
      js/newsciresource.js

+ 4 - 4
css/common.css
View File 

@ -137,10 +137,10 @@ button.btnModel[disabled]:hover{background:#d6d8de;}
137 137 
/* .loginbtn:hover{border:2px #fff solid;} */
138 138 
/*已登录*/
139 139 
.onlogin{ display:none; position:relative;}
140 
.head-portrait{width:40px; height:40px;background-size:100% 100%;-moz-background-size:100% 100%; float:left;margin: 10px 16px; cursor:pointer;overflow:hidden; }
140 
.head-portrait{width:40px; height:40px;background-size:100% 100%;-moz-background-size:100% 100%; float:left;margin: 10px 0 10px 16px; cursor:pointer;overflow:hidden; }
141 141 
.portrait-p{ width:100%;}
142 
.personal-infor{width:202px; height:179px; position:absolute; top:40px; right:8px; display:none;}
143 
.triangleB{ display:block; width:0; height:0; border:8px solid transparent; border-bottom-color:#f3a36c; float:right; margin-right:20px; margin-top:15px;}
142 
.personal-infor{width:202px; height:179px; position:absolute; top:40px; right:2px; display:none;}
143 
.triangleB{ display:block; width:0; height:0; border:8px solid transparent; border-bottom-color:#f3a36c; float:right; margin-right:12px; margin-top:15px;}
144 144 
.personal-box{ width:202px;background:#f3a36c; clear:both; overflow:hidden;}
145 145 
.personal-box a{ display:block; width:202px; height:40px;line-height:40px; font-size: 13px; color:#fff;}
146 146 
.personal-box a:hover{ background:#ff9900;}

@ -242,7 +242,7 @@ button.btnModel[disabled]:hover{background:#d6d8de;}
242 242 
.privacyBox ul{ margin:0 4px;margin-left:40px;padding:0 4px; color:#666;}
243 243
244 244
245 
.containerCon{width:1100px;padding:0 10px;position:relative; margin:auto;clear:both}
245 
.containerCon{width:1120px;padding:0 10px;position:relative; margin:auto;clear:both}
246 246 
.containerCon:before,.containerCon:after{display:table;content:" "}
247 247 
.containerCon:after{clear:both}
248 248

+ 2 - 2
css/genindex.css
View File 

@ -222,7 +222,7 @@ ul.cmpAllUl.cmpSettledul .frmtype{height:40px;}
222 222 
.successImg{display:inline-block;width:100%; height:88px; background:url(../images/sign_icon_chenggong_nor.png) center center no-repeat;}
223 223 
.failImg{display:inline-block;width:100%; height:88px; background:url(../images/sign_icon_shibai_nor.png) center center no-repeat;}
224 224 
/*登录相关*/
225 
.signLogo{height:70px;width:270px;background:url(../images/c-sign-on_icon_logo_nor.png);background-size:cover;margin: 30px 20px 20px 0}
225 
.signLogo{display:block;height:70px;width:270px;background:url(../images/c-sign-on_icon_logo_nor.png);background-size:cover;margin: 30px 20px 20px 0}
226 226 
.covbodyBg{background:url(../images/c-sign-on_bg_img_nor.png) 0 bottom no-repeat;background-size:cover;}
227 227 
.contConP{position:static}
228 228 
.covFrmblock{position:absolute;top:50%; left:50%; transform:translate(-50%,-50%);overflow:hidden;padding:40px 30px 30px 30px;/*margin:10% auto 40px;*/width:420px;max-width:420px;background:#fff;border-radius:8px;z-index:1056; 
@ -248,7 +248,7 @@ ul.cmpAllUl.cmpCoverUl .importTip{font-size:18px;color:#333;}
248 248
249 249 
/*发现*/
250 250 
.contentCon{padding-top:80px;}
251 
.leftconBox{width:800px;padding-bottom:20px;margin-bottom:20px;background: #FFFFFF;}
251 
.leftconBox{width:820px;padding-bottom:20px;margin-bottom:20px;background: #FFFFFF;}
252 252 
.table-item{/*padding:10px;*/}
253 253 
.table-item li{position:relative;padding:25px 20px;}
254 254 
.table-item li:after{content:"";position:absolute; left:0; right:0; bottom:0;height: 2px;background: #f7f7f8;}

+ 8 - 8
css/index.css
View File 

@ -39,7 +39,7 @@ input{ outline:none;}
39 39 
.btn:hover,.btn:focus{outline:none;box-shadow: none;color: #FFFFFF;}
40 40
41 41 
.link-btn-box{padding:20px 0 50px;}
42 
.link-btn-block{ width: 96%;text-align: center;margin-top: 50px;padding:10px 20px 40px; border:2px solid #eaeaea;background:#f8fbfb;border-radius:4px;}
42 
.link-btn-block{ width: 96%;margin:auto;text-align: center;margin-top: 50px;padding:10px 20px 40px; border:2px solid #eaeaea;background:#f8fbfb;border-radius:4px;}
43 43 
.link-btn{position: relative; width: 32%;margin:auto;margin-bottom: 46px; background: #fff;height: 2px;top: -12px;}
44 44 
.link-btn-icon{position: absolute;top: -36px;left: 50%; margin-left: -40px;width:80px;height:80px;border-radius: 10px;background-position: center;background-repeat: no-repeat;}
45 45 
.link-btn-icon-fabu{background-image: url(../images/home_icon_fabuxuqiu_nor.png);}

@ -81,7 +81,7 @@ input{ outline:none;}
81 81
82 82 
/*搜索页*/
83 83 
.content{ width:100%; min-width: 1050px; height:auto; background:#f8f8f8; padding:60px 0 2px 0; }
84 
.content-in{ width:1050px;/*min-height:300px;*/ margin:auto;padding-bottom:20px;}
84 
.content-in{padding-bottom:20px;}
85 85 
.sear-search{ width: 774px;height: 38px;border: 2px solid #ff9900;border-radius: 6px; margin: 20px 0;}
86 86 
.sear-search .lookwho{border-right: 2px #ff9900 solid;font-size:15px;color:#ff9900;line-height:34px; height:34px; width:100px; border:none; border-right: 2px #ff9900 solid;border-radius:4px 0 0 4px; background:url(../images/downselect.png) no-repeat 70px center #fff; padding-left:16px; }
87 87 
.sear-search .lishow{background: #fff; overflow: hidden;border-radius: 0 0 6px 6px; position: absolute;top: 32px;left: -2px;width: 102px;border: 2px solid #ff9900; border-top: none;z-index: 20; display: none;}

@ -121,7 +121,7 @@ input{ outline:none;}
121 121 
.synopsis{ float:left; padding:10px 0; width:74%;line-height:24px;cursor: pointer;}
122 122 
.named{display:block;font-size:18px; color:#333; float:left;}
123 123 
.named:hover,.named:focus,.named:active{color:#333; text-decoration:none;}
124 
.modify{ display:block; width:16px; height:16px; background:url(../images/onauth.png) center center no-repeat; background-size:100% 100%; float:left; margin:2px;}
124 
.modify{ display:block; width:16px; height:16px;float:left; margin:3px 2px;}
125 125 
.position{ clear:both;font-size:16px;  color:#777; }
126 126 
.science{font-size:14px; color:#999;}
127 127 
.ellipsisbox p{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}

@ -145,7 +145,7 @@ input{ outline:none;}
145 145 
.industrybox{font-size:14px; color:#999;  }
146 146 
/*------------------------------------------------------------------------------------*/
147 147 
/*账号设置*/
148 
.account{ width:1050px; min-height:100px; margin:auto; padding: 40px 0;overflow: hidden;}
148 
.account{ min-height:100px; margin:auto; padding-top: 40px;overflow: hidden;}
149 149 
.account-set{ width:12%; min-height: 280px; float:left; background:#f8f8f8; border-radius:6px; margin-top:50px; overflow:hidden;}
150 150 
.account-title{ height:58px; padding:0 20px;font-size:17px;line-height:68px;color:#a3a3a3;}
151 151 
.leftsidebar{ display:block; width:100%; height:40px; padding-left:30px;font-size:15px;line-height:40px; color:#313131;}

@ -235,8 +235,9 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
235 235 
.coulstblock .coulstbox .coulstbtn{padding:24px 10px; margin-right: 20px;}
236 236 
.coulstbtn span,#conbtn span{display:inline-block;width:120px;text-align:center;padding:8px;margin-right:6px; border-radius:4px; text-align:center; color:#fff; background:#ff9900;cursor:pointer}
237 237 
.coulstbtn .shareWeixin{background: #52DA4D;}
238 
.shareCode{position: absolute;top:-156px;left: 50%;margin-left: -75px;display: none;width: 150px;height:150px;}
239 
.shareCode img{width: 100%;}
238 
.shareCode{background:#FFFFFF;border:6px solid rgba(0,0,0,.2);padding:8px;position: absolute;bottom:40px;left:0;display: none;width: 260px;}
239 
.shareCode img{width:80px;height:80px;}
240 
.shareCode .shareWord{width: 126px;margin:10px;color:#666666;text-align: left;}
240 241 
.coulstbtn .attentBtn{position:relative;padding-left:20px;border:1px solid #ff9900;color:#ff9900;background: transparent;}
241 242 
.coulstbtn .attentBtn em{position:absolute;top:50%;margin-top:-8px;left:34px;display:inline-block; width:16px;height:18px;background:url(../images/favoricon.png) 0 -32px no-repeat;background-size:100% auto;}
242 243 
.coulstbtn .attentBtn i{font-style: normal;}

@ -536,8 +537,7 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
536 537 
.share-nav .upTop{background: url(../images/wrapIcon.png) 0 0 no-repeat; background-size:100% auto ;}
537 538 
.share-nav .upTop:hover{background: url(../images/wrapIcon.png) 0 -24px no-repeat; background-size:100% auto ;}
538 539 
.share-nav .shareBttn{display: inline-block;position:relative;border:1px solid #52DA4D;color: #52DA4D; border-radius: 999em;cursor:pointer;padding:2px 24px;}
539 
.share-nav .shareCode{position: absolute;top:-166px;left: 50%;margin-left: -80px;display: none;width: 160px;height:160px;}
540 
.share-nav .shareCode img{width: 100%;}
540 
.share-nav .shareCode{margin-left: -40px;}
541 541 
.share-nav .shareBttn:hover{background: #52DA4D;color: #FFFFFF;}
542 542 
.share-nav .wordHave{background: url(../images/wrapIcon.png) 0 -47px no-repeat; background-size:100% auto ;}
543 543 
.share-nav .wordHave:hover{background: url(../images/wrapIcon.png) 0 -69px no-repeat; background-size:100% auto;}

+ 1 - 1
css/newsciresource.css
View File 

@ -1,7 +1,7 @@
1 1 
@charset "utf-8";
2 2 
/* 新研发资源样式 */
3 3
4 
.addworkbtn,.addworkbtn-list{width:228px; height:294px;float: left; border-radius: 6px ;
4 
.addworkbtn,.addworkbtn-list{width:218px; height:294px;float: left; border-radius: 6px ;
5 5 
    border: 1px dashed #d4d8db;cursor: pointer;background:#eff3f6 url(../images/zyadd.png) no-repeat center;}
6 6 
.addworkbtn:hover{background:#fff url(../images/zyadd.png) no-repeat center;}
7 7 
.addworkbtn{margin-left:12px}

+ 4 - 4
css/workspace.css
View File 

@ -1,6 +1,6 @@
1 1 
@charset "utf-8";
2 2 
/* CSS Document */
3 
.con-center{ width:1170px;position:relative; margin:auto; overflow:hidden;padding:20px 10px; margin-top:60px;}
3 
.con-center{ width:1120px;position:relative; margin:auto; overflow:hidden;padding:20px 10px; margin-top:60px;}
4 4 
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font-size:14px;line-height:30px;}
5 5 
.sendCon{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font-size:14px;line-height:30px;}
6 6 
.frmtype:focus{ border:1px solid #ff8500;}
 
@ -61,7 +61,7 @@ a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
61 61 
/*////////////我的工作台/////////////////*/
62 62 
.workblock{width:100%; padding:10px; overflow:hidden;  background:#fff;margin-bottom:16px;}
63 63 
.workhs{ width:34%; overflow:hidden;}
64 
.workconleft{width:70%; /*  width:100%; */}
64 
.workconleft{width:73%; /*  width:100%; */}
65 65 
.workhead{ display:block; margin:10px auto 2px auto; width:76px; overflow:hidden;}
66 66 
.workstat{font-size: 12px; float:left; width:100%; text-align:center;}
67 67 
.workstat span{font-size:18px;line-height:30px;margin: 0 4px;}
 
@ -143,11 +143,11 @@ a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
143 143 
	-webkit-background-size:cover;}
144 144 
.tagsBox{padding:4%; overflow: hidden;text-overflow: ellipsis; white-space: nowrap;}
145 145 
.tagsBox span{color:#666;margin:0 2px;font-size: 13px;}
146 
.art_topicBox2 .art_img{width:226px;height:200px;}
146 
.art_topicBox2 .art_img{width:216px;height:200px;}
147 147 
#newsbox .addworkbtn,#newsbox .addworkbtn-list{height:242px;}
148 148
149 149 
/*公告*/
150 
.workconright{ width:29%;}
150 
.workconright{ width:26%;}
151 151 
.worknotice{ width:100%; height:478px;/*  border:1px solid #d6d6d6; */background:#fff; position: relative;text-align: center; margin:1px;}
152 152
153 153 
/*////////////咨询/////////////////*/

+ 3 - 3
js/information.js
View File 

@ -2046,11 +2046,11 @@ $(function() {
2046 2046 
					add += '<img class="resImg headRadius resourceImg" src="" /></div></a>'
2047 2047 
					add += '<div class="shareopeart"></div>'
2048 2048 
					add += '</div>'
2049 
					add += '<p class="restit">资源名称：<span class="presou">' + data.data[i].resourceName + '</span></p>'
2049 
					add += '<p class="restit ellipsisSty">资源名称：<span class="presou">' + data.data[i].resourceName + '</span></p>'
2050 2050 
					if(data.data[i].supportedServices == undefined) {
2051 2051 
						data.data[i].supportedServices = "";
2052 2052 
					}
2053 
					add += '<p class="briefinfor">应用用途：' + data.data[i].supportedServices + '</p>'
2053 
					add += '<p class="briefinfor ellipsisSty-2">应用用途：' + data.data[i].supportedServices + '</p>'
2054 2054 
					add += '</div>'
2055 2055 
					$add = $(add);
2056 2056 
					$("#keyanRe").append($add);

@ -2123,7 +2123,7 @@ $(function() {
2123 2123 
					for(var i = 0; i < data.data.length; i++) {
2124 2124 
						var add = '<li style="cursor:auto">'
2125 2125 
						add += '<div class="art_topicBox"><div class="art_img" style="cursor:auto"></div>'
2126 
						add += '<div class="art_tbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
2126 
						add += '<div class="art_tbox"><h6 class="ellipsisSty" id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
2127 2127 
						add += '</div><div class="tagsBox"><span></span></div>'
2128 2128 
						add += '</li>';
2129 2129 
						$add = $(add);

+ 1 - 1
js/needList.js
View File 

@ -86,7 +86,7 @@ $(document).ready(function() {
86 86 
			dataString += "<h6 style='position:relative;'>"
87 87 
			dataString += "<div class='titList'>需求主题：<em class='h4Font'>" + $data[i].demandTitle + "</em></div>"
88 88 
			dataString += "<span class='lasttime rightTime'>" + oTime + "</span>"
89 
			dataString += "<div style='height:70px;'><p class='rebackcon' >" + $data[i].demandContent + "</p></div></div>"
89 
			dataString += "<div style='height:70px;'><p class='ellipsisSty-2 rebackcon' >" + $data[i].demandContent + "</p></div></div>"
90 90 
			dataString += "<div class='workhandle'><div class='rightopert floatR'>"
91 91 
			dataString += "<span class='replybtn' demanid='" + $data[i].demandId + "'>查看</span></div>"
92 92 
			dataString += "<div class='leftstate floatR'>"

+ 3 - 3
js/newsciresource.js
View File 

@ -156,13 +156,13 @@ $(function() {
156 156 
						$("#professor").text(name);
157 157 
						if(info.data.images.length) {
158 158 
							var $liMages = $(
159 
								'<div id="WU_FILE" class="file-item thumbnail ResImgBox" style="max-width:226px;width:226px;height: 226px;">' +
159 
								'<div id="WU_FILE" class="file-item thumbnail ResImgBox" style="max-width:216px;width:216px;height: 216px;">' +
160 160 
								'<img class="resImg headRadius resourceImg" style="display: inline;" src="/images/resource/' + resourceID + '.jpg">' +
161 161 
								'</div>'
162 162 
							)
163 163 
						} else {
164 164 
							var $liMages = $(
165 
								'<div id="WU_FILE" class="file-item thumbnail ResImgBox" style="max-width:226px;width:226px;height: 226px;">' +
165 
								'<div id="WU_FILE" class="file-item thumbnail ResImgBox" style="max-width:216px;width:216px;height: 216px;">' +
166 166 
								'<img class="resImg headRadius resourceImg" style="display: inline;" src="/images/default-resource.jpg">' +
167 167 
								'</div>'
168 168 
							)

@ -298,7 +298,7 @@ $(function() {
298 298 
					for(var i = 0; i < data.data.length; i++) {
299 299
300 300 
						var add = '<div class="addworkbtn-list"> <div class="resoumag">'
301 
						add += '<div class="ResImgBox" style="max-width:226px;width:226px;height: 226px;"><img class="resImg headRadius resourceImg" src="" /></div>'
301 
						add += '<div class="ResImgBox" style="max-width:216px;width:216px;height: 216px;"><img class="resImg headRadius resourceImg" src="" /></div>'
302 302 
						add += '<h2>' + data.data[i].resourceName + '</h2>'
303 303 
						add += '<p>' + data.data[i].supportedServices + '</p>'
304 304 
						add += '</div></div>';