update 2023-03-03 00:27:13

This commit is contained in:
github-actions[bot] 2023-03-03 00:27:13 +08:00
parent 87e15e0737
commit f58ccf4856
5 changed files with 39 additions and 20 deletions

View File

@ -5,7 +5,7 @@ local api = require "luci.passwall.api"
<div id="dns_div">
<ul><b style="color:red"><%:About DNS issues:%></b>
<li style="color:red">1. <span><%:Some browsers may have built-in DNS, be sure to close. Example: Chrome. Settings - Security and Privacy - Security - Use secure DNS disabled.%></span></li>
<li style="color:red">2. <span><%:Sometimes after restart, you can not internet, especially the GFW mode. At this time, close all browsers (important), Windows Client, please `ipconfig / flushdns`. Please close the WiFi on the phone, cut the flight mode and then cut back.%></span></li>
<li style="color:red">2. <span><%:Sometimes after restart, you can not internet, especially the GFW mode. At this time, close all browsers (important), Windows Client, please `ipconfig /flushdns`. Please close the WiFi on the phone, cut the flight mode and then cut back.%></span></li>
<li style="color:red">3. <span><%:The client DNS and the default gateway must point to this router.%></span></li>
<li style="color:red">4. <span><%:If you have a wrong DNS process, the consequences are at your own risk!%></span></li>
</ul>
@ -40,4 +40,4 @@ local api = require "luci.passwall.api"
li += "<%:After the hidden to the display, input example in the address bar:%>" + "<a href='#'>" + show_url + "</a>" + "<br />";
dom.innerHTML = li;
}
</script>
</script>

View File

@ -172,8 +172,8 @@ msgstr "关于DNS问题"
msgid "Some browsers may have built-in DNS, be sure to close. Example: Chrome. Settings - Security and Privacy - Security - Use secure DNS disabled."
msgstr "部分浏览器可能有内置的DNS请务必关闭。如chrome。 设置 - 安全和隐私设置 - 使用安全 DNS 关闭。"
msgid "Sometimes after restart, you can not internet, especially the GFW mode. At this time, close all browsers (important), Windows Client, please `ipconfig / flushdns`. Please close the WiFi on the phone, cut the flight mode and then cut back."
msgstr "有时候重启后上不了尤其是GFW模式。这时请先关闭所有浏览器重要Windows客户端请`ipconfig/flushdns`。手机端请关闭WIFI切一下飞行模式再切回来。"
msgid "Sometimes after restart, you can not internet, especially the GFW mode. At this time, close all browsers (important), Windows Client, please `ipconfig /flushdns`. Please close the WiFi on the phone, cut the flight mode and then cut back."
msgstr "有时候重启后上不了尤其是GFW模式。这时请先关闭所有浏览器重要Windows客户端请`ipconfig /flushdns`。手机端请关闭WIFI切一下飞行模式再切回来。"
msgid "The client DNS and the default gateway must point to this router."
msgstr "客户端DNS和默认网关必须指向本路由器。"

View File

@ -7,8 +7,8 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Design Theme
LUCI_DEPENDS:=
PKG_VERSION:=5.3.1
PKG_RELEASE:=20230301
PKG_VERSION:=5.3.2
PKG_RELEASE:=20230303
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -9,8 +9,7 @@
*
* Licensed to the public under the Apache License 2.0
*/
:root {
[data-theme='light'] {
--bg: #f1f4f5;
--mainbg: #fff;
--bgwhite: #fff;
@ -52,8 +51,7 @@
--ifaceboxFontColor: #1a1a1a;
}
@media (prefers-color-scheme: dark) {
:root {
[data-theme='dark'] {
--bg: #000;
--bgwhite: #000;
--textColor: #fefefe;
@ -92,7 +90,6 @@
--scrollbarColor:#222;
--ifaceboxBorderColor: #636363bd;
--ifaceboxFontColor: #1a1a1a;
}
}
@font-face {
@ -3282,10 +3279,6 @@ form[action="/cgi-bin/luci/admin/network/wireless_join"] input[class="cbi-button
align-items: center;
text-align: center;
}
.node-system-commands #cbi-luci.cbi-map fieldset.cbi-section {
align-items: unset;
text-align: unset;
}
.node-network-network .ifacebox strong{
color: var(--ifaceboxFontColor);

View File

@ -33,6 +33,8 @@
local util = require "luci.util"
local http = require "luci.http"
local disp = require "luci.dispatcher"
local uci = require 'luci.model.uci'.cursor()
local fs = require "nixio.fs"
local boardinfo = util.ubus("system", "board")
local boardinfo={}
@ -114,7 +116,16 @@
subtree(prefix .. selected_name .. "/", selected_node, level + 1)
end
end
end
-- Custom settings
local mode = 'normal'
local navbar_proxy = 'openclash'
if fs.access('/etc/config/design') then
mode = uci:get_first('design', 'global', 'mode')
navbar_proxy = uci:get_first('design', 'global', 'navbar_proxy')
end
-%>
<!DOCTYPE html>
<html lang="<%=luci.i18n.context.lang%>">
@ -130,8 +141,6 @@
<meta name="browsermode" content="application">
<meta name="msapplication-tap-highlight" content="no">
<meta name="apple-mobile-web-app-status-bar-style" content="default" />
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black">
<meta name="application-name" content="<%=striptags( (boardinfo.hostname or "?") ) %>">
<meta name="apple-mobile-web-app-title" content="<%=striptags( (boardinfo.hostname or "?") ) %>">
<meta name="msapplication-TileImage" content="<%=media%>/images/android-chrome-512x512.png"/>
@ -140,8 +149,10 @@
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">
<meta name="apple-touch-fullscreen" content="yes" />
<link rel="stylesheet" href="<%=media%>/css/style.css?v=<%= ver.luciversion %>">
<meta name="theme-color" media="(prefers-color-scheme: light)" content="white">
<meta name="theme-color" media="(prefers-color-scheme: dark)" content="black">
<link rel="shortcut icon" href="<%=media%>/favicon.ico">
<% if node and node.css then %>
<link rel="stylesheet" href="<%=resource%>/<%=node.css%>">
@ -166,15 +177,30 @@
<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
<header>
<div class="navbar">
<a href="/cgi-bin/luci/admin/status/overview"><img src="<%=media%>/images/home.png" /></a>
<a href="/cgi-bin/luci/admin/services/openclash"><img src="<%=media%>/images/openclash.png" /></a>
<% if navbar_proxy == 'openclash' then %>
<a href="/cgi-bin/luci/admin/services/<%=navbar_proxy%>"><img src="<%=media%>/images/<%=navbar_proxy%>.png" /></a>
<% else %>
<a href="/cgi-bin/luci/admin/services/<%=navbar_proxy%>"><img src="<%=media%>/images/ssr.png" /></a>
<% end -%>
<a href="/cgi-bin/luci/admin/network/network"><img src="<%=media%>/images/link.png" /></a>
<a href="/cgi-bin/luci/admin/status/realtime"><img src="<%=media%>/images/rank.png" /></a>
<a href="/cgi-bin/luci/admin/system/admin"><img src="<%=media%>/images/user.png" /></a>
</div>
<script>
<% if mode == 'normal' then %>
document.body.setAttribute('data-theme', window.matchMedia('(prefers-color-scheme: dark)').matches? 'dark' : 'light');
window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', (event) => {
document.body.setAttribute('data-theme', event.matches? 'dark' : 'light');
})
<% else %>
document.body.setAttribute('data-theme', '<%= mode %>' === 'dark' ? 'dark' : 'light');
<% end -%>
</script>
<div class="container">
<span class="showSide"></span>
<a class="brand" href="#"><%=boardinfo.hostname or "OpenWrt"%></a>