Merge branch 'master' of git.minrow.com:reyun/saasio

src/main/websrc/js/app/directive.js

@@ -2079,6 +2079,12 @@
 							$scope.backList = function(){
 								$scope.isDetail = false;
 							}
+
+							angular.element(document).on("click",function(){
+	            	$scope.$apply(function(){
+	            		$scope.isLookList = false;
+	            	});
+	            });
 	        }
 	    };
     }

src/main/websrc/styles/style.scss

@@ -6852,6 +6852,9 @@ pre{
 					color:#666;
 					font-weight: normal;
 					cursor: pointer;
+					&:hover{
+						text-decoration: underline;
+					}
 				}
 				em{
 					display: block;
@@ -6864,7 +6867,6 @@ pre{
 					i{visibility: visible;}
 					h6{
 						color:#333;
-						text-decoration: underline;
 					}
 				}
 			}
@@ -6899,6 +6901,7 @@ pre{
 				padding-top: 22px;
 				.h5{
 					font-size:16px;
+					word-wrap:break-word;
 				}
 				.p{
 					color:#999999;
@@ -6906,6 +6909,7 @@ pre{
 				.noticeNews{
 					line-height: 24px;
 					padding-top: 20px;
+					word-wrap:break-word;
 				}
 			}
 		}

src/main/websrc/template/common/notice.html

-<div class="noticeBox">
+<div class="noticeBox" stop-event>
   <div class="newInfo" ng-if="noreadList.length>0 && !isLookList" ng-click="changeLook()"><i></i>您有{{noreadList.length}}条新公告</div>
   <div class="noNewInfo" ng-if="noreadList.length==0 && !isLookList" ng-click="changeLook()"></div>
   <div class="noticeWin" ng-if="isLookList && !isDetail">
@@ -16,7 +16,7 @@
     <div class="hideNotice" ng-click="changeLook()"></div>
   </div>
   <div class="noticeWin" ng-if="isLookList && isDetail">
-    <div class="winTitle small" ng-click="backList()">
+    <div class="winTitle small">
       <div class="noticeBack" ng-click="backList()"></div>
       <div class="photo"></div>热云数据运营团队
     </div>