Ver Código Fonte

--解决合并冲突

zzy.zhiyuan.foxmail 7 anos atrás
pai
commit
4836634d0a
1 arquivos alterados com 6 adições e 10 exclusões
  1. 6 10
      css/workspace.css

+ 6 - 10
css/workspace.css

@ -9,11 +9,7 @@
9 9
.updownbtn{text-decoration:underline; color:#333;}
10 10
11 11
/*左侧菜单*/
12
<<<<<<< HEAD
13
.workmenu{text-align: center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
14
=======
15 12
.workmenu{text-align:center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
16
>>>>>>> refs/heads/dev
17 13
a.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #ff9900 solid;cursor:pointer; display:block;color:#313131; }
18 14
a.worksubmenu{width:100%; height:40px; margin:10px 0; font-size:15px;line-height:40px; color:#313131; cursor:pointer;display: block;}
19 15
a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
@ -183,8 +179,8 @@ a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
183 179
	width:650px;
184 180
	line-height: 24px;
185 181
	display:block;
186
	white-space:nowrap; 
187
	overflow:hidden;
182
	white-space:nowrap; 
183
	overflow:hidden;
188 184
	text-overflow:ellipsis;
189 185
}
190 186
@ -242,8 +238,8 @@ a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
242 238
.dialogcontain .dialoginfo .dialogtitTopic{ font-weight: bold;font-size:18px;}
243 239
.dialogcontain .dialoginfo .thanksblock{/*width:400px; margin:auto;*/}
244 240
/*.dialogcontain .dialoginfo .thankbox{ margin:2px 6px;}*/
245
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
246
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
241
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
242
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
247 243
.dialogcontain .dialoginfo .evamargin{ margin:auto;}*/
248 244
249 245
/*.dialogcontain .dialoginfo .evadtit{ margin:2px 6px;}*/
@ -374,8 +370,8 @@ border-color:#FF9900; color:#FFFFFF}
374 370
.attentList li .proinfor{display: block;}
375 371
.attentList li:hover{background: #EFEFEF;}
376 372
.attentList li:first-child{margin-top:0}
377
.attentList li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
378
    -webkit-transform: scaleY(.5);
373
.attentList li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
374
    -webkit-transform: scaleY(.5);
379 375
            transform: scaleY(.5);}
380 376
.attentList li:last-child:after{background: none;}
381 377