From 0702145f9d76d46d8f4e311de701fa49e915b5b5 Mon Sep 17 00:00:00 2001 From: muzi_ys <1099438829@qq.com> Date: Tue, 4 Feb 2020 12:10:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- css/index.css | 27 +++++++++++------ js/mac.js | 80 +++++++++++++++++++++++++-------------------------- 2 files changed, 59 insertions(+), 48 deletions(-) diff --git a/css/index.css b/css/index.css index 4dbc825..936ba15 100644 --- a/css/index.css +++ b/css/index.css @@ -653,6 +653,19 @@ body { cursor: pointer; } +.win10-new-msg{ + /*繁华年间许你一世安宁提供*/ + background-color: transparent; + /* border: 1px solid #323232; */ + border: #f0f6f6 solid 1px !important; + -webkit-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8); + -moz-box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8); + box-shadow: 0 0 50px 0 rgba(0, 0, 0, 0.8); + border-radius: 6px; + -webkit-border-radius: 6px; + -moz-border-radius: 6px; +} + .win10-open-iframe{ /*繁华年间许你一世安宁提供*/ background-color: transparent; @@ -792,11 +805,6 @@ body { height: 30px; } -.win10-open-iframe .layui-layer-title{ - line-height:30px; - height: 30px; -} - .win10-open-iframe .layui-layer-title .icon ,#win10_btn_group_middle .btn_title .icon{ font-size: 15px; padding: 1px; @@ -810,6 +818,9 @@ body { .win10-open-iframe .layui-layer-title img.icon,#win10_btn_group_middle .btn_title img.icon{ width: 20px; position: relative; +} + +.win10-open-iframe .layui-layer-title img.icon{ top:5px ; } @@ -837,16 +848,16 @@ body { bottom: 0px; position: absolute; left: 0px; - height: 65px; + height: 60px; text-align: center; z-index:1000; } .dock-container { position: absolute; height: 60px; - border-radius: 5px; + border-radius: 5px 5px 0 0 ; background-color: rgba(255,255,255,0.45) ;/* IE9、标准浏览器、IE6和部分IE7内核的浏览器(如QQ浏览器)会读懂 */ - padding:0 20px; + /*padding:0 20px;*/ } .dock a.dock-item { diff --git a/js/mac.js b/js/mac.js index f38557e..2356ea0 100644 --- a/js/mac.js +++ b/js/mac.js @@ -112,7 +112,7 @@ window.Win10 = { } } } - + //开始渲染壁纸模糊 if(Win10._wallpaperBlur){ $('.background').addClass('blur'); @@ -587,7 +587,7 @@ window.Win10 = { var Animals=new Array("鼠","牛","虎","兔","龙","蛇","马","羊","猴","鸡","狗","猪"); var Gan=new Array("甲","乙","丙","丁","戊","己","庚","辛","壬","癸"); var Zhi=new Array("子","丑","寅","卯","辰","巳","午","未","申","酉","戌","亥"); - + //==== 传回农历 y年的总天数 function lYearDays(y) { var i, sum = 348 @@ -596,17 +596,17 @@ window.Win10 = { } //==== 传回农历 y年闰月的天数 function leapDays(y) { - if(leapMonth(y)) + if(leapMonth(y)) return((lunarInfo[y-1900] & 0x10000)? 30: 29) - else + else return(0) } //==== 传回农历 y年闰哪个月 1-12 , 没闰传回 0 - function leapMonth(y) { + function leapMonth(y) { return(lunarInfo[y-1900] & 0xf); } //==== 传回农历 y年m月的总天数 - function monthDays(y,m) { + function monthDays(y,m) { return((lunarInfo[y-1900] & (0x10000>>m))? 30: 29 ); } //==== 算出农历, 传入日期物件, 传回农历日期物件 @@ -615,10 +615,10 @@ window.Win10 = { var i, leap=0, temp=0 var baseDate = new Date(1900,0,31) var offset = (objDate - baseDate)/86400000 - + this.dayCyl = offset + 40 this.monCyl = 14 - + for(i=1900; i<2050 && offset>0; i++) { temp = lYearDays(i) offset -= temp @@ -629,35 +629,35 @@ window.Win10 = { i--; this.monCyl -= 12 } - + this.year = i this.yearCyl = i-1864 - + leap = leapMonth(i) //闰哪个月 this.isLeap = false - + for(i=1; i<13 && offset>0; i++) { //闰月 if(leap>0 && i==(leap+1) && this.isLeap==false) { --i; this.isLeap = true; temp = leapDays(this.year); } else { temp = monthDays(this.year, i); } - + //解除闰月 if(this.isLeap==true && i==(leap+1)) this.isLeap = false - + offset -= temp if(this.isLeap == false) this.monCyl ++ } - + if(offset==0 && leap>0 && i==leap+1) if(this.isLeap) { this.isLeap = false; } else { this.isLeap = true; --i; --this.monCyl;} - + if(offset<0){ offset += temp; --i; --this.monCyl; } - + this.month = i this.day = offset + 1 } @@ -685,11 +685,11 @@ window.Win10 = { return "三"+fd[day-30]; } } - + //获取干支 - function get_ganzhi(year) { + function get_ganzhi(year) { var num = year-1900+36; - return(Gan[num%10]+Zhi[num%12]); + return(Gan[num%10]+Zhi[num%12]); } //获取生肖 function get_animal(year){ @@ -719,17 +719,17 @@ window.Win10 = { //获取小时 function get_hour(date){ var hour=date.getHours(); - if(hour < 6){hours='凌晨'+hour;} - else if (hour < 9){hours='早上'+hour;} - else if (hour < 12){hours='上午'+hour;} - else if (hour < 14){hours='中午'+(hour-12);} - else if (hour < 17){hours='下午'+(hour-12);} - else if (hour < 19){hours='傍晚'+(hour-12);} - else if (hour < 22){hours='晚上'+(hour-12);} - else {hours='深夜'+(hour-12)} + if(hour < 6){hours='凌晨'+hour;} + else if (hour < 9){hours='早上'+hour;} + else if (hour < 12){hours='上午'+hour;} + else if (hour < 14){hours='中午'+(hour-12);} + else if (hour < 17){hours='下午'+(hour-12);} + else if (hour < 19){hours='傍晚'+(hour-12);} + else if (hour < 22){hours='晚上'+(hour-12);} + else {hours='深夜'+(hour-12)} return hours; } - + var viewdate = {}; var date = new Date(); //秒 @@ -763,7 +763,7 @@ window.Win10 = { viewdate.ganzhi = get_ganzhi(lunar_obj.year); //生肖 viewdate.animal = get_animal(lunar_obj.year); - + return viewdate; }, //消息中心渲染 @@ -782,7 +782,7 @@ window.Win10 = { '天气'+ '' + '
' + - ''+ + ''+ '
'; } $("#win10_command_center .command-body.today").html(today).addClass('active'); @@ -838,8 +838,8 @@ window.Win10 = { docks.eq(i).hide(); }else{ docks.eq(i).show(); - } - } + } + } if(width>768){ $('#dock').Fisheye({ maxWidth: 70, @@ -855,21 +855,21 @@ window.Win10 = { }else{ $('.dock-container').css({'width':width}); for (var i = 0; i < max_num; i++) { - + docks.on('mouseover', function(e) { - e.preventDefault(); + e.preventDefault(); }); docks.on('mouseout', function(e) { - e.preventDefault(); + e.preventDefault(); }); docks.on('click', function(e) { - e.preventDefault(); + e.preventDefault(); }); - docks.unbind("mouseover").unbind('mouseout').unbind('click').css({"width":cell_width}); + docks.unbind("mouseover").unbind('mouseout').unbind('click').css({"width":cell_width}); if(i==0){ docks.eq(i).css("margin-left",0); } - } + } } }, commandCenterToggle: function () { @@ -885,7 +885,7 @@ window.Win10 = { ''+app_icon+'' + ''+app_name+''; if (is_del) { - msg += ''; + msg += ''; } msg +='' + '
' + @@ -901,7 +901,7 @@ window.Win10 = { } }); layer.tips(Win10.lang('新消息:','New message:')+title, '#win10_btn_command', { - tips: [1, '#3c6a4a'], + tips: [1, 'rgba(200, 200, 200, 0.7)'], time: 3000 }); if($("#win10_command_center").hasClass('hidden_right')){