diff --git a/Makefile b/Makefile index 921e68a..4417497 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ THEME_NAME:=alpha THEME_TITLE:=Alpha PKG_NAME:=luci-theme-$(THEME_NAME) -PKG_VERSION:=3.9.2-beta +PKG_VERSION:=3.9.4-beta PKG_RELEASE:=9 include $(INCLUDE_DIR)/package.mk @@ -40,6 +40,8 @@ define Package/luci-theme-$(THEME_NAME)/install $(CP) -a ./template/* $(1)/usr/lib/lua/luci/view/themes/$(THEME_NAME)/ 2>/dev/null || true $(INSTALL_DIR) $(1)/www/luci-static/resources $(CP) -a ./js/* $(1)/www/luci-static/resources/ 2>/dev/null || true + $(INSTALL_DIR) $(1)/etc/config + $(CP) -a ./root/etc/config/* $(1)/etc/config/ 2>/dev/null || true endef define Package/luci-theme-$(THEME_NAME)/postinst diff --git a/luasrc/gaya/gaya.css b/luasrc/gaya/gaya.css index 35aa735..ab19254 100755 --- a/luasrc/gaya/gaya.css +++ b/luasrc/gaya/gaya.css @@ -688,9 +688,7 @@ float: left; text-align: center; padding: 8px 0; - width: calc(100% / 6); text-decoration: none; - max-width: 100px; } .navbar a img { @@ -827,7 +825,7 @@ user-select: none; } - .main>.main-left>.nav>li:last-child { + .main>.main-left>.nav>li>[data-title="Logout"] { display: flex; padding: 0.5rem 1rem; } @@ -837,7 +835,8 @@ color: #cbcbcb; } - .main>.main-left>.nav>li>[data-title="Logout"] { + .main>.main-left>.nav>li>[data-title="Logout"], + .main>.main-left>.nav>li>[data-title="iStore"] { font-size: 1rem; color: #fff; } @@ -852,6 +851,7 @@ .main>.main-left>.nav>.slide>.menu, .main>.main-left>.nav>li>[data-title="Logout"], + .main>.main-left>.nav>li>[data-title="iStore"], .main>.main-left>.nav>li>[data-title="Dashboard"] { font-size: 1rem; font-weight: 500; @@ -957,6 +957,16 @@ background-size: 25px; } + .main>.main-left>.nav>li>[data-title="iStore"]:before { + position: absolute; + right: 14px; + width: 25px; + height: 25px; + content: ""; + background: url(./icon/sidebar-icon/istore.svg) no-repeat; + background-size: 25px; + } + /* End Sidebar */ .modemenu-buttons { @@ -1032,7 +1042,7 @@ transition: transform 0.2s ease-in-out; } - .main>.main-left>.nav>li:last-child::before { + .main>.main-left>.nav>li>[data-title="Logout"]::before { position: absolute; right: 14px; width: 25px; @@ -1062,7 +1072,8 @@ .main>.main-left>.nav>.slide>.menu, .main>.main-left>.nav>.slide>.slide-menu>li, - .main>.main-left>.nav>li:last-child { + .main>.main-left>.nav>li>[data-title="Logout"], + .main>.main-left>.nav>li>[data-title="iStore"] { position: relative; overflow: hidden; transform: translate3d(0, 0, 0); @@ -1070,7 +1081,8 @@ .main>.main-left>.nav>.slide>.menu::after, .main>.main-left>.nav>.slide>.slide-menu>li::after, - .main>.main-left>.nav>li:last-child::after { + .main>.main-left>.nav>li>[data-title="Logout"]::after, + .main>.main-left>.nav>li>[data-title="iStore"]::after { position: absolute; top: 0; left: 0; @@ -1089,7 +1101,8 @@ .main>.main-left>.nav>.slide>.menu:active::after, .main>.main-left>.nav>.slide>.slide-menu>li:active::after, - .main>.main-left>.nav>li:last-child:active::after { + .main>.main-left>.nav>li>[data-title="Logout"]:active::after, + .main>.main-left>.nav>li>[data-title="iStore"]:active::after { transition: 0s; transform: scale(0, 0); opacity: 0.2; @@ -3117,7 +3130,8 @@ .main>.main-left>.nav>li, .main>.main-left>.nav>li a, .main>.main-left>.nav>.slide>.menu, - .main>.main-left>.nav>li>[data-title="Logout"] { + .main>.main-left>.nav>li>[data-title="Logout"], + .main>.main-left>.nav>li>[data-title="iStore"] { font-size: 1rem; color: #fff; } @@ -3389,7 +3403,8 @@ } .main>.main-left>.nav>.slide>.menu, - .main>.main-left>.nav>li>[data-title="Logout"] { + .main>.main-left>.nav>li>[data-title="Logout"], + .main>.main-left>.nav>li>[data-title="iStore"] { font-size: 1.1rem; } @@ -3590,4 +3605,4 @@ ::-webkit-scrollbar-thumb:active { background: #424242; } - } \ No newline at end of file + } diff --git a/luasrc/gaya/icon/navbar/neko.png b/luasrc/gaya/icon/navbar/neko.png new file mode 100644 index 0000000..1fbab6b Binary files /dev/null and b/luasrc/gaya/icon/navbar/neko.png differ diff --git a/luasrc/gaya/icon/sidebar-icon/istore.svg b/luasrc/gaya/icon/sidebar-icon/istore.svg new file mode 100644 index 0000000..289c420 --- /dev/null +++ b/luasrc/gaya/icon/sidebar-icon/istore.svg @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/root/etc/config/alpha b/root/etc/config/alpha new file mode 100644 index 0000000..8fb5864 --- /dev/null +++ b/root/etc/config/alpha @@ -0,0 +1,10 @@ + +config alpha 'config' + option nav_01 '/cgi-bin/luci/admin/status/overview' + option nav_02 '/cgi-bin/luci/admin/services/ttyd' + option nav_03 '/cgi-bin/luci/admin/services/openclash' + option nav_04 '/cgi-bin/luci/admin/nas/tinyfm' + option nav_05 '/cgi-bin/luci/admin/modem/main' + option nav_06 '/cgi-bin/luci/admin/network/network' + option blur '20' + option color '#2222359a' diff --git a/template/footer.htm b/template/footer.htm index 55e3ec2..0166861 100644 --- a/template/footer.htm +++ b/template/footer.htm @@ -17,49 +17,92 @@ Licensed to the public under the Apache License 2.0 -%> +<% +local ver = require "luci.version" +local uci = require "luci.model.uci".cursor() +local config = uci:get_all("alpha", "config") +local icon = { + ['/cgi-bin/luci/admin/status/overview'] = '/gaya/icon/navbar/status.png', + ['/cgi-bin/luci/admin/services/ttyd'] = '/gaya/icon/navbar/terminal.png', + ['/cgi-bin/luci/admin/services/openclash'] = '/gaya/icon/navbar/oc.png', + ['/cgi-bin/luci/admin/nas/tinyfm'] = '/gaya/icon/navbar/nas.png', + ['/cgi-bin/luci/admin/modem/main'] = '/gaya/icon/navbar/modem.png', + ['/cgi-bin/luci/admin/network/network'] = '/gaya/icon/navbar/interface.png', + ['/cgi-bin/luci/admin/services/neko'] = '/gaya/icon/navbar/neko.png' +} -<% local ver = require "luci.version" %> - - - - -
+ + + + - -