Merge branch 'dev_Ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

public/react/public/css/edu-all.css

@@ -577,7 +577,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 .recently_name{float: left;line-height: 48px;display: block}
 .recently_item:hover{background-color: #F9F9F9;}
 /*私信对话框*/
-.private-list{min-height: 660px;max-height: 835px;overflow-y: auto}
+.private-list{min-height: 660px;max-height: 831px;overflow-y: auto}
 .private-list .private-part{padding-left:20px;cursor: pointer}
 .private-part:hover{background-color: #F5F5F5;}
 .private-part.active{background-color: #F5F5F5;}

public/react/src/modules/message/css/messagemy.css

@@ -71,3 +71,21 @@ z-index: 2;
     height: 30px;
 }
 
+/*滚动条*/
+.private-list::-webkit-scrollbar {
+    width: 8px;
+    height: 8px;
+}
+
+
+.private-list::-webkit-scrollbar-thumb {
+    background-color: #E3EBF4;
+    box-shadow: 0px 0px black;
+}
+
+
+.private-list::-webkit-scrollbar-track {
+    border-radius:3px;
+    -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0);
+    background-color: white;
+}

public/stylesheets/educoder/edu-all.css

@@ -580,7 +580,7 @@ p .activity-item:first-child{border-top: 1px solid #eee;}
 .recently_name{float: left;line-height: 48px;display: block}
 .recently_item:hover{background-color: #F9F9F9;}
 /*私信对话框*/
-.private-list{min-height: 660px;max-height: 835px;overflow-y: auto}
+.private-list{min-height: 660px;max-height: 831px;overflow-y: auto}
 .private-list .private-part{padding-left:20px;cursor: pointer}
 .private-part:hover{background-color: #F5F5F5;}
 .private-part.active{background-color: #F5F5F5;}