diff --git a/css/index.css b/css/index.css index e8a7108..b678978 100644 --- a/css/index.css +++ b/css/index.css @@ -1009,7 +1009,7 @@ body { #footer .dock .dock-tips{ color:#333; - font-size:0.4em; + font-size:0.5em; font-weight:700; border-radius: 5px; background: rgba(255,255,255,0.5); @@ -1017,8 +1017,8 @@ body { line-height: 20px; display: none; padding:0px 5px; - margin-top: -30px; - margin-bottom: 10px; + margin-top: -35px; + margin-bottom: 15px; flex-direction: column; align-items: center; } diff --git a/js/mac.js b/js/mac.js index 503589d..d086bef 100644 --- a/js/mac.js +++ b/js/mac.js @@ -721,7 +721,7 @@ window.Win10 = { //小时 viewdate.hour = get_hour(date); //日期 - viewdate.day = date.getDay(); + viewdate.day = date.getDate(); //星期 viewdate.week = get_week(date); //月 @@ -752,24 +752,18 @@ window.Win10 = { if (!active) { if (!today) { var lunarDate = Win10.getLunarObj(); - today = '
' + - '
'+lunarDate.month+'月'+lunarDate.day+'日 '+lunarDate.week+'
' + - '
'+lunarDate.ganzhi+'年'+lunarDate.lunarmonth+lunarDate.lunarday+'
' + - '
' + - '
' + - '
' + - '' + - '天气'+ - '
' + - '
' + - '
' + - '
' + - ''+lunarDate.hour+':'+lunarDate.minute+''+ - '广州市' + - '
' + - '
多云
' + - '
17
' + - '
'; + var today = '
' + + '
'+lunarDate.month+'月'+lunarDate.day+'日 '+lunarDate.week+'
' + + '
'+lunarDate.ganzhi+'年'+lunarDate.lunarmonth+lunarDate.lunarday+'
' + + '
'; + today += '
' + + '
' + + '' + + '天气'+ + '
' + + '
' + + ''+ + '
'; } $("#win10_command_center .command-body.today").html(today).addClass('active'); }