v2.2.3

- Fix Firmware flash page display error in dark mode
- Update font icon, add a default icon of undefined menu

Makefile

@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=+luasocket
-PKG_VERSION:=2.2.2
+PKG_VERSION:=2.2.3
-PKG_RELEASE:=20200816
+PKG_RELEASE:=20200820
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

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】

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】

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;
+    border: thin solid darkorange !important;
-    background-color: darkorange;
+    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;
   }

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;
+  border: thin solid darkorange !important;
-  background-color: darkorange;
+  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;
 }

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?u6kthm');
-    src: url('../fonts/argon.eot?sv3bol#iefix') format('embedded-opentype'),
+    src: url('../fonts/argon.eot?u6kthm#iefix') format('embedded-opentype'),
-        url('../fonts/argon.ttf?sv3bol') format('truetype'),
+        url('../fonts/argon.ttf?u6kthm') format('truetype'),
-        url('../fonts/argon.woff?sv3bol') format('woff'),
+        url('../fonts/argon.woff?u6kthm') format('woff'),
-        url('../fonts/argon.svg?sv3bol#argon') format('svg');
+        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";
+}

htdocs/luci-static/argon/fonts/argon.svg

@@ -32,6 +32,7 @@
 <glyph unicode="&#xe912;" glyph-name="control" d="M1024.001-23.040v942.081c0 22.656-18.304 40.96-40.96 40.96h-942.081c-22.656 0-40.96-18.304-40.96-40.96v-942.081c0-22.656 18.304-40.96 40.96-40.96h942.081c22.656 0 40.96 18.304 40.96 40.96zM293.119 586.241h-98.56c-5.632 0-10.24 4.608-10.24 10.24v61.44c0 5.632 4.608 10.24 10.24 10.24h98.56c17.408 53.376 67.584 92.16 126.72 92.16s109.44-38.785 126.72-92.16h282.88c5.632 0 10.24-4.608 10.24-10.24v-61.44c0-5.632-4.608-10.24-10.24-10.24h-282.88c-17.408-53.376-67.584-92.16-126.72-92.16s-109.44 38.785-126.72 92.16zM477.312 228.352c0-0.256 0.128-0.384 0.128-0.512h-282.88c-5.632 0-10.24 4.608-10.24 10.24v61.44c0 5.632 4.608 10.24 10.24 10.24h282.88c0-0.256-0.128-0.384-0.128-0.512 17.152 53.76 67.457 92.672 126.848 92.672s109.696-38.912 126.848-92.672c0 0.256-0.128 0.384-0.128 0.512h98.56c5.632 0 10.24-4.608 10.24-10.24v-61.44c0-5.632-4.608-10.24-10.24-10.24h-98.56c0 0.256 0.128 0.384 0.128 0.512-17.152-53.76-67.457-92.672-126.848-92.672s-109.696 38.912-126.848 92.672zM604.16 314.88c-25.45 0-46.080-20.63-46.080-46.080s20.63-46.080 46.080-46.080v0c25.45 0 46.080 20.63 46.080 46.080s-20.63 46.080-46.080 46.080v0zM442.24 587.008l3.072 1.92c0.128 0 0.128 0.128 0.256 0.128l1.536 1.152c0.128 0.128 0.256 0.256 0.384 0.256 1.664 1.28 3.2 2.56 4.608 4.096l0.256 0.256c0.512 0.512 1.024 1.024 1.408 1.536 1.024 1.024 1.92 2.176 2.688 3.328v0.128l1.152 1.536c0.128 0.128 0.256 0.384 0.384 0.512 1.024 1.536 2.048 3.2 2.816 4.992 0.128 0.256 0.256 0.64 0.512 0.896 0.256 0.512 0.384 0.896 0.64 1.408 0.128 0.384 0.384 0.896 0.512 1.28 0.256 0.64 0.512 1.28 0.64 1.92 0.128 0.512 0.384 1.152 0.512 1.664l0.384 1.152 0.384 1.792c0.128 0.256 0.128 0.64 0.256 0.896 0.128 0.896 0.384 1.792 0.512 2.688 0 0.256 0 0.512 0.128 0.768 0.128 0.768 0.128 1.408 0.256 2.176 0 0.256 0 0.512 0.128 0.896 0 1.024 0.128 1.92 0.128 2.944s0 1.92-0.128 2.944c0 0.256 0 0.512-0.128 0.896 0 0.768-0.128 1.536-0.256 2.176 0 0.256 0 0.512-0.128 0.768-0.128 0.896-0.256 1.792-0.512 2.688-0.128 0.256-0.128 0.64-0.256 0.896l-0.384 1.792-0.384 1.152c-0.128 0.512-0.384 1.152-0.512 1.664-0.256 0.64-0.512 1.28-0.64 1.92-0.128 0.384-0.384 0.896-0.512 1.28-0.256 0.512-0.384 0.896-0.64 1.408-0.128 0.256-0.256 0.64-0.512 0.896-0.896 1.664-1.792 3.328-2.816 4.992-0.128 0.128-0.256 0.384-0.384 0.512l-1.152 1.536v0.128c-0.896 1.152-1.792 2.304-2.688 3.328-0.512 0.512-0.896 1.024-1.408 1.536l-0.256 0.256c-1.425 1.384-2.925 2.724-4.483 3.997l-0.125 0.1c-0.128 0.128-0.256 0.256-0.384 0.256l-1.536 1.152c-0.128 0-0.128 0.128-0.256 0.128l-3.072 1.92c-0.256 0.128-0.384 0.256-0.64 0.384-6.528 3.456-13.952 5.504-21.76 5.504s-15.36-2.048-21.76-5.504c-0.256-0.128-0.384-0.256-0.64-0.384l-3.072-1.92c-0.128 0-0.128-0.128-0.256-0.128l-1.536-1.152c-0.128-0.128-0.256-0.256-0.384-0.256-1.664-1.28-3.2-2.56-4.608-4.096l-0.256-0.256c-0.512-0.512-1.024-1.024-1.408-1.536-1.024-1.024-1.92-2.176-2.688-3.328v-0.128l-1.152-1.536c-0.128-0.128-0.256-0.384-0.384-0.512-1.024-1.536-2.048-3.2-2.816-4.992-0.128-0.256-0.256-0.64-0.512-0.896-0.256-0.512-0.384-0.896-0.64-1.408-0.128-0.384-0.384-0.896-0.512-1.28-0.256-0.64-0.512-1.28-0.64-1.92-0.128-0.512-0.384-1.152-0.512-1.664l-0.384-1.152-0.384-1.792c-0.128-0.256-0.128-0.64-0.256-0.896-0.128-0.896-0.384-1.792-0.512-2.688 0-0.256 0-0.512-0.128-0.768-0.128-0.768-0.128-1.408-0.256-2.176 0-0.256 0-0.512-0.128-0.896 0-1.024-0.128-1.92-0.128-2.944s0-1.92 0.128-2.944c0-0.256 0-0.512 0.128-0.896 0-0.768 0.128-1.536 0.256-2.176 0-0.256 0-0.512 0.128-0.768 0.128-0.896 0.256-1.792 0.512-2.688 0.128-0.256 0.128-0.64 0.256-0.896l0.384-1.792 0.384-1.152c0.128-0.512 0.384-1.152 0.512-1.664 0.256-0.64 0.512-1.28 0.64-1.92 0.128-0.384 0.384-0.896 0.512-1.28 0.256-0.512 0.384-0.896 0.64-1.408 0.128-0.256 0.256-0.64 0.512-0.896 0.896-1.664 1.792-3.328 2.816-4.992 0.128-0.128 0.256-0.384 0.384-0.512l1.152-1.536v-0.128c0.896-1.152 1.792-2.304 2.688-3.328 0.512-0.512 0.896-1.024 1.408-1.536l0.256-0.256c1.408-1.408 3.072-2.816 4.608-4.096 0.128-0.128 0.256-0.256 0.384-0.256l1.536-1.152c0.128 0 0.128-0.128 0.256-0.128l3.072-1.92c0.256-0.128 0.384-0.256 0.64-0.384 6.528-3.456 13.952-5.504 21.76-5.504s15.36 2.048 21.76 5.504c0.256 0.128 0.512 0.256 0.64 0.384z" />
 <glyph unicode="&#xe913;" glyph-name="statistics1" d="M242.692 27.226v606.954c0 24.204-18.621 42.82-40.959 42.82h-122.884c-22.336 0-40.959-20.476-40.959-42.82v-606.954h204.8zM503.346 27.226v867.607c0 24.206-18.617 44.687-40.96 44.687h-122.884c-22.336 0-40.959-20.482-40.959-44.687v-867.607h204.802zM763.999 27.226v383.538c0 24.204-18.615 44.681-40.959 44.681h-122.877c-22.343 0-40.967-20.476-40.967-44.681v-383.538h204.802zM1024.653 27.226v606.954c0 24.204-18.615 42.82-40.959 42.82h-122.877c-22.343 0-40.959-20.476-40.959-42.82v-606.954h204.793z" />
 <glyph unicode="&#xe914;" glyph-name="asterisk" d="M956.42 291.814l-284.42 156.186 284.42 156.186c23.59 12.954 31.922 42.768 18.464 66.074l-38.96 67.482c-13.456 23.306-43.44 30.998-66.454 17.046l-277.47-168.224 6.95 324.408c0.576 26.906-21.076 49.028-47.99 49.028h-77.92c-26.912 0-48.566-22.122-47.988-49.028l6.948-324.408-277.47 168.222c-23.012 13.952-52.998 6.26-66.454-17.046l-38.96-67.482c-13.456-23.306-5.124-53.12 18.466-66.074l284.418-156.184-284.42-156.186c-23.59-12.954-31.922-42.768-18.464-66.074l38.96-67.482c13.456-23.306 43.442-30.998 66.454-17.046l277.47 168.224-6.95-324.408c-0.576-26.906 21.078-49.028 47.99-49.028h77.922c26.912 0 48.566 22.122 47.99 49.028l-6.952 324.408 277.47-168.222c23.012-13.952 52.998-6.26 66.454 17.046l38.96 67.482c13.456 23.306 5.126 53.118-18.464 66.072z" />
+<glyph unicode="&#xe915;" glyph-name="app" d="M417.786-56.315c28.674-16.897 51.203-5.633 51.203 28.674v398.871c0 34.306-23.041 68.612-51.203 85.509l-330.259 205.324c-28.674 11.264-51.203 0-51.203-28.674v-398.871c0-34.306 23.041-68.612 51.203-85.509l330.259-205.324zM138.731 787.511c-28.674-16.897-28.674-39.938 0-56.835l325.139-205.324c28.674-16.897 68.612-16.897 96.774-5.633l325.139 165.386c28.674 16.897 28.674 39.938 0 56.835l-342.547 205.324c-23.041 16.897-68.612 16.897-96.774 0l-307.73-159.753zM560.643-27.642c0-34.306 23.041-45.571 51.203-28.674l325.139 165.386c28.674 16.897 51.203 51.203 51.203 85.509v399.383c0 34.306-23.041 45.571-51.203 28.674l-325.139-165.386c-28.674-16.897-51.203-51.203-51.203-85.509v-399.383z" />
 <glyph unicode="&#xe971;" glyph-name="user" d="M576 253.388v52.78c70.498 39.728 128 138.772 128 237.832 0 159.058 0 288-192 288s-192-128.942-192-288c0-99.060 57.502-198.104 128-237.832v-52.78c-217.102-17.748-384-124.42-384-253.388h896c0 128.968-166.898 235.64-384 253.388z" />
 <glyph unicode="&#xf059;" glyph-name="question" horiz-adv-x="878" d="M512 164.571v109.714q0 8-5.143 13.143t-13.143 5.143h-109.714q-8 0-13.143-5.143t-5.143-13.143v-109.714q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143zM658.286 548.571q0 50.286-31.714 93.143t-79.143 66.286-97.143 23.429q-138.857 0-212-121.714-8.571-13.714 4.571-24l75.429-57.143q4-3.429 10.857-3.429 9.143 0 14.286 6.857 30.286 38.857 49.143 52.571 19.429 13.714 49.143 13.714 27.429 0 48.857-14.857t21.429-33.714q0-21.714-11.429-34.857t-38.857-25.714q-36-16-66-49.429t-30-71.714v-20.571q0-8 5.143-13.143t13.143-5.143h109.714q8 0 13.143 5.143t5.143 13.143q0 10.857 12.286 28.286t31.143 28.286q18.286 10.286 28 16.286t26.286 20 25.429 27.429 16 34.571 7.143 46.286zM877.714 438.857q0-119.429-58.857-220.286t-159.714-159.714-220.286-58.857-220.286 58.857-159.714 159.714-58.857 220.286 58.857 220.286 159.714 159.714 220.286 58.857 220.286-58.857 159.714-159.714 58.857-220.286z" />
 </font></defs></svg>

htdocs/luci-static/argon/less/cascade.less

@@ -369,6 +369,7 @@ hr {
         background-color: var(--darker);
         overflow: hidden;
         pointer-events: none;
+
         video {
             width: 100%;
             height: auto;
@@ -385,6 +386,7 @@ hr {
         cursor: pointer;
         background-size: contain;
         background-image: url(../img/volume_high.svg);
+
         &.mute {
             background-image: url(../img/volume_off.svg);
         }
@@ -566,11 +568,13 @@ hr {
             padding: 0px 0px 30px;
             color: #525461;
             z-index: 10;
+
             .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,19 +3031,23 @@ input[name="nslookup"] {
 }
 
 /*admin-system-flash*/
-[data-page="admin-system-flash"] .cbi-value {
+
+[data-page="admin-system-flash"] {
+    .cbi-value {
         padding: 0;
     }
 
-[data-page="admin-system-flash"] .cbi-section .cbi-section {
+    .cbi-section {
+        .cbi-section {
             margin-top: 0;
         }
+    }
 
-[data-page="admin-system-flash"] .cbi-map-tabbed {
+    .cbi-map-tabbed {
         border-radius: 0.375rem;
     }
 
-[data-page="admin-system-flash"] legend {
+    legend {
         display: block !important;
         font-size: 1.2rem;
         width: 100%;
@@ -3050,12 +3062,25 @@ input[name="nslookup"] {
         font-weight: bold;
     }
 
-[data-page="admin-system-flash"] .cbi-section-descr {
+    .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 */
 #cbi-wireless>#wifi_assoclist_table>.tr {
     box-shadow: inset 1px -1px 0 #ddd, inset -1px -1px 0 #ddd;
@@ -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;
+        border: thin solid darkorange !important;
-        background-color: darkorange;
+        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;
     }

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;
+    border: thin solid darkorange !important;
-    background-color: darkorange;
+    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;
 }