From bd04383e04a46f128db0e11907f24f9203603f7f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 6 Dec 2021 20:32:32 +0800 Subject: [PATCH] update-12.06 --- .../luasrc/view/mosdns/mosdns_status.htm | 4 +- .../luasrc/view/admin_network/dev_status.htm | 42 ++++++++----------- v2ray-core/Makefile | 2 +- 3 files changed, 21 insertions(+), 27 deletions(-) diff --git a/luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm b/luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm index 8ecf0c0b7..7f9be5bda 100644 --- a/luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm +++ b/luci-app-mosdns/luasrc/view/mosdns/mosdns_status.htm @@ -5,10 +5,10 @@ var tb = document.getElementById('mosdns_status'); if (data && tb) { if (data.running) { - var links = 'MosDNS <%:RUNNING%>'; + var links = 'MosDNS <%:RUNNING%>'; tb.innerHTML = links; } else { - tb.innerHTML = 'MosDNS <%:NOT RUNNING%>'; + tb.innerHTML = 'MosDNS <%:NOT RUNNING%>'; } } } diff --git a/luci-app-oaf/luasrc/view/admin_network/dev_status.htm b/luci-app-oaf/luasrc/view/admin_network/dev_status.htm index 81210b2b7..0835c10e6 100755 --- a/luci-app-oaf/luasrc/view/admin_network/dev_status.htm +++ b/luci-app-oaf/luasrc/view/admin_network/dev_status.htm @@ -4,29 +4,23 @@ local dsp = require "luci.dispatcher" -%> #display{ - padding: 10px; - display: -webkit-box; - -webkit-box-orient: horizontal; - -webkit-box-pack: center; - -webkit-box-align: center; - display: -moz-box; - -moz-box-orient: horizontal; - -moz-box-pack: center; - -moz-box-align: center; - display: -o-box; - -o-box-orient: horizontal; - -o-box-pack: center; - -o-box-align: center; - display: -ms-box; - -ms-box-orient: horizontal; - -ms-box-pack: center; - -ms-box-align: center; - display: box; - box-orient: horizontal; - box-pack: center; - box-align: center; + display: flex; + flex-direction: row; + flex-wrap: wrap; + padding: 20px; +} +#main{ + min-width: 600px; + height: 300px; + display: inline-block; + flex: 2 2 10%; +} +#main2{ + min-width: 600px; + height: 300px; + display: inline-block; + flex: 2 2 10%; } - table.imagetable { font-family: verdana,arial,sans-serif; font-size:11px; @@ -357,8 +351,8 @@ table.imagetable td {