From 504b43e943e8f2308fd712e7105da1cf5f2449d8 Mon Sep 17 00:00:00 2001 From: jerrykuku Date: Thu, 20 Aug 2020 13:04:20 +0800 Subject: [PATCH] v2.2.3 - Fix Firmware flash page display error in dark mode - Update font icon, add a default icon of undefined menu --- Makefile | 4 +- README.md | 6 +- README_ZH.md | 6 +- htdocs/luci-static/argon/css/cascade.css | 27 ++++- htdocs/luci-static/argon/css/dark.css | 18 +++- htdocs/luci-static/argon/css/fonts.css | 13 ++- htdocs/luci-static/argon/fonts/argon.eot | Bin 8708 -> 8888 bytes htdocs/luci-static/argon/fonts/argon.svg | 1 + htdocs/luci-static/argon/fonts/argon.ttf | Bin 8552 -> 8732 bytes htdocs/luci-static/argon/fonts/argon.woff | Bin 8628 -> 8808 bytes htdocs/luci-static/argon/less/cascade.less | 113 +++++++++++++++------ htdocs/luci-static/argon/less/dark.less | 26 ++++- 12 files changed, 163 insertions(+), 51 deletions(-) diff --git a/Makefile b/Makefile index 6e27de1..ad22b80 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Argon Theme LUCI_DEPENDS:=+luasocket -PKG_VERSION:=2.2.2 -PKG_RELEASE:=20200816 +PKG_VERSION:=2.2.3 +PKG_RELEASE:=20200820 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/README.md b/README.md index bebacea..4a20635 100644 --- a/README.md +++ b/README.md @@ -59,11 +59,13 @@ opkg install luci-theme-argon*.ipk ### For openwrt official 19.07 Snapshots LuCI master ``` -wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2.2/luci-theme-argon_2.2.2-20200816_all.ipk +wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2.3/luci-theme-argon_2.2.3-20200820_all.ipk opkg install luci-theme-argon*.ipk ``` -## Update log 2020.08.16 v2.2.2 +## Update log 2020.08.20 v2.2.3 +- Fix Firmware flash page display error in dark mode【v2.2.3】 +- Update font icon, add a default icon of undefined menu【v2.2.3】 - Add custom login background,put your image (allow png jpg gif) or MP4 video into /www/luci-static/argon/background, random change【v2.2.2】 - Add force dark mode, login ssh and type "touch /etc/dark" to open dark mode.【v2.2.2】 diff --git a/README_ZH.md b/README_ZH.md index 1823357..85e1f6e 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -56,11 +56,13 @@ opkg install luci-theme-argon*.ipk ### For openwrt official 19.07 Snapshots LuCI master ``` -wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2.2/luci-theme-argon_2.2.2-20200816_all.ipk +wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v2.2.3/luci-theme-argon_2.2.3-20200820_all.ipk opkg install luci-theme-argon*.ipk ``` -## 更新日志 2020.08.16 v2.2.2 +## 更新日志 2020.08.20 v2.2.3 +- 修正了在暗色模式下，固件刷写弹窗内的显示错误。【v2.2.3】 +- 更新了图标库，为未定义的菜单增加了一个默认的图标。【v2.2.3】 - 背景文件策略调整为，同时接受 jpg png gif mp4, 自行上传文件至 /www/luci-static/argon/background 图片和视频同时随机。【v2.2.2】 - 增加强制暗色模式，进入ssh 输入 "touch /etc/dark" 进行开启。【v2.2.2】 diff --git a/htdocs/luci-static/argon/css/cascade.css b/htdocs/luci-static/argon/css/cascade.css index e3b04dd..8e7e086 100644 --- a/htdocs/luci-static/argon/css/cascade.css +++ b/htdocs/luci-static/argon/css/cascade.css @@ -802,6 +802,8 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] { left: 0.8rem; padding-top: 3px; transition: all 0.3s; + content: "\e915"; + color: #5e72e4; } .main .main-left .nav li.slide .menu::after { position: absolute; @@ -2023,7 +2025,6 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child { color: #808080; } .modal p { - padding-left: 0.25rem; word-break: break-word; } .modal .label { @@ -2567,6 +2568,12 @@ input[name="nslookup"] { padding: 1rem 0 1rem 1.5rem; color: #525f7f; } +[data-page="admin-system-flash"] .modal label > input[type="checkbox"] { + top: -0.35rem; +} +[data-page="admin-system-flash"] .modal .btn { + white-space: normal !important; +} /* wireless overview */ #cbi-wireless > #wifi_assoclist_table > .tr { box-shadow: inset 1px -1px 0 #ddd, inset -1px -1px 0 #ddd; @@ -3641,8 +3648,8 @@ pre.command-output { .cbi-button[value="Kill"], .cbi-button[onclick="reboot(this)"], .cbi-button-neutral[value="Restart"] { - border: thin solid darkorange; - background-color: darkorange; + border: thin solid darkorange !important; + background-color: darkorange !important; } .cbi-section, .cbi-section-error, @@ -3666,6 +3673,20 @@ pre.command-output { [data-page="admin-system-admin-password"] .cbi-map .cbi-map-descr { color: #ccc; } + [data-page="admin-system-flash"] .modal label > input[type="checkbox"] { + top: -0.35rem; + } + [data-page="admin-system-flash"] .modal .btn { + white-space: normal !important; + background-color: darkseagreen; + } + [data-page="admin-system-flash"] .modal .alert-message { + background-color: transparent !important; + } + [data-page="admin-system-flash"] .modal .danger { + border: thin solid darkorange !important; + background-color: darkorange !important; + } .cbi-value input[type="password"] + .cbi-button-neutral { background-color: darkslateblue !important; } diff --git a/htdocs/luci-static/argon/css/dark.css b/htdocs/luci-static/argon/css/dark.css index efd4190..6a1cc07 100644 --- a/htdocs/luci-static/argon/css/dark.css +++ b/htdocs/luci-static/argon/css/dark.css @@ -489,8 +489,8 @@ td > .ifacebadge, .cbi-button[value="Kill"], .cbi-button[onclick="reboot(this)"], .cbi-button-neutral[value="Restart"] { - border: thin solid darkorange; - background-color: darkorange; + border: thin solid darkorange !important; + background-color: darkorange !important; } .cbi-section, .cbi-section-error, @@ -514,6 +514,20 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] { [data-page="admin-system-admin-password"] .cbi-map .cbi-map-descr { color: #ccc; } +[data-page="admin-system-flash"] .modal label > input[type="checkbox"] { + top: -0.35rem; +} +[data-page="admin-system-flash"] .modal .btn { + white-space: normal !important; + background-color: darkseagreen; +} +[data-page="admin-system-flash"] .modal .alert-message { + background-color: transparent !important; +} +[data-page="admin-system-flash"] .modal .danger { + border: thin solid darkorange !important; + background-color: darkorange !important; +} .cbi-value input[type="password"] + .cbi-button-neutral { background-color: darkslateblue !important; } diff --git a/htdocs/luci-static/argon/css/fonts.css b/htdocs/luci-static/argon/css/fonts.css index 4b83eca..1c24f70 100644 --- a/htdocs/luci-static/argon/css/fonts.css +++ b/htdocs/luci-static/argon/css/fonts.css @@ -48,11 +48,11 @@ @font-face { font-family: 'argon'; - src: url('../fonts/argon.eot?sv3bol'); - src: url('../fonts/argon.eot?sv3bol#iefix') format('embedded-opentype'), - url('../fonts/argon.ttf?sv3bol') format('truetype'), - url('../fonts/argon.woff?sv3bol') format('woff'), - url('../fonts/argon.svg?sv3bol#argon') format('svg'); + src: url('../fonts/argon.eot?u6kthm'); + src: url('../fonts/argon.eot?u6kthm#iefix') format('embedded-opentype'), + url('../fonts/argon.ttf?u6kthm') format('truetype'), + url('../fonts/argon.woff?u6kthm') format('woff'), + url('../fonts/argon.svg?u6kthm#argon') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -181,3 +181,6 @@ content: "\e914"; } +.icon-app:before { + content: "\e915"; +} \ No newline at end of file diff --git a/htdocs/luci-static/argon/fonts/argon.eot b/htdocs/luci-static/argon/fonts/argon.eot index 892d0536ae66780f0f68e91a31a9ce9d55f7f9d9..e28f6db55e898dd8a1d9ead5318f7528ec9286c4 100644 GIT binary patch delta 463 zcmZp1+2P8zLy3VwMrk6O8O!YaYSW1h9*iavJ589EbZ1XIAX7iD!DSi)1LFz?2H7PU zsfj64HoQj|8038z7#PelfC3y6%-ukK3y`mpky}zxn$Kztt>Gf&3gGUm-6sH+5#;#6}>q2WUrLL4I)w12a&DLGcero`IQpax~)< zM$yS181>oL@*e|AGEV-eC_G7tWwR|)j&waUgUbIC%y*bKGYBv!G8i&2u!@LrCMPGx z==JZVm>8q0sJSSR5dF7O&`RvzS;l2@ATCJNZZTO4UI9tQekpz4vz!9jV*iRjEM^~G z1)g&}Oq@%3<$2HY^3MNrK~jKsDX+d1P$fUlG9Cj-hRw@mXEVyBrI}Xe&yMG}`O3h} z0`e)t?c|NcFnV%=yg8%7b*7F_=saQrrXp^u}&l delta 266 zcmdnt+Ty~-qQt900lTCn7e@d8$iBFMs7((VLq!kkpBnBugS?zP7K%(na02% zUjgJhlU0{J_De1*Kk+|-%96B~ehpnk@@g8bqV24oL@E-+AGEQEoB)-{}DMxy9sN76OIiItq(>j;N^V@u7;AR17Ww>o$267FU sp3I|Q&L}_GMWKB1eg#J^-Zy+T42(cI`N@2W4;hUoe^3+!l59$w0PKZHUH||9 diff --git a/htdocs/luci-static/argon/fonts/argon.svg b/htdocs/luci-static/argon/fonts/argon.svg index 388f05a..1e12b5f 100644 --- a/htdocs/luci-static/argon/fonts/argon.svg +++ b/htdocs/luci-static/argon/fonts/argon.svg @@ -32,6 +32,7 @@ + \ No newline at end of file diff --git a/htdocs/luci-static/argon/fonts/argon.ttf b/htdocs/luci-static/argon/fonts/argon.ttf index b55ef5a4289aa3118bc24b461ecee62bdf4c2e07..3d062dcf264462eae98dbe9565560187362e7f5c 100644 GIT binary patch delta 440 zcmaFiG{rW0{J;WzCvDNZmPu0zKM-Mb`Q{!yn_7V5(Z|V6ocZQi92R9icSt;)MsDI ze+($dI5|*JeDgxa9O-&y29^IOnC~!e20B%d!H|K0Rm{v(&_qpLRgFzlP()0em61(E zoK=p|T-D43D5%8F$|xdcu4=~!QpL{7$0*9UNK{Tv^xrlyIXN*#uYWJa#28&g%|(HP z=)aYMR$~9oGA@$?aY3qfi^*E>3P>{cOX>5TD+4zR$a@U8lQ$N_=*dUq u%o!CX|B)+aRGC~L@50B&!RN$x2`J47#0r!5$vBv#=sz70pvU6 zCRP+M7%}+*`8$Aog}lVvREe3r6B~d6Km!=_3i69f7?^=l42m8Tcg$uKnH<8X&%TEL zC{U1bGNY3C=7o$o(wle6&SaGHIeR*-b7?%k%~u9)7LXQ(+xBH3XMpL+1@h*M@{?D{ zmrqt!a1`Nv!&k$=2$Yj&@@5bMDPmv(nkPKDU*U+jF+&(bDnk)NF+(OpK0_XZ0)rug L9)t1ZEX7R#7%)oR diff --git a/htdocs/luci-static/argon/fonts/argon.woff b/htdocs/luci-static/argon/fonts/argon.woff index 4d1417a3a8fd1b716cdca18c9f19fef493edc620..ef1e9c2c434f786a409d2e3ac47a5035872e98e7 100644 GIT binary patch delta 510 zcmdnu{K7?|+~3WOfsp|Slrk8&!L$sJ&oX(TqVPm*wfZI9+3AVJ1q=*~Z-9~<0ZGPw zDSh6voC4Zn|B65?W*=S!o^w1*oJ)D-dC&6l&i`{kQh;|Uuf7yeB|pzH9s@~+&Ec}M z8RgQ_Osn%}$Mf5KW#DE31^@%Y?c|NcFnY3pyg8%7WDogrMwQ8XJh delta 312 zcmaFivc*}V+~3WOfsp|S6t^&NgXs()pLueilE_3I)%wNVndyne1q=*~Z-9~@)!B?$@vP7T)c1iY8XHPBR_ec!b3*m$qN)kf#f#D FO#tidPO<<1 diff --git a/htdocs/luci-static/argon/less/cascade.less b/htdocs/luci-static/argon/less/cascade.less index 54f1d1a..07fc7f0 100644 --- a/htdocs/luci-static/argon/less/cascade.less +++ b/htdocs/luci-static/argon/less/cascade.less @@ -369,13 +369,14 @@ hr { background-color: var(--darker); overflow: hidden; pointer-events: none; + video { width: 100%; height: auto; } } - .volume-control{ + .volume-control { position: fixed; right: 1rem; top: 1rem; @@ -385,7 +386,8 @@ hr { cursor: pointer; background-size: contain; background-image: url(../img/volume_high.svg); - &.mute{ + + &.mute { background-image: url(../img/volume_off.svg); } } @@ -566,11 +568,13 @@ hr { padding: 0px 0px 30px; color: #525461; z-index: 10; - .ftc{ + + .ftc { position: absolute; bottom: 30px; width: 100%; } + .luci-link { display: block; } @@ -949,6 +953,8 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] { left: 0.8rem; padding-top: 3px; transition: all 0.3s; + content: "\e915"; + color: #5e72e4; } &::after { @@ -2402,7 +2408,7 @@ body:not(.Interfaces) .cbi-rowstyle-2:first-child { } .modal p { - padding-left: .25rem; + word-break: break-word; } @@ -2439,6 +2445,8 @@ body.modal-overlay-active #modal_overlay { opacity: 1; } + + .spinning { position: relative; padding-left: 32px !important; @@ -3023,37 +3031,54 @@ input[name="nslookup"] { } /*admin-system-flash*/ -[data-page="admin-system-flash"] .cbi-value { - padding: 0; -} -[data-page="admin-system-flash"] .cbi-section .cbi-section { - margin-top: 0; -} +[data-page="admin-system-flash"] { + .cbi-value { + padding: 0; + } -[data-page="admin-system-flash"] .cbi-map-tabbed { - border-radius: 0.375rem; -} + .cbi-section { + .cbi-section { + margin-top: 0; + } + } -[data-page="admin-system-flash"] legend { - display: block !important; - font-size: 1.2rem; - width: 100%; - display: block; - margin-bottom: 0; - padding: 1rem 0 1rem 1.5rem; - border-bottom: 1px solid rgba(0, 0, 0, .05); - line-height: 1.5; - margin-bottom: 0rem; - letter-spacing: 0.1rem; - color: #32325d; - font-weight: bold; -} + .cbi-map-tabbed { + border-radius: 0.375rem; + } -[data-page="admin-system-flash"] .cbi-section-descr { - font-weight: 600; - padding: 1rem 0 1rem 1.5rem; - color: #525f7f; + legend { + display: block !important; + font-size: 1.2rem; + width: 100%; + display: block; + margin-bottom: 0; + padding: 1rem 0 1rem 1.5rem; + border-bottom: 1px solid rgba(0, 0, 0, .05); + line-height: 1.5; + margin-bottom: 0rem; + letter-spacing: 0.1rem; + color: #32325d; + font-weight: bold; + } + + .cbi-section-descr { + font-weight: 600; + padding: 1rem 0 1rem 1.5rem; + color: #525f7f; + } + + .modal { + + + label>input[type="checkbox"] { + top: -0.35rem; + } + + .btn { + white-space: normal !important; + } + } } /* wireless overview */ @@ -4463,8 +4488,8 @@ pre.command-output { .cbi-button[value="Kill"], .cbi-button[onclick="reboot(this)"], .cbi-button-neutral[value="Restart"] { - border: thin solid darkorange; - background-color: darkorange; + border: thin solid darkorange !important; + background-color: darkorange !important; } .cbi-section, @@ -4492,6 +4517,28 @@ pre.command-output { color: #ccc; } + [data-page="admin-system-flash"] { + .modal { + label>input[type="checkbox"] { + top: -0.35rem; + } + + .btn { + white-space: normal !important; + background-color: darkseagreen; + } + + .alert-message { + background-color: transparent !important; + } + + .danger { + border: thin solid darkorange !important; + background-color: darkorange !important; + } + } + } + .cbi-value input[type="password"]+.cbi-button-neutral { background-color: darkslateblue !important; } diff --git a/htdocs/luci-static/argon/less/dark.less b/htdocs/luci-static/argon/less/dark.less index d8722ac..c1285dd 100644 --- a/htdocs/luci-static/argon/less/dark.less +++ b/htdocs/luci-static/argon/less/dark.less @@ -632,8 +632,8 @@ td>.ifacebadge, .cbi-button[value="Kill"], .cbi-button[onclick="reboot(this)"], .cbi-button-neutral[value="Restart"] { - border: thin solid darkorange; - background-color: darkorange; + border: thin solid darkorange !important; + background-color: darkorange !important; } .cbi-section, @@ -661,6 +661,28 @@ div[style="width:100%;height:300px;border:1px solid #000;background:#fff"] { color: #ccc; } +[data-page="admin-system-flash"] { + .modal { + label>input[type="checkbox"] { + top: -0.35rem; + } + + .btn { + white-space: normal !important; + background-color: darkseagreen; + } + + .alert-message { + background-color: transparent !important; + } + + .danger { + border: thin solid darkorange !important; + background-color: darkorange !important; + } + } +} + .cbi-value input[type="password"]+.cbi-button-neutral { background-color: darkslateblue !important; }