Merge branch 'beta' into 'English'

css/Desktop/Desktop.css

@@ -1,4 +1,11 @@
 /*整体样式*/
+/* @font-face {
+    font-family: 'Source Han Sans SC';
+    src: url('SourceHanSans-Regular.otf') format('truetype');
+    font-weight: normal;
+    font-style: normal;
+  } */
+
 
 html {}
 
@@ -14,7 +21,7 @@ body {
     border: 0;
     width: 100%;
     font-size: 12px;
-    font-family: lucida, "Hiragino Sans GB", "微软雅黑", "WenQuanYi Micro Hei", sans-serif;
+    font-family: '黑体';
     color: #333;
     background-color: #FFF;
 }
@@ -466,6 +473,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
     display: flex;
 }
 
+
 .U_MD_D_BD_noticeBox_title>span:nth-child(1) {
     /* margin-left: 8px; */
     width: calc(100%);
@@ -488,6 +496,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
     white-space: nowrap;
     word-break: break-word;
     color: #979797;
+
 }
 
 .U_MD_D_BD_noticeBox_time {
@@ -497,6 +506,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
     font-size: 14px;
 }
 
+
 .U_MD_D_BZMD {
     position: relative;
 }
@@ -731,6 +741,14 @@ body div ::-webkit-scrollbar-resizer:vertical {
     background-color: #8eaad1;
     border-radius: 5px;
     box-sizing: border-box;
+    height: auto;
+}
+
+
+.U_MD_D_KO:hover .U_MD_D_KOX {
+    height: auto;
+    white-space: break-spaces;
+    overflow: visible;
 }
 
 .U_MD_D_KO_GM {
@@ -749,7 +767,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
 }
 
 .U_MD_D_KOA {
-    margin: 5px auto 0 auto;
+    margin: 5px auto 5px auto;
     width: 57px;
     border-radius: 5px;
     display: flex;
@@ -768,13 +786,18 @@ body div ::-webkit-scrollbar-resizer:vertical {
 }
 
 .U_MD_D_KOX {
-    width: 51px;
-    height: 15px;
+    width: 60px;
+    height: 30px;
     line-height: 15px;
     margin-top: 3px;
+    overflow: hidden;
     text-align: center;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    word-break: break-all;
 }
 
+
 .U_MD_D_NewsTipsIcon {
     background: rgba(250, 250, 250, 0) url(/img/YSD20143.png);
     position: fixed;
@@ -1072,7 +1095,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
 .U_PBL_Check>div {
     background: #595959;
     height: 45px;
-    width: 200px;
+    width: 110px;
     font-size: 14px;
     border-radius: 5px;
     opacity: .7;
@@ -1113,4 +1136,79 @@ body div ::-webkit-scrollbar-resizer:vertical {
 
 .U_PBL_Check>.active {
     opacity: 1;
+}
+
+
+.U_MD_D_BD_vip_box {
+    display: none;
+    /* background-color: #586e86;
+    border: 1px solid #344558; */
+    position: absolute;
+    right: 100px;
+    top: 0;
+    border-radius: 10px;
+    width: 270px;
+    /* height: 100px; */
+    padding: 10px 10px;
+    box-sizing: border-box;
+    box-shadow: 0px 3px 6px 0px #0000003b;
+    background-image: url(../../img/icon/vip_box.png);
+    background-size: 100% 100%;
+}
+
+.vip_info {
+    display: flex;
+    align-items: center;
+}
+
+.vip_info>img {
+    width: 45px;
+    height: 45px;
+    object-fit: cover;
+}
+
+.vip_info>div {
+    margin-left: 10px;
+    display: flex;
+    flex-direction: column;
+    font-size: 14px;
+}
+
+.vip_info>div>span {}
+
+.vip_info>div>span+span {
+    margin-top: 8px;
+}
+
+.vip_school {
+    font-size: 14px;
+    margin-top: 8px;
+    color: #9baabd;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    width: 100%;
+}
+
+
+.U_PBL_Check2 {
+    position: fixed;
+    bottom: calc(15% - 55px);
+    right: 5%;
+}
+
+.U_PBL_Check2>div {
+    background: #595959;
+    height: 45px;
+    width: 110px;
+    font-size: 14px;
+    border-radius: 5px;
+    cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+}
+
+.U_PBL_Check2>div>span {
+    color: #fff;
 }

css/Desktop/Taskbar.css

@@ -1,35 +1,196 @@
 /*任务管理器*/
 
 /*任务栏*/
-.U_MD_D_RW      { z-index:99;width:100%; height:65px; position:absolute; left:0; bottom:-60px; background-color:#505050; border-radius:0 8px 0 8px; box-shadow:0 0 30px 5px #212121; -webkit-box-shadow:0 0 30px 5px #212121; }
-#U_MD_D_RW      { width:800px; color:#FFF; height:100%; /*overflow: hidden;*/ float:left; }
-#U_MD_D_RW  div { color:#111; }
-#U_MD_D_RW .U_MD_D_BZMOA:hover   { /*background-color:transparent;*/background-color:#6F6F6F; border:0; padding:6px; }
-#U_MD_D_RW .U_MD_D_BZMO    { margin-left:4px; position:relative; }
-#U_MD_D_RW .U_MD_D_BZMON   { margin-top:4px; color:#FFF; }
-.U_MD_D_RW_L     { float:left; width:21px; height:100%; background-color:#00A8FD; position:relative;}
-.U_MD_D_RW_R     { float:right; width:21px; height:100%;background-color:#6d6d6d; position:relative;}
+.U_MD_D_RW {
+    z-index: 99;
+    width: 100%;
+    height: 65px;
+    position: absolute;
+    left: 0;
+    bottom: -60px;
+    background-color: #505050;
+    border-radius: 0 8px 0 8px;
+}
+
+#U_MD_D_RW {
+    width: 800px;
+    color: #FFF;
+    height: 100%;
+    /*overflow: hidden;*/
+    float: left;
+}
+
+#U_MD_D_RW div {
+    color: #111;
+}
+
+#U_MD_D_RW .U_MD_D_BZMOA:hover {
+    /*background-color:transparent;*/
+    background-color: #6F6F6F;
+    border: 0;
+    padding: 6px;
+}
+
+#U_MD_D_RW .U_MD_D_BZMO {
+    margin-left: 4px;
+    position: relative;
+}
+
+#U_MD_D_RW .U_MD_D_BZMON {
+    margin-top: 4px;
+    color: #FFF;
+}
+
+.U_MD_D_RW_L {
+    float: left;
+    width: 21px;
+    height: 100%;
+    background-color: #00A8FD;
+    position: relative;
+}
+
+.U_MD_D_RW_R {
+    float: right;
+    width: 21px;
+    height: 100%;
+    background-color: #6d6d6d;
+    position: relative;
+}
+
 /*.U_MD_D_RW *        { zoom:1; -moz-transform:scale(1); -webkit-transform:scale(1); -o-transform:scale(1); transform:scale(1); -ms-transform:scale(1); color:#333; }*/
-.U_MD_D_RW_T     { text-align:center; padding:5px 0; border-bottom:1px solid # color:#006699; font-size:13px; color:#FFF; margin-top:16px; }
-.U_MD_D_RW_I     { width:21px; height:45px; float:left; margin-top:19px; }
+.U_MD_D_RW_T {
+    text-align: center;
+    padding: 5px 0;
+    border-bottom: 1px solid # color:#006699;
+    font-size: 13px;
+    color: #FFF;
+    margin-top: 16px;
+}
+
+.U_MD_D_RW_I {
+    width: 21px;
+    height: 45px;
+    float: left;
+    margin-top: 19px;
+}
+
 /*.U_MD_D_RW_IO    { width:47px; height:47px; background-position:-729px -337px; margin:auto; cursor:pointer; }
 .U_MD_D_RW_IO:hover      { background-position:-787px -339px; }*/
-*.U_MD_D_RW_IO   {  width:21px;height:100%;}
-.U_MD_D_RW_CD   { width:21px;margin-top:16%;}
-.U_MD_D_RW_GU    { width:21px;height:30%;/*background-color:gray;*/}
-.U_MD_D_RW_GU:hover{background-color:gray;}
-.U_MD_D_RW_GD    { width:21px;height:30%;/*background-color:gray;*/position:absolute;bottom:0;}
-.U_MD_D_RW_GD:hover{background-color:gray;}
-.U_MD_D_RW_GU_g  { width:21px;}
-.U_MD_D_RW_GD_g  { width:21px;}
-.U_MD_D_RW .U_MD_D_T_taskbar_Name{display:none;width:115px;height:31px;background:rgba(111,111,111,1);border-radius:1px;font-size:15px;}
-#U_MD_D_RW .U_MD_D_T_taskbar_Close { display:none; width: 15px; height: 14px; background-color: red;/*border-radius: 100%;*/color: White;text-align: center;font-size: 14px;position: absolute;right: 9px;top: 8px;line-height: 11px;cursor: pointer;}
-#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Close { display: block;}
-#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Name{ display: block;}
-
-.U_MD_D_T_taskbar_Bar { position: absolute; bottom: 0; width: 80%; background-color: #555; height: 56px; left: 10%; border-bottom: 0; box-shadow: 0 0 25px 3px #555; -webkit-box-shadow: 0 0 25px 3px #555; }
-.U_MD_D_T_taskbar_Bar_Main { float: left; margin: 0 auto; width: calc(100% - 18px); height: 100%; }
-.U_MD_D_T_taskbar { width: 50px; height: 100%; float: left; margin: 3px 0 3px 3px; position: relative; }
-.U_MD_D_T_taskbar_Main, .U_MD_D_T_taskbar_Icon { width: 100%; height: 100%; }
-.U_MD_D_T_taskbar_Bar_Operate { float: right; width: 18px; line-height: 28px; display: none; }
-.U_MD_D_T_taskbar_Bar_Operate_Button { font-size: 19px; cursor: pointer; text-align: center; }
+*.U_MD_D_RW_IO {
+    width: 21px;
+    height: 100%;
+}
+
+.U_MD_D_RW_CD {
+    width: 21px;
+    margin-top: 16%;
+}
+
+.U_MD_D_RW_GU {
+    width: 21px;
+    height: 30%;
+    /*background-color:gray;*/
+}
+
+.U_MD_D_RW_GU:hover {
+    background-color: gray;
+}
+
+.U_MD_D_RW_GD {
+    width: 21px;
+    height: 30%;
+    /*background-color:gray;*/
+    position: absolute;
+    bottom: 0;
+}
+
+.U_MD_D_RW_GD:hover {
+    background-color: gray;
+}
+
+.U_MD_D_RW_GU_g {
+    width: 21px;
+}
+
+.U_MD_D_RW_GD_g {
+    width: 21px;
+}
+
+.U_MD_D_RW .U_MD_D_T_taskbar_Name {
+    display: none;
+    width: 115px;
+    height: 31px;
+    background: rgba(111, 111, 111, 1);
+    border-radius: 1px;
+    font-size: 15px;
+}
+
+#U_MD_D_RW .U_MD_D_T_taskbar_Close {
+    display: none;
+    width: 15px;
+    height: 14px;
+    background-color: red;
+    /*border-radius: 100%;*/
+    color: White;
+    text-align: center;
+    font-size: 14px;
+    position: absolute;
+    right: 9px;
+    top: 8px;
+    line-height: 11px;
+    cursor: pointer;
+}
+
+#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Close {
+    display: block;
+}
+
+#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Name {
+    display: block;
+}
+
+.U_MD_D_T_taskbar_Bar {
+    position: absolute;
+    bottom: 0;
+    width: 80%;
+    background-color: #555;
+    height: 56px;
+    left: 10%;
+    border-bottom: 0;
+    box-shadow: 0 0 25px 3px #555;
+    -webkit-box-shadow: 0 0 25px 3px #555;
+}
+
+.U_MD_D_T_taskbar_Bar_Main {
+    float: left;
+    margin: 0 auto;
+    width: calc(100% - 18px);
+    height: 100%;
+}
+
+.U_MD_D_T_taskbar {
+    width: 50px;
+    height: 100%;
+    float: left;
+    margin: 3px 0 3px 3px;
+    position: relative;
+}
+
+.U_MD_D_T_taskbar_Main,
+.U_MD_D_T_taskbar_Icon {
+    width: 100%;
+    height: 100%;
+}
+
+.U_MD_D_T_taskbar_Bar_Operate {
+    float: right;
+    width: 18px;
+    line-height: 28px;
+    display: none;
+}
+
+.U_MD_D_T_taskbar_Bar_Operate_Button {
+    font-size: 19px;
+    cursor: pointer;
+    text-align: center;
+}

css/bsdn/Desktop.css

@@ -255,7 +255,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
     bottom: 0;
     overflow-y: hidden;
     overflow-x: hidden;
-    background: url("/img/icon/beijingBg.png") 0px 0px / 100% auto repeat rgb(240, 240, 240);
+    background: url("/img/icon/beijingBg2.png") 0px 0px / 100% auto repeat rgb(240, 240, 240);
     /* background: url("/img/icon/mingdeBg.png") 0px 0px / 100% auto repeat rgb(240, 240, 240); */
     filter: progid: DXImageTransform.Microsoft.AlphaImageLoader(src="/img/icon/bgImg4.png", sizingMethod=scale);
     background-size: cover;
@@ -467,7 +467,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
 }
 
 
-.U_MD_D_BD_noticeBox_title>span:nth-child(1)  {
+.U_MD_D_BD_noticeBox_title>span:nth-child(1) {
     /* margin-left: 8px; */
     width: calc(100%);
     overflow: hidden;
@@ -777,6 +777,14 @@ body div ::-webkit-scrollbar-resizer:vertical {
     line-height: 15px;
     margin-top: 3px;
     text-align: center;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    word-break: break-all;
+}
+
+.U_MD_D_KOX :hover {
+    overflow: visible;
+    z-index: 9999;
 }
 
 .U_MD_D_NewsTipsIcon {
@@ -1066,14 +1074,14 @@ body div ::-webkit-scrollbar-resizer:vertical {
     align-items: center;
 }
 
-.U_PBL_Check{
+.U_PBL_Check {
     position: fixed;
     bottom: 15%;
     right: 5%;
     display: none;
 }
 
-.U_PBL_Check>div{
+.U_PBL_Check>div {
     background: #595959;
     height: 45px;
     width: 110px;
@@ -1086,16 +1094,16 @@ body div ::-webkit-scrollbar-resizer:vertical {
     justify-content: center;
 }
 
-.U_PBL_Check>div + div{
+.U_PBL_Check>div+div {
     margin-top: 10px;
     cursor: pointer;
 }
 
-.U_PBL_Check>div>span{
+.U_PBL_Check>div>span {
     color: #fff;
 }
 
-.U_PBL_Check>div:nth-child(1):before{
+.U_PBL_Check>div:nth-child(1):before {
     content: '';
     display: inline-block;
     background: url(../../img/icon/easy/standard.png);
@@ -1104,7 +1112,8 @@ body div ::-webkit-scrollbar-resizer:vertical {
     background-size: 100% 100%;
     margin-right: 3px;
 }
-.U_PBL_Check>div:nth-child(2)::before{
+
+.U_PBL_Check>div:nth-child(2)::before {
     content: '';
     display: inline-block;
     background: url(../../img/icon/easy/easy.png);
@@ -1114,6 +1123,6 @@ body div ::-webkit-scrollbar-resizer:vertical {
     margin-right: 3px;
 }
 
-.U_PBL_Check>.active{
+.U_PBL_Check>.active {
     opacity: 1;
 }