From 7d961fcf6b5055ee62dec0dad0c4cbbdbe27d25a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Sep 2022 09:03:20 +0800 Subject: [PATCH] update 2022-09-08 09:03:20 --- .../root/etc/mosdns/rule/serverlist.txt | 48 +++++++++++++++++++ .../htdocs/luci-static/edge/cascade.css | 40 +++++++--------- .../htdocs/luci-static/edge/js/script.js | 43 ----------------- .../htdocs/luci-static/edge/js/waves.js | 41 ---------------- .../luasrc/view/themes/edge/footer.htm | 1 - .../luasrc/view/themes/edge/header.htm | 1 - .../luasrc/view/themes/edge/header_login.htm | 1 - sing-box/Makefile | 4 +- 8 files changed, 67 insertions(+), 112 deletions(-) delete mode 100644 luci-theme-edge/htdocs/luci-static/edge/js/waves.js diff --git a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt index 10f5795d7..4e6c6e49a 100644 --- a/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt +++ b/luci-app-mosdns/root/etc/mosdns/rule/serverlist.txt @@ -4123,6 +4123,7 @@ 8bc58d5669999d68a26f463b28d95076.safeframe.googlesyndication.com 8bdgzmttxj4gae2th.ay.delivery 8be4c9b1.api.splkmobile.com +8bitsagency.com 8bo1k.bemobtrk.com 8bq898.73miqb.cn 8c89e876bf0.com @@ -12870,6 +12871,7 @@ analytics.kkb.com.tr analytics.kochava.com analytics.kongregate.io analytics.kraken.com +analytics.kurocore.com analytics.lagoondivers.be analytics.landolsi.de analytics.languagetoolplus.com @@ -17007,6 +17009,7 @@ ayads.co ayahtyros.com ayahucapasso.website ayanfer.com.tr +ayassociallya.xyz ayazsth.cn aybe.me aybnn.cn @@ -18156,6 +18159,7 @@ bbgomsvyyacndcf.xyz bbgs888.top bbhyqp.com bbia.co.uk +bbjisktuj.com bbk5921.yncjsc.cn bbkaproduction.com bblck.me @@ -18164,6 +18168,7 @@ bblo.xyz bbmalayalam.000webhostapp.com bbn.gzblogger.cn bbn.img.com.ua +bboc.com.pe bbom2b434493.com bbq.zzhreceive.top bbs.kiiqnnx.cn @@ -18631,6 +18636,7 @@ beefrantravelled.com beefymartpronunciation.com beegmove.com beegotou.net +beegoust.com beehiveclergyman.com beehivefestivesolve.com beeintercourseoven.com @@ -18665,6 +18671,7 @@ beganfieldspeed.top begasuthy.com beget.tech beggarlyfilmingabreast.com +beggarlyquietlyrabble.com beggarlywept.com beggingneglect.com beginadvisor.com @@ -20167,6 +20174,7 @@ bn4sch101123202.wns.windows.com bn4sch102110124.wns.windows.com bn5x.net bnbdeal.net +bnbevent.info bnblogger.com bnbsagevcuca.com bnbxwdkxccxfsn.com @@ -20409,6 +20417,7 @@ boo-box.com boobavrke.com booceemu.com boodlewrite.com +boogopee.com book9.net bookbannershop.com bookbudd.com @@ -24578,6 +24587,7 @@ checkm8.com checkmarkutilitylocates.com checkmy.cam checkmygeo.com +checknotification.com checkoutfree.com checkpointcharlie.heizung.de checkpost.club @@ -27186,6 +27196,7 @@ colossalchance.com colossalclouds.com colossalcoat.com colossalfutile.com +colossalrate.com colossusssp.com colour5.top colouredcavity.com @@ -27334,6 +27345,7 @@ comnwww.effectivedisplayformats.com comnwww.highperformancedformats.comnwww.topdisplayformat.com comnwww.topdisplayformat.com comorw.com +compactdiverse.com compactyunker.com compan.oss-cn-hongkong.aliyuncs.com companionstormyhusk.com @@ -29201,6 +29213,7 @@ crosspromotion-us.avosapps.us crosspromotion.weplayer.cc crossrider.com crossroaddividerecorded.com +crossroadparalysisnutshell.com crosswalkmail.com crottlerennin.com crouslyon.fr @@ -30234,6 +30247,7 @@ d188m5xxcpvuue.cloudfront.net d18e74vjvmvza1.cloudfront.net d18g6t7whf8ejf.cloudfront.net d18mealirgdbbz.cloudfront.net +d18myvrsrzjrd7.cloudfront.net d18p8z0ptb8qab.cloudfront.net d18t35yyry2k49.cloudfront.net d191y0yd6d0jy4.cloudfront.net @@ -30504,6 +30518,7 @@ d2wlwbnaa4keje.cloudfront.net d2wu036mkcz52n.cloudfront.net d2x0118v5hofu3.cloudfront.net d2x19ia47o8gwm.cloudfront.net +d2y8ttytgze7qt.cloudfront.net d2ykons4g8jre6.cloudfront.net d2yyd1h5u9mauk.cloudfront.net d2yz0oamomyxzv.cloudfront.net @@ -35909,6 +35924,7 @@ earewi.com eargentssep.one earlapspur.com earleene.com +earlieraccelerateshoplifting.com earlierindians.com earliestinspectprone.com earlinggea.info @@ -36538,6 +36554,7 @@ eelfadechi.com eelsoup.net eeltaung.com eemoalie.com +eempacmy.com eeng.ir eengaums.com eengbalu.fun @@ -36574,6 +36591,7 @@ eezdx.erc.18183.com eezegrip.net eezoulru.com ef-dongfeng.tanx.com +ef.fanatical.com ef.futuroscope.com ef.futuroscope.mobi ef.opendsp.tanx.com @@ -38074,6 +38092,7 @@ espionagegardenerthicket.com espn-ak.starwave.com espn.hb.omtrdc.net espndotcom.tt.omtrdc.net +espotl.com espritgames.com esptj.com espub.fr @@ -39201,6 +39220,7 @@ f0699615.xsph.ru f0699616.xsph.ru f0699618.xsph.ru f06b3af9.api.splkmobile.com +f0704654.xsph.ru f0705635.xsph.ru f09c54da.rtc.youme.im f0nn.oney.fr @@ -46133,6 +46153,7 @@ happeningdeliverancenorth.com happeningturbandisorganized.com happer.info happy-winners-here.life +happyamericasavings.com happybao.com.cn happycastle.me happyday9risce.com @@ -51570,6 +51591,7 @@ ioniamcurren.com ioniaukmla.xyz ionisestriller.com ionnmjdsf.com +ionseleaukses.autos ioomb.cn iople.com ioptia.adups.cn @@ -55649,6 +55671,7 @@ ktivn.uranus.sogou.com ktkgpcstqooan.xyz ktkjmp.com ktmhomrvhaolx.com +ktobedirectu.autos ktrackdata.com ktracker.kumparan.com kts.visitstats.com @@ -56749,6 +56772,7 @@ leeethical.com leelightning.com leelovelwj.com leelynx.fr +leemhuislegal.com leemubel.com leerilypimelea.com leetaipt.net @@ -58893,6 +58917,7 @@ lowrance.top lowremoraidon.com lowrihouston.pro lowseelan.com +lowstaryur.com lowsteelixor.com lowtyroguer.com lowtyruntor.com @@ -63766,6 +63791,7 @@ milhojas.is miliated.xyz miliatedvictions.xyz milibao.com +milips.com militanttrial.com militaryverse.com milk.supertool.stunnermedia.com @@ -64155,6 +64181,7 @@ mkqiqfjh.com mkrxgcyfqr.com mkscuty.cn mksogv.oneclickdrive.com +mksovmhlxfnd.com mkt.animalsafety.neogen.com mkt.compactaprint.com.br mkt.consultdss.com @@ -68044,6 +68071,7 @@ notification.best notification.lionmobi.com notification.tubecup.net notification.webengage.com +notificationcheck.com notifications.fattykettleinexpedient.com notifications.tubecup.net notificationsacademy.com @@ -69187,6 +69215,7 @@ obussevier.com obvhiojpse.xyz obviousmanipulate.com obvkhvfontna.com +obwmidktcmuc.com obyjpiok.com oc.umeng.co oc.umeng.com @@ -69396,6 +69425,7 @@ offshoreanglehost.com offshorecockpit.com offshoretolerantbenignity.com offsigilyphor.com +offslrbeqypf.com offtec.cf ofghaidarium.xyz ofgogoatan.com @@ -69604,6 +69634,7 @@ olarshalrolli.com olasconsulting.com olatumal.com olaxmwoymnewxo.xyz +olayomad.com olc.yodo1api.com olcdn.com old.antenesmenorca.com @@ -70245,6 +70276,7 @@ operatingnews.com operationkettle.com operations.cj.com operativeapart.com +opertyvaluat.autos opertyvaluat.com opes-com.videoplayerhub.com opetiv.com @@ -71661,6 +71693,7 @@ pacifoos.net pacifyinvalid.com pacifyrespirator.com package01.com +packethierarchy.com packsdechicas.online packsss.com pacm1.myleadz.co @@ -73002,6 +73035,7 @@ pgonews.pro pgpartner.com pgpkrrk.cn pgpl.g5e.com +pgpnsvqpo.com pgpyce.com pgqrmhewdb.xyz pgrdufljts.com @@ -76561,6 +76595,7 @@ pofang.com pofooz.cn pofqlldhpkvvh.com pogan.ro +pogothere.xyz pohlibri.de poiasj5.tk poidup.com @@ -82507,6 +82542,7 @@ rl.go2yd.com rlaa.xyz rlblmjiposk.com rlcdn.com +rlcjba7wduej3xcstcjo577eqgjsjvcjfsw4i23fqvf2y27ylylhmhad.onion.pet rldwideorga.com rldyhdve.com rle.ru @@ -84942,6 +84978,7 @@ schoenmann.at schoic.com scholarovertakealimony.com scholarshipidol.com +schond.com schoolofspanish.co.za schoolyeargo.com schprompt.dangdang.com @@ -92921,6 +92958,7 @@ stickedsubset.cam stickerchapelsailing.com stickervillain.com stickssheep.com +stickssurelyhomesick.com sticksurroundingsconstitutional.com stickyadstv.com stickyadstv.com.edgekey.net @@ -93477,6 +93515,7 @@ sulvo.co sumarketing.co.uk sumatoad.com sumbalowen.com +sumerpres.com sumersteel.com summary.bookoffonline.co.jp summaryflamen.com @@ -95249,6 +95288,7 @@ tartator.com tartinetmoi.fr tartoals.net tarttendency.com +tartwo.com tarubel.com tarvemowhay.com taskanalytics.com @@ -95640,6 +95680,7 @@ teenytinyshirt.com teenytinytongue.com teenyvolcano.com teethfan.com +tefections.xyz tegkgqbhp.xyz tehilsir.com teicdn.com @@ -96288,6 +96329,7 @@ themathworksinc.tt.omtrdc.net themaxmall.com theme.cmcm.com.bsgslb.cn themeconsequence.com +themediagrid.com themee.cn themeillogical.com themereplacebiopsy.com @@ -100182,6 +100224,7 @@ trinitywishful.com trinylium.com trioadvisor.fr triofenix-pt.com +triplelift.com tripleoleum.com triplewhale-pixel.web.app triplonet.com.br @@ -102786,6 +102829,7 @@ ustithoo.net ustreamiptv.com ustreamix.su ustujuvo.com +usualaurated.com usually.wang usuallycrummy.com usuallyformal.com @@ -105324,6 +105368,7 @@ waiteddeplore.com waiterregistrydelusional.com waitersmimical.com waitheja.net +waiting.biz waitinghypotheticallysoot.com waitingtoload.com waitressdivisionspring.com @@ -106355,6 +106400,7 @@ weviralyou.com wew.dushiwenxue.net weway.club wewilltoptheearth.top +wewilltoptheworld.top wewon.to weworkremotely.com weworldnews.com @@ -109123,6 +109169,7 @@ www.crashlytics.com www.crashnoodle.com www.crazy97.com www.crazypopups.com +www.creationaleprose.com www.creativedisplayformat.com www.creativeformatsnetwork.com www.credit-dreams.com @@ -112774,6 +112821,7 @@ xanax-online.dot.de xanax-online.run.to xanax-store.shengen.ru xandelissane2.xyz +xandr.com xaokiotravel.com xapi.jads.co xapi.juicyads.com diff --git a/luci-theme-edge/htdocs/luci-static/edge/cascade.css b/luci-theme-edge/htdocs/luci-static/edge/cascade.css index 87c668a81..890af52bd 100644 --- a/luci-theme-edge/htdocs/luci-static/edge/cascade.css +++ b/luci-theme-edge/htdocs/luci-static/edge/cascade.css @@ -1391,7 +1391,6 @@ td > table > tbody > tr > td, } button:hover, -.waves-input-wrapper:hover, .btn:hover, .cbi-button:hover, .item:hover::after { @@ -3638,10 +3637,6 @@ input[type="checkbox"]:checked { } } -.waves-input-wrapper { - background-color: #475F7B; -} - .cbi-button,.btn { background-color: #23bd70; } @@ -3963,8 +3958,22 @@ input,select { background: none; } +input:not([type=button]):not([type=submit]),select { + border:0 !important; + background-image:linear-gradient(dodgerblue,dodgerblue),linear-gradient(#a9a9a9,#a9a9a9); + background-size:0 2px,100% 1px; + background-position:left bottom,center calc(100% - 1px); + background-repeat:no-repeat; + transition: all .3s !important; +} + +select:focus, input:not([type=button]):not([type=submit]):focus { + background-size: 100% 2px,100% 1px; + transition: all .3s !important; +} + .btn,button, - .cbi-button,input[type=button],input[type=submit],input[type=reset],.waves-input-wrapper { + .cbi-button,input[type=button],input[type=submit],input[type=reset] { height: auto !important; width: auto !important; padding: 0.6rem 1.6rem; @@ -3975,17 +3984,14 @@ input,select { transition: all .20s linear; top: 0; margin-left: 0.5rem; + position:relative; } .btn:first-child,button:first-child, - .cbi-button:first-child,input[type=button]:first-child,input[type=submit]:first-child,input[type=reset]:first-child,.waves-input-wrapper:first-child { + .cbi-button:first-child,input[type=button]:first-child,input[type=submit]:first-child,input[type=reset]:first-child { margin-left: 0; } -i.waves-input-wrapper { - padding: 0 !important; -} - i input { margin: 0 !important } @@ -4038,18 +4044,6 @@ ul.errors li { padding:0; } -.waves-input-wrapper .waves-button-input { - line-height: 1rem; -} - -.cbi-dropdown.waves-effect { - display: inline-flex; -} - -#cbi-AdGuardHome-AdGuardHome .waves-input-wrapper>input { - color: #fff !important; -} - input[type=password]+.cbi-button.cbi-button-neutral { padding: 0 0.4rem; color: #fff !important; diff --git a/luci-theme-edge/htdocs/luci-static/edge/js/script.js b/luci-theme-edge/htdocs/luci-static/edge/js/script.js index 76e14d5c7..918148f61 100644 --- a/luci-theme-edge/htdocs/luci-static/edge/js/script.js +++ b/luci-theme-edge/htdocs/luci-static/edge/js/script.js @@ -260,56 +260,13 @@ document.addEventListener('luci-loaded', function(ev) { /*Set the status back to off*/ }); setTimeout(function(){ -var config = { - // How long Waves effect duration - // when it's clicked (in milliseconds) - duration: 600 -}; - Waves.attach("button,input[type='button'],input[type='reset'],input[type='submit']", ['waves-light']); - // Ripple on hover -$("button,input[type='button'],input[type='reset'],input[type='submit']").mouseenter(function() { - Waves.ripple(this, {wait: null}); -}).mouseleave(function() { - Waves.calm(this); -}); - Waves.init(config); -$(".waves-input-wrapper").filter(function () { - if($(this).children().css("display")=="none"){ - return true; - }else{ - return false; - } -}).hide(); - -$("div>select:first-child,div>input[type='text']:first-child").filter(function () { -return (!$(this).parents(".cbi-dynlist").length&&!$("body.Diagnostics").length&&!$(this).hasClass("cbi-input-password")) -}).after(""); - $("input[type='checkbox']").filter(function () { return (!$(this).next("label").length) }).show(); - -$("select,input").filter(function () { - return ($(this).next(".focus-input").length) -}).focus(function(){ - $(this).css("border-bottom","1px solid #fff"); -}).blur(function(){ - $(this).css("border-bottom","1px solid #9e9e9e"); -}); }, 0); var options = { attributes: true}; function callback() { -$("div>select:first-child,div>input[type='text']:first-child").filter(function () { -return (!$(this).parents(".cbi-dynlist").length&&!$(this).hasClass("cbi-input-password")) -}).after(""); -$("select,input").filter(function () { - return ($(this).next(".focus-input").length) -}).focus(function(){ - $(this).css("border-bottom","1px solid #fff"); -}).blur(function(){ - $(this).css("border-bottom","1px solid #9e9e9e"); -}); $("input[type='checkbox']").filter(function () { return (!$(this).next("label").length) }).show(); diff --git a/luci-theme-edge/htdocs/luci-static/edge/js/waves.js b/luci-theme-edge/htdocs/luci-static/edge/js/waves.js deleted file mode 100644 index 96d83260b..000000000 --- a/luci-theme-edge/htdocs/luci-static/edge/js/waves.js +++ /dev/null @@ -1,41 +0,0 @@ -;(function(window,factory){'use strict';if(typeof define==='function'&&define.amd){define([],function(){window.Waves=factory.call(window);return window.Waves;});} -else if(typeof exports==='object'){module.exports=factory.call(window);} -else{window.Waves=factory.call(window);}})(typeof global==='object'?global:this,function(){'use strict';var Waves=Waves||{};var $$=document.querySelectorAll.bind(document);var toString=Object.prototype.toString;var isTouchAvailable='ontouchstart'in window;function isWindow(obj){return obj!==null&&obj===obj.window;} -function getWindow(elem){return isWindow(elem)?elem:elem.nodeType===9&&elem.defaultView;} -function isObject(value){var type=typeof value;return type==='function'||type==='object'&&!!value;} -function isDOMNode(obj){return isObject(obj)&&obj.nodeType>0;} -function getWavesElements(nodes){var stringRepr=toString.call(nodes);if(stringRepr==='[object String]'){return $$(nodes);}else if(isObject(nodes)&&/^\[object (Array|HTMLCollection|NodeList|Object)\]$/.test(stringRepr)&&nodes.hasOwnProperty('length')){return nodes;}else if(isDOMNode(nodes)){return[nodes];} -return[];} -function offset(elem){var docElem,win,box={top:0,left:0},doc=elem&&elem.ownerDocument;docElem=doc.documentElement;if(typeof elem.getBoundingClientRect!==typeof undefined){box=elem.getBoundingClientRect();} -win=getWindow(doc);return{top:box.top+win.pageYOffset-docElem.clientTop,left:box.left+win.pageXOffset-docElem.clientLeft};} -function convertStyle(styleObj){var style='';for(var prop in styleObj){if(styleObj.hasOwnProperty(prop)){style+=(prop+':'+styleObj[prop]+';');}} -return style;} -var Effect={duration:750,delay:200,show:function(e,element,velocity){if(e.button===2){return false;} -element=element||this;var ripple=document.createElement('div');ripple.className='waves-ripple waves-rippling';element.appendChild(ripple);var pos=offset(element);var relativeY=0;var relativeX=0;if('touches'in e&&e.touches.length){relativeY=(e.touches[0].pageY-pos.top);relativeX=(e.touches[0].pageX-pos.left);} -else{relativeY=(e.pageY-pos.top);relativeX=(e.pageX-pos.left);} -relativeX=relativeX>=0?relativeX:0;relativeY=relativeY>=0?relativeY:0;var scale='scale('+((element.clientWidth/100)*3)+')';var translate='translate(0,0)';if(velocity){translate='translate('+(velocity.x)+'px, '+(velocity.y)+'px)';} -ripple.setAttribute('data-hold',Date.now());ripple.setAttribute('data-x',relativeX);ripple.setAttribute('data-y',relativeY);ripple.setAttribute('data-scale',scale);ripple.setAttribute('data-translate',translate);var rippleStyle={top:relativeY+'px',left:relativeX+'px'};ripple.classList.add('waves-notransition');ripple.setAttribute('style',convertStyle(rippleStyle));ripple.classList.remove('waves-notransition');rippleStyle['-webkit-transform']=scale+' '+translate;rippleStyle['-moz-transform']=scale+' '+translate;rippleStyle['-ms-transform']=scale+' '+translate;rippleStyle['-o-transform']=scale+' '+translate;rippleStyle.transform=scale+' '+translate;rippleStyle.opacity='1';var duration=e.type==='mousemove'?2500:Effect.duration;rippleStyle['-webkit-transition-duration']=duration+'ms';rippleStyle['-moz-transition-duration']=duration+'ms';rippleStyle['-o-transition-duration']=duration+'ms';rippleStyle['transition-duration']=duration+'ms';ripple.setAttribute('style',convertStyle(rippleStyle));},hide:function(e,element){element=element||this;var ripples=element.getElementsByClassName('waves-rippling');for(var i=0,len=ripples.length;i