Merge pull request #412 from SpeedPartner/18.06

Update branch 18.06 to v1.8.0

Makefile

@@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk
 
 LUCI_TITLE:=Argon Theme
 LUCI_DEPENDS:=+curl +jsonfilter
-PKG_VERSION:=1.7.8
-PKG_RELEASE:=20230505
+PKG_VERSION:=1.8.0
+PKG_RELEASE:=20230520
 
 include $(TOPDIR)/feeds/luci/luci.mk
 

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

@@ -158,10 +158,10 @@ body {
 a:link,
 a:visited,
 a:active {
-  color: var(--default);
+  color: var(--primary);
   text-decoration: none;
 }
-a:-webkit-any-link:not(.main-left a):not(li a):not(.brand):not(.login-container footer .ftc a) {
+a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a) {
   color: -webkit-link;
   cursor: pointer;
   color: var(--primary);
@@ -431,6 +431,10 @@ li {
   position: absolute;
   bottom: 0;
 }
+.login-page .login-container footer,
+.login-page .login-container footer a {
+  color: var(--default);
+}
 .login-page .login-container footer .ftc {
   position: absolute;
   bottom: 30px;
@@ -683,6 +687,7 @@ footer a {
   color: #fff;
   background: #5e72e4;
   background: var(--primary);
+  box-shadow: 0 0 1px #ccc;
 }
 .main .main-left .nav li.slide .menu:hover a,
 .main .main-left .nav li.slide .menu.active a {
@@ -774,6 +779,7 @@ footer a {
   background-color: #5e72e4;
   background-color: var(--primary);
   transition: all 0.2s;
+  box-shadow: 0 0 1px #ccc;
 }
 .main .main-left .nav li.slide .slide-menu li a:hover::after {
   color: #000;
@@ -1104,8 +1110,6 @@ input[type="checkbox"] {
   vertical-align: middle;
 }
 input[type="checkbox"]:checked {
-  border: 1px solid #5e72e4;
-  border: 1px solid var(--primary);
   background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'0 0 8 8\'%3e%3cpath fill=\'%23fff\' d=\'M6.564.75l-3.59 3.612-1.538-1.55L0 4.26 2.974 7.25 8 2.193z\'/%3e%3c/svg%3e') !important;
   background-color: #5e72e4;
   background-color: var(--primary);
@@ -1130,8 +1134,6 @@ ul li .cbi-input-checkbox {
   margin: 0.25rem 0;
 }
 .cbi-input-radio:checked {
-  border: 1px solid #5e72e4;
-  border: 1px solid var(--primary);
   background-image: url('data:image/svg+xml,%3csvg xmlns=\'http://www.w3.org/2000/svg\' viewBox=\'-4 -4 8 8\'%3e%3ccircle r=\'3\' fill=\'%23fff\'/%3e%3c/svg%3e') !important;
   background-color: #5e72e4;
   background-color: var(--primary);
@@ -1241,7 +1243,8 @@ div.cbi-value var,
 td.cbi-value-field var,
 .td.cbi-value-field var {
   font-style: italic;
-  color: #0069D6;
+  color: var(--primary);
+  text-shadow: 1px 1px 2px #ccc;
 }
 small {
   font-size: 90%;
@@ -1397,6 +1400,14 @@ input[name="nslookup"] {
   background-position: left top;
   animation: sparkle 1500ms linear infinite;
 }
+#swaptotal > div > div > div > small,
+#swapfree > div > div > div > small,
+#memfree > div > div > div > small,
+#membuff > div > div > div > small,
+#conns > div > div > div > small,
+#memtotal > div > div > div > small {
+  text-shadow: 1px 1px 2px #ccc;
+}
 /* fix multiple table */
 table table,
 .table .table {
@@ -1642,10 +1653,6 @@ th h5, td h5,
 th h6, td h6 {
   background: var(--lighter);
 }
-/* OCD: Change the background color of the "now in use" node in PassWall  */
-.cbi-section-table > tbody > ._now_use {
-  background: #5e72e473 !important;
-}
 /* language fix */
 body.lang_pl.node-main-login .cbi-value-title {
   width: 12rem;
@@ -1801,7 +1808,8 @@ input {
   transition: box-shadow 0.15s ease;
   margin: 0.25rem;
 }
-select:not([multiple="multiple"]):focus,
+select:not([multiple="multiple"]):hover,
+input:hover,
 input:focus {
   border-color: #5e72e4;
   border-color: var(--primary);
@@ -2484,8 +2492,9 @@ form > .cbi-map > .cbi-section > .cbi-section-node > .cbi-value > .cbi-value-fie
   content: "\f059";
 }
 .cbi-value-description {
+  color: #8d8d8d;
+  opacity: 0.8;
   font-size: small;
-  opacity: 0.5;
   padding: 0.5rem;
 }
 .cbi-value-title {
@@ -2582,7 +2591,7 @@ td > .ifacebadge,
 .ifacebadge > img {
   display: inline-block;
   margin: 0 0.3rem;
-  align-self: flex-start;
+  align-self: center;
 }
 .ifacebadge span {
   line-height: 1.6em;
@@ -2712,16 +2721,6 @@ td > .ifacebadge,
 .cbi-section-remove {
   padding: 0.5rem;
 }
-div.cbi-value var,
-td.cbi-value-field var {
-  font-style: italic;
-  color: #0069D6;
-}
-small {
-  font-size: 90%;
-  white-space: normal;
-  line-height: 1.42857143;
-}
 .cbi-optionals {
   padding: 1rem 1rem 0 1rem;
   border-top: 1px solid #CCC;
@@ -2831,7 +2830,6 @@ input[name="nslookup"] {
   overflow-y: hidden;
 }
 .cbi-section em {
-  padding: 0.75rem 1.5rem;
   font-size: 0.7rem;
   font-weight: 600;
   color: var(--primary);
@@ -2912,14 +2910,28 @@ input[name="nslookup"] {
 .node-nas-usb_printer em {
   display: block;
 }
+/* PassWall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+  background: #fffffff0;
+}
+#cbi-passwall #add_link_div #nodes_link {
+  background: var(--lighter);
+}
+#cbi-passwall #add_link_div .cbi-value-title {
+  vertical-align: middle;
+}
+#cbi-passwall .cbi-section-table tbody ._now_use {
+  background: #5e72e473 !important;
+}
 @media screen and (max-width: 1600px) {
   .main .main-left {
     width: calc(0% + 13rem);
   }
   .main .main-right {
     width: calc(100% - 13rem);
   }
-  .cbi-button {
+  .cbi-button:not(.cbi-button-up, .cbi-button-down) {
     /*padding: 0.3rem 1.5rem;*/
     font-size: 0.8rem;
   }

htdocs/luci-static/argon/css/dark.css

@@ -68,27 +68,33 @@ header::after {
   color: #fff !important;
 }
 
-.main .main-left .nav .slide .slide-menu a::after,
-.main .main-left .nav .slide .slide-menu .active a::after {
-  background-color: var(--dark-primary) !important;
-}
-
 .main .main-left .nav .slide .slide-menu li a {
   color: #cccccc;
 }
 
+.main .main-left .nav .slide .slide-menu li a::after {
+  background-color: var(--dark-primary) !important;
+  box-shadow: 0 0 1px #000  !important;
+}
+
 .main .main-left .nav .slide .slide-menu li a:hover {
   background: none !important;
 }
 
+.main .main-left .nav .slide .menu:hover,
 .main .main-left .nav .slide .menu.active {
   background-color: #483d8b !important;
   background-color: var(--dark-primary) !important;
   color: #fff !important;
+  box-shadow: 0 0 1px #000 !important;
+}
+
+.main .main-left .nav .slide .menu[data-title=Status]:before {
+  color: var(--dark-primary) !important;
 }
 
-.main .main-left .nav .slide .menu.active a::after {
-  background-color: #cccccc !important;
+.main .main-left .nav .slide .menu[data-title=Control]:before {
+  color: var(--dark-primary) !important;
 }
 
 .main .main-left .nav li a {
@@ -124,7 +130,13 @@ h3 {
   background: #333333;
 }
 
-a:-webkit-any-link:not(.main-left a):not(li a):not(.brand):not(.login-container footer .ftc a) {
+a:link,
+a:visited,
+a:active {
+  color: var(--dark_webkit-any-link);
+}
+
+a:-webkit-any-link:not(li a, .main-left a, .brand, .pull-right a, .alert-message a, .login-container footer a) {
   color: var(--dark_webkit-any-link) !important;
   text-shadow: 1px 1px 2px #000 !important;
 }
@@ -133,6 +145,16 @@ input:-webkit-autofill {
   background-color: #3c3c3c !important;
 }
 
+input[type="checkbox"]:checked {
+  background-color: #483d8b !important;
+  background-color: var(--dark-primary) !important;
+}
+
+.cbi-input-radio:checked {
+  background-color: #483d8b !important;
+  background-color: var(--dark-primary) !important;
+}
+
 .cbi-value-field .cbi-input-apply,
 .cbi-button-apply,
 .cbi-button-edit {
@@ -200,6 +222,7 @@ table>thead>tr>td {
 #conns>div>div>div>small,
 #memtotal>div>div>div>small {
   color: #ccc !important;
+  text-shadow: 1px 1px 2px #000 !important;
 }
 
 .node-system-packages>.main .cbi-section-node:first-child .cbi-value-last {
@@ -322,16 +345,6 @@ th h6, td h6 {
   background-color: #00ff0a45 !important;
 }
 
-/* OCD: Compatible the background color of the "Add the node via the link" & "USE(node)" pop-up window in PassWall (dark mode only) */
-#add_link_div,
-#set_node_div {
-  background-color: #333333f0 !important;
-  box-shadow: #00000094 10px 10px 30px 5px !important;
-}
-#add_link_div>.cbi-value>.cbi-value-field>#nodes_link {
-  background: #ccc;
-}
-
 #content_syslog {
   box-shadow: 0 0 .5rem 0 rgba(0,0,0,0.35);
 }
@@ -404,7 +417,8 @@ input {
   box-shadow: 0 3px 2px rgba(0,0,0,0.05);
 }
 
-select:not([multiple="multiple"]):focus,
+select:not([multiple="multiple"]):hover,
+input:hover,
 input:focus {
   border-color: #483d8b !important;
   border-color: var(--dark-primary) !important;
@@ -508,9 +522,11 @@ img[src="/luci-static/resources/icons/loading.gif"] {
 }
 
 div.cbi-value var,
-td.cbi-value-field var {
+td.cbi-value-field var,
+.td.cbi-value-field var {
   color: #483d8b;
-  color: var(--dark-primary);
+  color: var(--dark_webkit-any-link);
+  text-shadow: 1px 1px 2px #000;
 }
 
 #diag-rc-output>pre {
@@ -662,6 +678,16 @@ fieldset[id^="cbi-apply-"] {
   color: #ccc !important;
 }
 
+/* PassWall */
+#cbi-passwall #add_link_div,
+#cbi-passwall #set_node_div {
+  background: #333333f0 !important;
+  box-shadow: #00000094 10px 10px 30px 5px !important;
+}
+#cbi-passwall #add_link_div #nodes_link {
+  background: #3c3c3c  !important;
+}
+
 @supports (-webkit-backdrop-filter: none) or (backdrop-filter: none) {
   .login-page .login-container .login-form {
     -webkit-backdrop-filter: blur(var(--blur-radius-dark));