Merge pull request #1 from jerrykuku/master

merge

README.md

@@ -55,8 +55,8 @@ make -j1 V=s
 ## Install 
 ### For Lean openwrt
 ```
-wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.3/luci-theme-argon_1.4-01-20200101_all.ipk
+wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/1.5.1/luci-theme-argon_1.5.1-01-20200331_all.ipk
-opkg install luci-theme-argon_1.4-01-20200101_all.ipk
+opkg install luci-theme-argon_1.5.1-01-20200331_all.ipk
 ```
 
 ### For openwrt 19.07 stable LuCI branch (git-20.006.26738-35aa527)

README_ZH.md

@@ -51,8 +51,8 @@ make -j1 V=s
 ## 安装
 ### For Lean openwrt
 ```
-wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/v1.3/luci-theme-argon_1.4-01-20200101_all.ipk
+wget --no-check-certificate https://github.com/jerrykuku/luci-theme-argon/releases/download/1.5.1/luci-theme-argon_1.5.1-01-20200331_all.ipk
-opkg install luci-theme-argon_1.4-01-20200101_all.ipk
+opkg install luci-theme-argon_1.5.1-01-20200331_all.ipk
 ```
 
 ### For openwrt 19.07 stable LuCI branch (git-20.006.26738-35aa527)

htdocs/luci-static/argon/cascade.css

@@ -1,3 +1,4 @@
+@import url("custom.css?v=1");
 /**
  *  Argon is a clean HTML5 theme for LuCI. It is based on luci-theme-material and Argon Template
  *
@@ -23,10 +24,9 @@
 /*
  *	Include base and custom css
  */
-@import url("custom.css?v=1");
 /*
-  *	Icon Css and Fonts 
+   *	Icon Css and Fonts 
-  */
+   */
 @font-face {
   font-family: 'argon';
   src: url('fonts/argon.eot?vncylf');
@@ -123,6 +123,9 @@
 .icon-question:before {
   content: "\f059";
 }
+.icon-docker:before {
+  content: "\e911";
+}
 .sk-folding-cube {
   position: absolute;
   width: 40px;
@@ -481,7 +484,7 @@ small {
   top: 0;
   float: left;
   width: 15%;
-  width: calc(0% + 15rem);
+  width: calc(15%);
   height: 100%;
   background-color: #fff;
   background-color: var(--menu-bg-color);
@@ -507,7 +510,7 @@ small {
 .main-right {
   float: right;
   width: 85%;
-  width: calc(100% - 15rem);
+  width: calc(85%);
   height: 100%;
   background-color: #f8f9fe;
   transition: all 0.2s;
@@ -640,8 +643,8 @@ header .fill .status * {
   margin-top: 1rem;
 }
 /*
- *	Main Menu
+  *	Main Menu
- */
+  */
 .main .main-left {
   transition: all 0.2s;
 }
@@ -761,6 +764,10 @@ header .fill .status * {
   content: "\e90d";
   color: #2dce89;
 }
+.main .main-left .nav li.slide .menu[data-title=Docker]:before {
+  content: "\e911";
+  color: #6699ff;
+}
 .main .main-left .nav li.slide:hover {
   background: none;
 }
@@ -1035,7 +1042,7 @@ tr > th,
 }
 .cbi-section-table-row > .cbi-value-field [data-dynlist] > input,
 .cbi-section-table-row > .cbi-value-field input.cbi-input-password {
-  width: calc(100% - 1.5rem);
+  width: calc(98.5%);
 }
 .cbi-section-table-row .td {
   text-align: center !important;
@@ -2266,7 +2273,7 @@ input[name="nslookup"] {
 .node-main-login .main .main-right #maincontent .container .alert-message.warning {
   position: absolute;
   color: #fff;
-  width: calc(100% - 2rem);
+  width: calc(98%);
   box-sizing: border-box;
   margin-top: 8rem;
   border-radius: 5px !important;
@@ -2280,7 +2287,7 @@ input[name="nslookup"] {
 .node-main-login .main .main-right #maincontent .container .alert-message.error {
   position: absolute;
   color: #fff;
-  width: calc(100% - 2rem);
+  width: calc(98%);
   background-color: #f0ad4e;
   border-color: #eea236;
   box-sizing: border-box;
@@ -2349,7 +2356,7 @@ input[name="nslookup"] {
   line-height: 1.5;
   display: block;
   width: 100%;
-  height: calc(2.75rem + 2px);
+  height: calc(4.75rem);
   padding: 0.625rem 0.75rem;
   transition: all 0.15s cubic-bezier(0.68, -0.55, 0.265, 1.55);
   color: #8898aa;
@@ -2538,7 +2545,7 @@ input[name="nslookup"] {
 }
 /* wireless overview */
 #cbi-wireless > #wifi_assoclist_table > .tr {
-  box-shadow: inset 1px -1px 0 #ddd, inset -1px -1px 0 #ddd;
+  box-shadow: inset 1px -1px 0 #dddddd, inset -1px -1px 0 #dddddd;
 }
 #cbi-wireless > #wifi_assoclist_table > .tr.placeholder > .td {
   right: 33px;
@@ -2547,11 +2554,11 @@ input[name="nslookup"] {
   border-top: thin solid #ddd !important;
 }
 #cbi-wireless > #wifi_assoclist_table > .tr.table-titles {
-  box-shadow: inset 1px 0 0 #ddd, inset -1px 0 0 #ddd;
+  box-shadow: inset 1px 0 0 #dddddd, inset -1px 0 0 #dddddd;
 }
 #cbi-wireless > #wifi_assoclist_table > .tr.table-titles > .th {
   border-bottom: thin solid #ddd;
-  box-shadow: 0 -1px 0 0 #ddd;
+  box-shadow: 0 -1px 0 0 #dddddd;
 }
 #wifi_assoclist_table > .tr > .td[data-title="RX Rate / TX Rate"] {
   width: 23rem;
@@ -2715,10 +2722,10 @@ input[type="checkbox"]:checked {
     margin: 0 2.5rem 0 0.5rem;
   }
   .main-left {
-    width: calc(0% + 13rem);
+    width: calc(13%);
   }
   .main-right {
-    width: calc(100% - 13rem);
+    width: calc(87%);
   }
   .btn:not(button),
   .cbi-button {
@@ -2753,10 +2760,10 @@ input[type="checkbox"]:checked {
     cursor: default;
   }
   .main-left {
-    width: calc(0% + 13rem);
+    width: calc(13%);
   }
   .main-right {
-    width: calc(100% - 13rem);
+    width: calc(87%);
   }
   .tabs > li > a,
   .cbi-tabmenu > li > a {
@@ -2827,10 +2834,10 @@ input[type="checkbox"]:checked {
     top: 25%;
   }
   .main-left {
-    width: calc(0% + 13rem);
+    width: calc(13%);
   }
   .main-right {
-    width: calc(100% - 13rem);
+    width: calc(87%);
   }
   body:not(.logged-in) .showSide {
     visibility: hidden;
@@ -2902,7 +2909,7 @@ input[type="checkbox"]:checked {
   }
   .td [data-dynlist] > input,
   .td input.cbi-input-password {
-    width: calc(100% - 1.5rem);
+    width: calc(98.5%);
   }
   .td[data-type="button"],
   .td[data-type="fvalue"] {
@@ -3085,3 +3092,4 @@ input[type="checkbox"]:checked {
   }
 }
 /*# sourceMappingURL=./cascade.css.map */
+/*# sourceMappingURL=cascade.css.map */

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

@@ -30,4 +30,5 @@
 <glyph unicode="&#xe910;" glyph-name="password" d="M196.923 603.569v0zM827.077 507.077h-512v92.554c0 104.369 78.769 196.923 183.138 202.831 96.492 5.908 177.231-55.138 202.831-141.785 1.969-7.877 9.846-15.754 19.692-15.754h80.738c11.815 0 21.662 11.815 19.692 23.631-31.508 149.662-165.415 259.938-324.923 252.062-167.385-7.877-295.385-151.631-299.323-317.046v-96.492c-43.323 0-78.769-35.446-78.769-78.769v-374.154c0-43.323 35.446-78.769 78.769-78.769h630.154c43.323 0 78.769 35.446 78.769 78.769v374.154c0 43.323-35.446 78.769-78.769 78.769zM602.585 119.138c3.938-11.815-5.908-25.6-19.692-25.6h-143.754c-13.785 0-23.631 11.815-19.692 25.6l35.446 118.154c-29.538 19.692-47.262 55.138-39.385 94.523 7.877 37.415 37.415 66.954 76.8 74.831 63.015 11.815 118.154-33.477 118.154-92.554 0-31.508-15.754-61.046-41.354-76.8l33.477-118.154z" />
 <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" />
+<glyph unicode="&#xe911;" glyph-name="docker" d="M537 896 l87 2 l14 -14 l1 -89 l-14 -13 l-87 -2 l-14 13 l-1 90 l14 13 ZM270 756 l87 2 l14 -13 l1 -90 l-14 -13 l-87 -2 l-13 14 l-1 89 l13 13 ZM404 758 l88 1 l13 -14 l1 -88 l-13 -14 l-88 -1 l-13 13 l-1 90 l13 13 ZM538 760 l87 1 l14 -14 l0 -88 l-12 -14 l-87 -1 l-14 13 l-1 89 l13 14 ZM874 675 q44 -14 102 -108 q84 2 134 -53 l0 -6 q-68 -104 -159 -105 q-199 -323 -519 -327 l-74 -1 q-235 -3 -311 269 l-7 69 l-1 53 l13 15 l744 9 q34 0 40 21 l-1 75 q13 89 39 89 ZM138 618 l87 2 l14 -15 l0 -88 l-13 -13 l-87 -2 l-14 13 l-1 89 l14 14 ZM272 620 l86 1 l15 -14 l1 -88 l-14 -14 l-87 -1 l-13 13 l-1 89 l13 14 ZM405 622 l88 1 l13 -14 l1 -89 l-13 -13 l-87 -1 l-13 13 l-1 89 l12 14 ZM540 624 l87 1 l13 -14 l1 -89 l-13 -13 l-87 -1 l-14 13 l-1 88 l14 15 ZM674 625 l86 2 l15 -14 l1 -89 l-14 -14 l-87 -1 l-13 14 l-1 88 l13 14 Z" />
 </font></defs></svg>