Merge branch 'master' of http://git.yabolive.net:88/libai/Static

overseasActivities/css/base.css

 /*初始化  reset*/
 @charset "utf-8";
+@font-face {
+ font-family:"ProjectPingFang";
+ src:url("./fonts/PingFangMedium.ttf") format("truetype");
+ font-weight:100 900;
+ font-style:normal;
+ font-display:block;
+}
+
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,input,button,textarea,select,p,span,font,em,i,b,strong,button{margin:0;padding:0;}
-body{margin:0;font-family:"Microsoft YaHei",Arial,Helvetica,sans-serif,"宋体"; background:#fff; overflow:visible; color:#333333;}
+body{margin:0;font-family:"ProjectPingFang",sans-serif; background:#fff; overflow:visible; color:#333333;}
 html, body { height: 100%;}
 input,select{font-size:12px;line-height:16px; border:0 none; vertical-align:middle;}
 button{ border:0 none;}
@@ -60,4 +68,9 @@ input[type=number]::-webkit-outer-spin-button {
 ::-webkit-scrollbar{
  display:none;
 }
-/*版芯*/
+
+.ellipsis{
+	  overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
\ No newline at end of file