diff --git a/package/ctcgfw/luci-theme-argon/Makefile b/package/ctcgfw/luci-theme-argon/Makefile
index 6e27de1f44..ad22b80701 100644
--- a/package/ctcgfw/luci-theme-argon/Makefile
+++ b/package/ctcgfw/luci-theme-argon/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/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css
index e3b04dd446..8e7e0862f7 100644
--- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/cascade.css
+++ b/package/ctcgfw/luci-theme-argon/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/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/dark.css b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/dark.css
index efd4190f4a..6a1cc074bb 100644
--- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/dark.css
+++ b/package/ctcgfw/luci-theme-argon/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/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/fonts.css b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/fonts.css
index 4b83ecac5e..1c24f70820 100644
--- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/css/fonts.css
+++ b/package/ctcgfw/luci-theme-argon/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/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.eot b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.eot
index 892d0536ae..e28f6db55e 100644
Binary files a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.eot and b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.eot differ
diff --git a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.svg b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.svg
index 388f05a42f..1e12b5f6a8 100644
--- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.svg
+++ b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.svg
@@ -32,6 +32,7 @@
+
\ No newline at end of file
diff --git a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.ttf b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.ttf
index b55ef5a428..3d062dcf26 100644
Binary files a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.ttf and b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.ttf differ
diff --git a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.woff b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.woff
index 4d1417a3a8..ef1e9c2c43 100644
Binary files a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.woff and b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/fonts/argon.woff differ
diff --git a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less
index 54f1d1a4a9..07fc7f0b57 100644
--- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/cascade.less
+++ b/package/ctcgfw/luci-theme-argon/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/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/dark.less b/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/dark.less
index d8722ac21e..c1285dd4a9 100644
--- a/package/ctcgfw/luci-theme-argon/htdocs/luci-static/argon/less/dark.less
+++ b/package/ctcgfw/luci-theme-argon/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;
}