From e545eb5c2225cc2a51e8e7e8c1c272ed61d9ab98 Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Wed, 19 Aug 2020 12:10:20 +0800
Subject: [PATCH] luci-theme-atmaterial: update source from yangsongli

---
 CONTRIBUTED.md                                |   2 +-
 .../luci-static/atmaterial/css/style.css      |  29 +++++++++++++++---
 .../atmaterial/fonts/advancedtomato.ttf       | Bin 8288 -> 8496 bytes
 .../atmaterial/fonts/advancedtomato.woff      | Bin 6272 -> 5668 bytes
 .../luasrc/view/themes/atmaterial/footer.htm  |   1 -
 .../luasrc/view/themes/atmaterial/header.htm  |   1 +
 6 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/CONTRIBUTED.md b/CONTRIBUTED.md
index c1fd654fcd..a3b4e3c407 100644
--- a/CONTRIBUTED.md
+++ b/CONTRIBUTED.md
@@ -34,7 +34,7 @@ NanoPi R1s(h5) support: [jerrykuku/openwrt-nanopi-r1s-h5](https://github.com/jer
 NanoPi support: [speedyworldclub/nlede](https://github.com/speedyworldclub/nlede).<br/>
 luci-theme-opentomato source: [Leo-Jo-My/luci-theme-opentomato](https://github.com/Leo-Jo-My/luci-theme-opentomato).<br/>
 luci-theme-opentomcat source: [Leo-Jo-My/luci-theme-opentomcat](https://github.com/Leo-Jo-My/luci-theme-opentomcat).<br/>
-qntfs-driver source: [lbbboy/qntfs-driver](https://github.com/lbbboy/qntfs-driver).<br/>
+luci-theme-atmaterial source: [yangsongli/luci-theme-atmaterial](https://github.com/yangsongli/luci-theme-atmaterial).<br/>
 luci-theme-Butterfly source: [Leo-Jo-My/luci-theme-Butterfly](https://github.com/Leo-Jo-My/luci-theme-Butterfly).<br/>
 lua-maxminddb source: [jerrykuku/lua-maxminddb](https://github.com/jerrykuku/lua-maxminddb).<br/>
 package openwrt-mwol: [Mleaf/openwrt-mwol](https://github.com/Mleaf/openwrt-mwol).<br/>
diff --git a/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/css/style.css b/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/css/style.css
index d7b1b55387..ce2091581c 100644
--- a/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/css/style.css
+++ b/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/css/style.css
@@ -1,4 +1,4 @@
-/**
+/**
  *  Material is a clean HTML5 theme for LuCI. It is based on luci-theme-bootstrap and MUI
  *
  *  luci-theme-material
@@ -169,7 +169,7 @@ input,
 
 select:not([multiple="multiple"]):focus,
 input:focus {
-    border-color: #94a494;
+    border-color: #0099CC;
 }
 
 select[multiple="multiple"] {
@@ -177,7 +177,7 @@ select[multiple="multiple"] {
 }
 
 code {
-    color: #94a494;
+    color: #0099CC;
 }
 
 abbr {
@@ -320,7 +320,7 @@ header > .container > .brand {
     line-height:60px;
     color: white;
     cursor: default;
-    background: #94a494;
+    background: #0099CC;
     display:block;
     width:17rem;
     padding-right: 10px;
@@ -476,38 +476,57 @@ header > .container > a[class="brand"]:after {
 
 .main > .main-left > .nav > .slide > a[data-title="Status"]:before {
     content: "\e026";
+   color: #5e72e4!important;
+  
 }
 
 .main > .main-left > .nav > .slide > a[data-title="System"]:before {
     content: "\e00a";
+color: #fb6340!important;
 }
 
 .main > .main-left > .nav > .slide > a[data-title="Network"]:before {
     content: "\e00e";
+color: #8965e0!important;
 }
 .main > .main-left > .nav > .slide > a[data-title="VPN"]:before {
     content: "\e029";
+ color: #5F9EA0!important;
 }
 
 .main > .main-left > .nav > .slide > a[data-title="Services"]:before {
     content: "\e01b";
+ color: #11cdef!important;
+}
+.main > .main-left > .nav > .slide > a[data-title="Docker"]:before {
+    content: "\e02c";
+ color: #00b2ee!important;
 }
 
 .main > .main-left > .nav > .slide > a[data-title="NAS"]:before {
     content: "\e00b";
+   color: #f3a4b5!important;
 }
 
 .main > .main-left > .nav > .slide > a[data-title="Control"]:before {
-    content: "\e023";
+    content: "\e021";
+  color: #FFD700!important;
 }
+.main > .main-left > .nav > .slide > a[data-title="Statistics"]:before {
+    content: "\e023";
+  color: #1E90FF!important;
+}
+
 
 .main > .main-left > .nav > .slide > a[data-title="Bandwidth Monitor"]:before {
     content: "\e00f";
+color: #2dce89!important;
 }
 
 .main > .main-left > .nav > li > a[data-title="Logout"] {
     padding-left:36px;
     line-height:40px;
+ color: #9400D3!important;
 }
 .main > .main-left > .nav > li > a[data-title="Logout"]:before {
     content: "\e005";
diff --git a/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/fonts/advancedtomato.ttf b/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/fonts/advancedtomato.ttf
index 0f59478d517233be2269d3e7f719649444b101d6..5850541c4722ada27c3bd41a2d9b5a6c31689d6b 100644
GIT binary patch
delta 1113
zcmZWoU1$?o6h3!;ZYG&Y8k)9AbSAml*4VXX(!{2#Vk%V>q|l{8U3YzOXkt@rnwVBm
z5TXl<zO8aa6nzjuQ1C%0_#!Hbg7~nzZ!7zB1qD%rbwOcuP4-MWKFD6~Irlr?Ip5sh
z5nFGKHGlv>08W4mY+|>aowz%G2$`E``=={T?dp?LQvk#OkUD4PjvYw+S-J-xGk|!e
zTyl!??4EZ3=66`1FC(FBA@4Chjd5SOvUpVcO>r=GzgL{APCJd$KV!}cW4yoO9JOmW
zHAkX`1e<p%rE4SO6^zf|q>pRWg~bogUNiub-(&m?6#fG#U?>KOXbDJ5sKVy%;Y(v}
zAftE9T+ZS8<u)=wfxnRd78s%!B0mJd5>)tvE({S89U>ySL{!AY3So+bSS41AUePD|
z#Tt<kYsEUz7;Lpr2%xp4fKm;mL6nA3+Ktk<SShUkNe4t*+4`sTzV(91te;6N!3Z-M
zFfG|)YO;ww%%tS!<fr7n=rL~lx69jbCk5bdq>M@^qNO{MM3yXNRwMoVl<|=73hrCF
z5zLTA00o;#lU%}m`#^^d$U+`AK>@~K2S8*b)$7X*_eODat%pW^t7uO&L896GNP&1g
zpLIc+_|hb$y5(&f!ExDM=1BH<E;pK!hPEKQNR6K6MH-Ho)2Y7r;BbH540KXSQD}$O
z758<nh{>^V^D+vuxzQnMcr;5kpykLxDP6X0lE%Jft*H%e=#57x(SywLn>r0C3Zc<1
zLnaYZ`_cZ=mi`Ex59;pKqYd1#wx4}9VaVQ#037*UV)NHzJ-;u1v+<FtsiwM5{goQ@
zC;E_n^o{#IXhrR&zve&ZzwK`ZGJz|BzxA|U)Gz3djIG9n_L<wfKvv?5GvK^;2LwXP
zbE22<a6=w1!vJ)9SV6YnVHJ;m+`|<4J?>Lf{K%M4^00*bNe{~~3BPz)!J6kFuWJib
z=z-5(f`UmRPVtB{KV2#=Rx8e8b+R;bc+RQwOV&W@>&#TCzA#&zXG7`C*9ksjS;0wM
z#S9#VIdGuPcUrr7*)qGQkgdZ4%t96B@n;!=G-TX*#oac4Dp|4(Hb0OUlYsE+iQlE{
NHeOHe<PVa2{{!#K_C){y

delta 952
zcmZWoUr19?9RAL|+uT1_=`yu>H*=O|ZcZYCGR$(lB#Mefns9Mz3Y%NoEc2m7SPu!2
z+z<+b9wK@QVMH$_Vc@Iwk}n1edgv_!5sbjTJ8w^(anAX^-@l#joZnsOD75Dw0F>e$
zWb}l?{arWbzx@Jy7isley4V@UAS~p5a$k2}ur>JnataVv$p=OfYHBI9oChQ~ZLec$
zCbhG}O7MB;x5nakZmd;5s02*pl|7?TH6o8)`Ay$C=c&=r=$LA16I)DX0r*D~*-3lQ
zOehw(MB>R2^{#UJFCc#)A5N%~DdeEhf12Dkt|p?}*QQ_btZ~}bQprsAM`G&*piqGL
z3SAuM_3aCT+K{Ka&Q!Dn@C5tl;kk=`J*u5kA7b|HIa2|Jrr8a5sqWT?zDwGBPf+{m
zY06Qbt`VMMG2kVcUcv(trny`BD`pmyLKE+Ug9U4M5s4maK?hfv8D`=VX4udKI~;KG
zH5%dK0gq!p4xkL>I1D!qqJsZ$2$l7yLN!jH8AqU?242*n4)yTkD2}0l_4!~T@0BE>
zZ3wGYRpSpWo9$-BJZzq~lv#Q$k1XpY4@)+!XKk?gZDHGE+b4UA{l0zCzUgRi^gC9a
z4S7Y5TZPbO97_UPmve}M@^73Wk^ks=TABloIcLZhJgj11iBj4OEK|la1DhE0-N0rz
zgw?<nxJ0XdeI^?%Y!U-YjBhruj9zpa*u<F6kSmG_X5Pq#;jq9X+}ey%(*QMcOC2AH
zMzYC-noWY)QN%ETI8>xbqp^v&nuhjH>7%qWN+VY$p4^i-z{E5%7()`{@F9c%TG;l{
zbY?6$?h6H4iizcW64@&O$twcdl($1$^sZ`izVq6OPYqKapN5Sf74^Hw_;GOPT&7~d
XhS+Vl-8R9>@bVu$;EUHW^?&~d-OQ*6

diff --git a/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/fonts/advancedtomato.woff b/package/ctcgfw/luci-theme-atmaterial/htdocs/luci-static/atmaterial/fonts/advancedtomato.woff
index 42512481990775135c4da591e761b1b51c408234..3215273d3dfeba72c26c503389c206e3669ce35c 100644
GIT binary patch
delta 5440
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
V!ar>1&FPYnARV9@52^ux{{mEx?{xqG

delta 6049
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

diff --git a/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/footer.htm b/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/footer.htm
index d69417e88d..0fb8489ff2 100644
--- a/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/footer.htm
+++ b/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/footer.htm
@@ -45,7 +45,6 @@
         // thanks for Jo-Philipp Wich <jow@openwrt.org>
         var luciLocation = <%= luci.http.write_json(luci.dispatcher.context.path) %>;
     </script>
-    <script src="<%=media%>/js/jquery.min.js"></script>
     <script src="<%=media%>/js/script.js"></script>
 </body>
 </html>
diff --git a/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/header.htm b/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/header.htm
index 1f2b0b88bc..7ec2f082fe 100644
--- a/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/header.htm
+++ b/package/ctcgfw/luci-theme-atmaterial/luasrc/view/themes/atmaterial/header.htm
@@ -215,6 +215,7 @@
 		<style title="text/css"><%= css %></style>
 	<% end -%>
 	<script src="<%=resource%>/xhr.js"></script>
+		<script src="<%=media%>/js/jquery.min.js"></script>
 </head>
 <body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
 <header>