Browse Source

解决样式冲突问题

luyanan 8 years ago
parent
commit
a922cc2e70

+ 3 - 3
src/main/webapp/css/index.css

@ -251,9 +251,9 @@ label.edu-radio{ float:none;font:16px/26px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei
251 251
.shareabout{ position:relative; margin:0 20px;}
252 252
.sharesrcbox{overflow:hidden; position:relative; margin:auto; width:640px;  }
253 253
.sharescrollbox{ overflow:hidden;width:30000em; position:relative; left:0;}
254
.sharesrc{ width:192px; margin:10px; float:left;}
255
.briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
256
.shareshow{ position:relative;}
254
.sharescrollbox .sharesrc{ width:192px; margin:10px; float:left;}
255
.sharescrollbox .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
256
.sharescrollbox .shareshow{ position:relative;}
257 257
.shareopeart{ position:absolute; bottom:0px; left:0px; z-index:100; overflow:hidden; width:100%;}
258 258
.sharebtn{ display:block; text-align:center; float:left; cursor:pointer; width:50%; height:30px; font:14px/30px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; background:rgba(0,0,0,.2); color:#fff; border:1px solid #d6d6d6;}
259 259
.sharebtn:hover{ color:#fff; background:#ff8400;}

+ 7 - 7
src/main/webapp/css/workspace.css

@ -81,8 +81,8 @@
81 81

82 82
.workinfor{width:64%; margin-top:20px; padding:10px 16px;min-height:140px;}
83 83
.workinfor h4{ overflow:hidden;}
84
.named{display:block;font:18px/34px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; font-weight:bold; color:#000; float:left;}
85
.named:hover,.named:focus,.named:active{color:#000; text-decoration:none;}
84
.workinfor .named{display:block;font:18px/34px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; font-weight:bold; color:#000; float:left;}
85
.workinfor .named:hover,.workinfor .named:focus,.workinfor .named:active{color:#000; text-decoration:none;}
86 86

87 87
.workinfor h5{ font:16px/30px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; font-weight:bold;}
88 88
.workinfor h6{ font:13px/24px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; font-weight:bold;}
@ -109,11 +109,11 @@
109 109
.writespan{ margin-top:10px; font-weight:bold;}
110 110

111 111
/*资源、项目*/
112
.sharesrcbox{ overflow:hidden; width:100%; padding:10px; height:240px;}
113
.sharesrc{ width:28%; margin:10px 20px; float:left;}
114
.briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
115
.shareshow{ position:relative; overflow:hidden;}
116
.shareopeart{ position:absolute;background:rgba(0,0,0,.4); line-height:30px; text-align:center; bottom:-30px; left:0px; z-index:100; overflow:hidden; width:100%; cursor:pointer;}
112
.sharesrcbox11{ overflow:hidden; width:100%; padding:10px; height:240px;}
113
.sharesrcbox11 .sharesrc{ width:28%; margin:10px 20px; float:left;}
114
.sharesrcbox11 .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
115
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;}
116
.sharesrcbox11 .shareopeart{ position:absolute;background:rgba(0,0,0,.4); line-height:30px; text-align:center; bottom:-30px; left:0px; z-index:100; overflow:hidden; width:100%; cursor:pointer;}
117 117

118 118
.objectsrcbox{ overflow:hidden; width:100%; padding:10px; height:160px;}
119 119
.objectsrc{float:left;  width:28%; margin:10px 20px;  height:120px; background:rgba(0,0,0,.03); /*border:1px dashed #e5e5e5;*/ padding:30px 10px; cursor:pointer; }

+ 2 - 2
src/main/webapp/js/information.brow.js

@ -180,7 +180,7 @@ $(function(){
180 180
						
181 181
						if($photos.length>0){
182 182
							for(var j =0 ; j< $photos.length;++j){
183
								showDiv += "<span class='like-people'><img class='like-h' src='"+servPath+"/images/head/"+$photos[j]+"_s.jpg'></span>";
183
								showDiv += "<span class='like-people'><img class='like-h' src='/images/head/"+$photos[j]+"_s.jpg'></span>";
184 184
								
185 185
							} 
186 186
						}
@ -190,7 +190,7 @@ $(function(){
190 190
						$(".like-h").load(function(){								
191 191
						})
192 192
						.error(function(){
193
							$(this).attr("src",servPath+"/images/default-photo.jpg");
193
							$(this).attr("src","/images/default-photo.jpg");
194 194
						});	
195 195
							
196 196
					}

+ 1 - 1
src/main/webapp/workspaces.html

@ -149,7 +149,7 @@
149 149
                        <div class="workblock">
150 150
                            <div class="worktit">正在使用的科研资源<a class="worklinkbtn floatR">查看全部</a></div>
151 151
                            <div class="wbcon">
152
                                <div class="sharesrcbox">
152
                                <div class="sharesrcbox11">
153 153
                                    <div class="sharesrc">
154 154
                                        <div class="shareshow">
155 155
                                            <a href=""><img src="" width="100%" height="140"></a>