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

public/javascripts/educoder/edu_account.js

@@ -61,10 +61,10 @@ $(function(){
 
     loadProvince();
 
-    if($("#name_loggin_input").length > 0 && $("#name_loggin_input").val().trim() != ""){
+    //if($("#name_loggin_input").length > 0 && $("#name_loggin_input").val().trim() != ""){
         $("#psd_login_btn").addClass("edu-back-blue");
         $("#psd_login_btn").attr("disabled", false);
-    }
+    //}
 
 });
 $(window).resize(function(){

public/stylesheets/educoder/edu-main.css

@@ -170,7 +170,7 @@ input::-ms-clear{display:none;}
 /*自定义滚动条宽度*/
 ::-webkit-scrollbar  {width:7px;height:10px;background-color: #F5F5F5;  }
 ::-webkit-scrollbar-track  {-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);background-color: #F5F5F5;}
-::-webkit-scrollbar-thumb  {-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);background-color: #dadada;}
+::-webkit-scrollbar-thumb  {-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,.3);background-color: #b5b5b5;border-radius: 78px;}
 
 
 .newContainer{ min-height:100%; height: auto !important; height: 100%; /*IE6不识别min-height*/position: relative;}