From b8c778b68847f7b4b12d356379a07116f946491e Mon Sep 17 00:00:00 2001 From: muzi <1099438829@qq.com> Date: Tue, 8 Oct 2019 22:51:17 +0800 Subject: [PATCH] =?UTF-8?q?UI=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/index.css | 34 +++++++++++++++++----------------- js/mac.js | 26 +++++++++++++++++--------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/css/index.css b/css/index.css index 65ed024..2109cfa 100644 --- a/css/index.css +++ b/css/index.css @@ -94,8 +94,8 @@ body { width: 100%; position: fixed; top: 0; - height: 30px; - line-height:30px; + height: 24px; + line-height:24px; /* IE9+ */ background-color:rgba(255,255,255,0.4); /* IE6-IE8 */ @@ -113,7 +113,7 @@ body { font-weight:bold; text-align: center; height: 100%; - line-height: 30px; + line-height: 24px; text-overflow:ellipsis; overflow: hidden; transition: background-color 0.3s; @@ -190,12 +190,12 @@ body { } #win10_btn_time { - font-size: 12px; + font-size: 14px; /*line-height: 30px !important */ } #win10-menu { position: fixed; - top: 31px; + top: 24px; left: 0.5%; background-color: rgba(255,255,255,0.55); height: auto; @@ -381,10 +381,10 @@ body { #win10_command_center { position: fixed; right: 0; - top: 31px; - width: 350px; + top: 25px; + width: 300px; background-color: rgba(255, 255, 255, 0.7); - height: calc(100% - 32px); + height: calc(100% - 25px); transition: all 0.5s; overflow-x: hidden; overflow-y: auto; @@ -394,7 +394,7 @@ body { } #win10_command_center.hidden_right { - right: -350px; + right: -300px; } #win10_command_center > .title{ @@ -481,7 +481,7 @@ body { } #win10_command_center .command-body .notice .notice-header { - background-color: #ffffffbf; + background-color:#dee7e7; height: 25px; border-radius: 5px 5px 0 0; line-height: 25px; @@ -567,7 +567,7 @@ body { } #win10_btn_group_right #win10_btn_command{ - font-size: 20px; + font-size: 14px; } #win10_btn_command .msgNof{ position: fixed; @@ -677,7 +677,7 @@ body { .win10-open-iframe .layui-layer-content{ background-color: white; - max-height: calc(100% - 30px); + max-height: calc(100% - 24px); } .win10-open-iframe .layui-layer-title{ @@ -818,7 +818,7 @@ body { .win10-open-iframe .layui-layer-title img.icon,#win10_btn_group_middle .btn_title img.icon{ width: 20px; position: relative; - top:4px ; + top:0px ; } #win10-menu>.list>.sub-item img.icon,#win10-menu>.list>.item img.icon{ @@ -936,16 +936,16 @@ body { @media screen and (max-width:767px){ #win10-menu{ width:100%; - top: 30px; + top: 24px; left:0; - height: calc(100% - 31px); + height: calc(100% - 25px); border-radius:0 0 2px 2px; } #win10-menu.hidden{ - top: calc(-100% + 31px); + top: calc(-100% + 25px); } #win10_command_center{ - top: 30px; + top: 24px; width: 100%; } #win10_command_center.hidden_right { diff --git a/js/mac.js b/js/mac.js index 8f4e5a7..8e97336 100644 --- a/js/mac.js +++ b/js/mac.js @@ -389,7 +389,7 @@ window.Win10 = { setInterval(function () { //重新写mac时间 var myDate = Win10.getLunarObj(); - $("#win10_btn_time").html(myDate.week+myDate.hour+':'+myDate.minute); + $("#win10_btn_time").html(myDate.weekDay+myDate.hour+':'+myDate.minute); },1000); //离开前警告 document.body.onbeforeunload = function(event){ @@ -664,7 +664,13 @@ window.Win10 = { return Animals[(year-4)%12]; } //获取周 - function get_week(date){ + function get_weekday(date){ + var values = ["周日", "周一", "周二", "周三", "周四", "周五", "周六"]; + return values[date.getDay()]; + } + + //获取星期 + function get_week(date){ var values = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]; return values[date.getDay()]; } @@ -704,6 +710,8 @@ window.Win10 = { viewdate.day = date.getDate(); //星期 viewdate.week = get_week(date); + //星期 + viewdate.weekDay = get_weekday(date); //月 viewdate.month = date.getMonth()+1; //完整的年份(4位,1970-????) @@ -773,7 +781,7 @@ window.Win10 = { $("#win10-msg-nof").removeClass('on-new-msg fa-commenting-o'); }, renderShortcuts:function () { - var h=parseInt(($("#win10 #win10-shortcuts")[0].offsetHeight-90)/100); + var h=parseInt(($("#win10 #win10-shortcuts")[0].offsetHeight-85)/100); var x=0,y=0; $("#win10 #win10-shortcuts .shortcut").each(function () { $(this).css({ @@ -924,8 +932,8 @@ window.Win10 = { } var area,offset; if (this.isSmallScreen() || areaAndOffset==='max') { - area = ['100%', (document.body.clientHeight - 30) + 'px']; - offset = ['30px', '0']; + area = ['100%', (document.body.clientHeight - 24) + 'px']; + offset = ['24px', '0']; }else if(typeof areaAndOffset ==='object'){ area=areaAndOffset[0]; offset=areaAndOffset[1]; @@ -962,7 +970,7 @@ window.Win10 = { }, full:function (layero) { layero.find('.layui-layer-min').css('display','inline-block'); - layero_opened.css('top',30); + layero_opened.css('top',24); }, }); $('#win10_btn_group_middle .btn.active').removeClass('active'); @@ -981,9 +989,9 @@ window.Win10 = { var height=layero_opened.css('height'); height=parseInt(height.replace('px','')); if (height>=document.body.clientHeight){ - layero_opened.css('height',height-32); - layero_opened.find('.layui-layer-content').css('height',height-62); - layero_opened.find('.layui-layer-content iframe').css('height',height-62); + layero_opened.css('height',height-25); + layero_opened.find('.layui-layer-content').css('height',height-55); + layero_opened.find('.layui-layer-content iframe').css('height',height-55); } },300);