diff --git a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua index 53ada80780..039295445d 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua +++ b/package/ctcgfw/luci-app-vssr/luasrc/model/cbi/vssr/servers-list.lua @@ -59,7 +59,7 @@ o.template="vssr/socket" o.width="1%" o = s:option(DummyValue,"server",translate("Ping Latency")) -o.template="vssr/ping1" +o.template="vssr/ping" o.width="1%" m:append(Template("vssr/server_list")) diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm index f13db7c806..9dd45779f8 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status.htm @@ -29,7 +29,7 @@ math.randomseed(os.time())
-

<%:Visit foreign websites%>
<%:Problem detected%>

+

<%:foreign websites%>
<%:Problem detected%>

@@ -42,7 +42,7 @@ math.randomseed(os.time())
-

<%:Visit domestic website%>
<%:Problem detected%>

+

<%:domestic website%>
<%:Problem detected%>

@@ -117,14 +117,14 @@ math.randomseed(os.time()) tb.innerHTML = '<%:Client%>
<%:Not Running%>'; } if (data.google) { - tb1.innerHTML = '<%:Visit foreign websites%>
<%:Working...%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Connect OK%>'; } else { - tb1.innerHTML = '<%:Visit foreign websites%>
<%:Problem detected%>'; + tb1.innerHTML = '<%:foreign websites%>
<%:Problem detected%>'; } if (data.baidu) { - tb2.innerHTML = '<%:Visit domestic website%>
<%:Working...%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Connect OK%>'; } else { - tb2.innerHTML = '<%:Visit domestic website%>
<%:Problem detected%>'; + tb2.innerHTML = '<%:domestic website%>
<%:Problem detected%>'; } if (data.game) { tb3.innerHTML = '<%:Game Mode%>
<%:Running%>'; diff --git a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm index cc64e38b82..fa378662b8 100644 --- a/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm +++ b/package/ctcgfw/luci-app-vssr/luasrc/view/vssr/status3.htm @@ -1,13 +1,12 @@ -
<%:Running Status%> - -
-
-
-
-
- + + + + + + +
+
+
+
+

<%:Client%>
<%:Not Running%>

+
+
+
+
-
-
-

<%:Client%>
<%:Not Running%>

-
-
+
+
+
+
+
+
+ +

<%:domestic website%>
<%:Problem detected%>

+
+
+
+ +
+
+
+
+
+
+
+

<%:foreign websites%>
<%:Problem detected%>

+
+
+
+ +
+
+
+
+ +
+
+
+

<%:SS Servers%>
<%:Not Running%>

+
+
+
+ +
+
+
+
+
+
+
+

<%:SSR Servers%>
<%:Not Running%>

+
+
+
+ +
+
+
+
+ +
+
+
+

<%:V2 Servers%>
<%:Not Running%>

+
+
+
+ +
+
+
+
-
-
-
-
- -
-
-
-

<%:Visit foreign websites%>
<%:Problem detected%>

-
-
-
-
-
-
-
- -
-
-
-

<%:Visit domestic website%>
<%:Problem detected%>

-
-
-
-
-
-
-
- -
-
-
-

<%:SS Servers%>
<%:Not Running%>

-
-
-
-
-
-
-
- -
-
-
-

<%:SSR Servers%>
<%:Not Running%>

-
-
-
-
-
-
-
- -
-
-
-

<%:V2 Servers%>
<%:Not Running%>

-
-
-
-
- - -
+ + \ No newline at end of file diff --git a/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po b/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po index 14ac1d95b2..06a1cd4608 100644 --- a/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po +++ b/package/ctcgfw/luci-app-vssr/po/zh_Hans/vssr.po @@ -125,10 +125,10 @@ msgstr "个节点" msgid "Client" msgstr "客户端" -msgid "Visit foreign websites" +msgid "foreign websites" msgstr "国外网站" -msgid "Visit domestic website" +msgid "domestic website" msgstr "国内网站" msgid "Problem detected" @@ -846,7 +846,7 @@ msgid "SSR Server" msgstr "服务端" msgid "V2 Servers" -msgstr "V2服务器" +msgstr "V2RAY服务器" msgid "SS/SSR/V2RAY Server" msgstr "SS/SSR/V2RAY 服务端" diff --git a/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css b/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css index 2a3443294b..ba5cef5ba1 100644 --- a/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css +++ b/package/ctcgfw/luci-app-vssr/root/www/luci-static/vssr/css/vssr.css @@ -247,6 +247,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md line-height: 1; font-family: inherit; min-width: inherit; + padding: 6px 10px 7px 8px; overflow-x: auto; overflow-y: hidden; border: 1px solid rgba(0, 0, 0, .05); @@ -263,6 +264,10 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md max-height: 100%; width: auto; } +.pure-imgw{ + max-width: 100%; + height: auto; +} .green { font-size: 1.25rem; color: #2dce89; @@ -307,23 +312,24 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md .p-in5{ padding: 8px; } +.flag-icon:before{ + position: absolute; +} - .cbi-section-table-row { - position: relative; - background: #CCFFFF; - margin: 10px; - padding: 18px 18px 18px 88px; - box-shadow: 0 0 1rem 0 rgba(136,152,170,.75); - border-radius: .5rem; - border: 0; - color: #003333; - text-align: left; - line-height: 1.7em; - white-space: nowrap; -     text-overflow: ellipsis; - overflow: hidden; - transition: all 0.3s; - +.cbi-section-table-row { + position: relative; + background: #f3f9f1; + margin: 10px !important; + padding: 18px 18px 18px 108px; + box-shadow: 0 0 5px 0 rgba(136, 152, 170, .75); + border-radius: .5rem; + border: 0; + color: #180614; + text-align: left; + line-height: 1.7em; + overflow: hidden; + letter-spacing: normal; + transition: all 0.2s; } .cbi-section-table-row:hover{ background: #fff; @@ -333,6 +339,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md .cbi-section-table-row.fast{ background: #5e72e4; color: #fff; + } .cbi-section-table-row.fast .ssr-button{ @@ -347,6 +354,9 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md box-shadow: none; } +.cbi-section-table-row.fast .host_con{ + color: #fff !important; +} .host_con.fast { color: #6f9a37; } @@ -396,6 +406,12 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md .alias{ margin-bottom:1px; } +.incon{ + cursor: pointer; +} +.incon .pure-imgw{ + transition: all 0.2s; +} .incon:nth-child(2) { position: absolute; left: 0; @@ -414,10 +430,10 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md height: 25%; width: 100%; text-align: center; - font-size: 12px; - line-height: 15px; + font-size: 13px; + line-height: 21px; color: #fff; - background: #525f7f; + background: #4c8dae; } .incon:nth-child(3) { @@ -439,7 +455,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md .ssr-button { background: none; color: #525f7f; - padding: 0 0 0 6px; + padding: 0 0 0 0; height: auto; line-height: 1.5em; } @@ -457,18 +473,16 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md margin-left: 10px; margin-top: 1rem; } - - .cbi-button-check { color: #fff !important; - background-color: #336633 !important; - border-color: #2e6da4 !important; + background-color: #008080 !important; + border-color: #008080 !important; font-size:12px; padding:0.6rem 0.8rem; float:right; margin-right:10px; margin-top:-0.3rem; - + } .cbi-section-table-cell { @@ -478,7 +492,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md .host_con { position: absolute; left: 0; - width: 50px; + width: 70px; text-align: left; height: 22px; font-weight: bold; @@ -500,23 +514,22 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md footer.mobile-hide{ display: block; } -.cbi-button-add{ + .cbi-button-add{ position:fixed; padding: 0.3rem 0.5rem; z-index:1000; - width:70px !important; - height:70px; - bottom:90px; - right:55px; + width:80px !important; + height:80px; + bottom:150px; + right:60px; font-size:20px; border-radius:50%; display:block; - background-color: #336633!important; - border-color: #CC6699 !important; + background-color: #008080!important; + border-color: #008080 !important; box-shadow: 0 0 1rem 0 rgba(136,152,170,.75); } - .mar-10 {margin-left: 50px; margin-right: 10px;} .status-bar{ @@ -540,14 +553,15 @@ footer.mobile-hide{ float: left; margin-right: 1em; } +.status-bar .inner .status-info{ + font-weight: bold; +} .status-bar .icon-con{ height: 3em; text-align: right; } - - -@media screen and (max-width: 1900px) { +@media screen and (max-width: 2000px) { .pure-u-1-5 { width: 25%; } @@ -598,7 +612,7 @@ footer.mobile-hide{ font-size: 16px; border-radius: 50%; display: block; - background-color: #fb6340!important; + background-color: #fb6340 !important; border-color: #fb6340 !important; box-shadow: 0 0 1rem 0 rgba(136, 152, 170, .75); }