--解决合并冲突

css/workspace.css

@@ -9,11 +9,7 @@
.updownbtn{text-decoration:underline; color:#333;}
/*左侧菜单*/
<<<<<<< HEAD
.workmenu{text-align: center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
=======
.workmenu{text-align:center; float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
>>>>>>> refs/heads/dev
a.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #ff9900 solid;cursor:pointer; display:block;color:#313131; }
a.worksubmenu{width:100%; height:40px; margin:10px 0; font-size:15px;line-height:40px; color:#313131; cursor:pointer;display: block;}
a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
@@ -183,8 +179,8 @@ a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
	width:650px;
	line-height: 24px;
	display:block;
	white-space:nowrap; 
	overflow:hidden;
	white-space:nowrap; 
	overflow:hidden;
	text-overflow:ellipsis;
}
@@ -242,8 +238,8 @@ a.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
.dialogcontain .dialoginfo .dialogtitTopic{ font-weight: bold;font-size:18px;}
.dialogcontain .dialoginfo .thanksblock{/*width:400px; margin:auto;*/}
/*.dialogcontain .dialoginfo .thankbox{ margin:2px 6px;}*/
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
.dialogcontain .dialoginfo .evamargin{ margin:auto;}*/
/*.dialogcontain .dialoginfo .evadtit{ margin:2px 6px;}*/
@@ -374,8 +370,8 @@ border-color:#FF9900; color:#FFFFFF}
.attentList li .proinfor{display: block;}
.attentList li:hover{background: #EFEFEF;}
.attentList li:first-child{margin-top:0}
.attentList li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
    -webkit-transform: scaleY(.5);
.attentList li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
    -webkit-transform: scaleY(.5);
            transform: scaleY(.5);}
.attentList li:last-child:after{background: none;}