Compare commits

..

No commits in common. "master" and "alpha.3.9.1-beta9" have entirely different histories.

11 changed files with 3639 additions and 4187 deletions

View File

@ -10,7 +10,7 @@ THEME_NAME:=alpha
THEME_TITLE:=Alpha
PKG_NAME:=luci-theme-$(THEME_NAME)
PKG_VERSION:=3.9.4-beta
PKG_VERSION:=3.9.1-beta
PKG_RELEASE:=9
include $(INCLUDE_DIR)/package.mk
@ -40,8 +40,6 @@ 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

View File

Before

Width:  |  Height:  |  Size: 666 KiB

After

Width:  |  Height:  |  Size: 666 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

View File

@ -1,12 +0,0 @@
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<!-- Uploaded to: SVG Repo, www.svgrepo.com, Transformed by: SVG Repo Mixer Tools -->
<svg fill="#fff" width="800px" height="800px" viewBox="0 0 1024 1024" t="1569683928793" class="icon" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="15091" xmlns:xlink="http://www.w3.org/1999/xlink" transform="matrix(-1, 0, 0, 1, 0, 0)" stroke="#fff">
<g id="SVGRepo_bgCarrier" stroke-width="0"/>
<g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"/>
<g id="SVGRepo_iconCarrier">
<defs>
<style type="text/css"/>
</defs>
<path d="M464 144H160c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16z m-52 268H212V212h200v200zM864 144H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V160c0-8.8-7.2-16-16-16z m-52 268H612V212h200v200zM864 544H560c-8.8 0-16 7.2-16 16v304c0 8.8 7.2 16 16 16h304c8.8 0 16-7.2 16-16V560c0-8.8-7.2-16-16-16z m-52 268H612V612h200v200zM424 712H296V584c0-4.4-3.6-8-8-8h-48c-4.4 0-8 3.6-8 8v128H104c-4.4 0-8 3.6-8 8v48c0 4.4 3.6 8 8 8h128v128c0 4.4 3.6 8 8 8h48c4.4 0 8-3.6 8-8V776h128c4.4 0 8-3.6 8-8v-48c0-4.4-3.6-8-8-8z" p-id="15092"/>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.2 KiB

View File

Before

Width:  |  Height:  |  Size: 666 KiB

After

Width:  |  Height:  |  Size: 666 KiB

View File

@ -1,3 +1,4 @@
/*--------------------
catatan usahakan untuk mengganti bg pakai format png, kalo jpg ganti aja di bagian body, sesuaikan aja nama formatnya
---------------------*/
@ -16,11 +17,12 @@ html {
}
body {
height: 100%;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
background-attachment: fixed;
background: url('backgroundfanspage.png');
height: 100%;
background-position: center;
background-repeat: no-repeat;
background-size: cover;
background-attachment: fixed;
}
@ -28,8 +30,7 @@ body {
Text
---------------------*/
h2,
h3 {
h2, h3 {
font-size: 16px;
letter-spacing: -1px;
line-height: 20px;
@ -138,9 +139,9 @@ Login Box
-webkit-backface-visibility: hidden;
backface-visibility: hidden;
-webkit-box-shadow: 15px -15px 30px rgba(0, 0, 0, 0.32);
-moz-box-shadow: 15px -15px 30px rgba(0, 0, 0, 0.32);
box-shadow: 15px -15px 30px rgba(0, 0, 0, 0.32);
-webkit-box-shadow: 15px -15px 30px rgba(0,0,0,0.32);
-moz-box-shadow: 15px -15px 30px rgba(0,0,0,0.32);
box-shadow: 15px -15px 30px rgba(0,0,0,0.32);
}
.box-login-title {
@ -161,29 +162,29 @@ Login Box
z-index: 2;
-webkit-backdrop-filter: blur(10px);
backdrop-filter: blur(10px);
-webkit-border-radius: 20px: -moz-border-radius=20px;
-webkit-border-radius: 20px:
-moz-border-radius= 20px;
border-radius: 20px;
-moz-box-shadow: 15px 30px 30px rgba(0, 0, 0, 0.32);
box-shadow: 15px 30px 30px rgba(0, 0, 0, 0.32);
-moz-box-shadow: 15px 30px 30px rgba(0,0,0,0.32);
box-shadow: 15px 30px 30px rgba(0,0,0,0.32);
}
.box-info {
width: 260px;
top: 60px;
position: absolute;
right: -5px;
padding: 15px 15px 15px 30px;
background-color: rgba(255, 255, 255, 0.6);
border: 1px solid rgba(255, 255, 255, 0.2);
background-color: rgba(255,255,255,0.6);
border: 1px solid rgba(255,255,255,0.2);
z-index: 0;
-webkit-border-radius: 6px;
-moz-border-radius: 6px;
border-radius: 6px;
-webkit-box-shadow: 15px 30px 30px rgba(0, 0, 0, 0.32);
-moz-box-shadow: 15px 30px 30px rgba(0, 0, 0, 0.32);
box-shadow: 15px 30px 30px rgba(0, 0, 0, 0.32);
-webkit-box-shadow: 15px 30px 30px rgba(0,0,0,0.32);
-moz-box-shadow: 15px 30px 30px rgba(0,0,0,0.32);
box-shadow: 15px 30px 30px rgba(0,0,0,0.32);
}
.line-wh {
@ -192,20 +193,16 @@ Login Box
top: 0px;
margin: 12px auto;
position: relative;
border-top: 1px solid rgba(255, 255, 255, 0.3);
border-top: 1px solid rgba(255,255,255,0.3);
}
/*--------------------
Form
---------------------*/
a {
text-decoration: none;
}
a { text-decoration: none; }
button:focus {
outline: 0;
}
button:focus { outline:0; }
.b {
height: 24px;
@ -231,8 +228,7 @@ button:focus {
opacity: 1;
}
.b-support,
.b-cta {
.b-support, .b-cta {
width: 100%;
padding: 0px 15px;
font-family: 'Quicksand', sans-serif;
@ -260,8 +256,7 @@ button:focus {
color: #fff;
}
.b-support:hover,
.b-cta:hover {
.b-support:hover, .b-cta:hover {
color: #fff;
background-color: #87314e;
border: #87314e 1px solid;
@ -275,7 +270,7 @@ button:focus {
width: 100%;
display: inline-table;
padding: 5px 20px;
margin-bottom: 2px;
margin-bottom:2px;
}
label {
@ -300,7 +295,7 @@ input[type=password] {
width: auto;
height: 32px;
padding: 0px 10px;
background-color: rgb(0 0 0 / 28%);
background-color:rgb(0 0 0 / 28%);
border: none;
display: inline;
color: #bdbdbd;
@ -362,13 +357,8 @@ p.field span.i {
Transitions
---------------------*/
.box-form,
.box-info,
.b,
.b-support,
.b-cta,
input[type=submit],
p.field span.i {
.box-form, .box-info, .b, .b-support, .b-cta,
input[type=submit], p.field span.i {
-webkit-transition: all 0.3s;
-moz-transition: all 0.3s;
@ -385,9 +375,9 @@ Credits
width: 100%;
position: absolute;
bottom: 4px;
font-family: 'Open Sans', 'Helvetica Neue', Helvetica, sans-serif;
font-family:'Open Sans', 'Helvetica Neue', Helvetica, sans-serif;
font-size: 12px;
color: rgba(255, 255, 255, 0.1);
color: rgba(255,255,255,0.1);
text-align: center;
z-index: -1;
}
@ -412,5 +402,5 @@ img.bawah {
.icon-credits a {
text-decoration: none;
color: rgba(255, 255, 255, 0.2);
color: rgba(255,255,255,0.2);
}

View File

@ -1,10 +0,0 @@
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'

View File

@ -17,92 +17,49 @@
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 function getLink(nav)
local link = config[nav]
return (link and link ~= "none") and link or nil
end
<% local ver = require "luci.version" %>
</div>
local num_links = 0
for i = 1, 6 do
local nav_key = 'nav_0' .. i
local link = getLink(nav_key)
if link then
num_links = num_links + 1
end
end
local link_width = string.format("calc(100%% / %d)", num_links)
local blur_value = tonumber(config.blur)
local link_blur = string.format("blur(%dpx)", blur_value)
local background_color = config.color
%>
<style>
.main>.main-left, .cbi-section, .cbi-section-error, #iptables, .Firewall form, #cbi-network>.cbi-section-node, #cbi-wireless>.cbi-section-node, #cbi-wireless>#wifi_assoclist_table, [data-tab-title], [data-page^="admin-system-admin"]:not(.node-main-login) .cbi-map:not(#cbi-dropbear), [data-page="admin-system-opkg"] #maincontent>.container, .tabs, .cbi-tabmenu, .cbi-tooltip {
background-color: <%=background_color%>;
backdrop-filter: <%=link_blur%>;
-webkit-backdrop-filter: <%=link_blur%>;
}
@media screen and (max-width: 720px) {
.navbar a {
width: <%=link_width%>;
}
}
</style>
</div>
<footer class="mobile">
<a href="https://github.com/derisamedia/luci-theme-alpha"><%=ver.luciname%> | <%=ver.luciversion%> | Alpha OS Theme v3.9</a>
</footer>
</div>
<div class="navbar active">
<footer class="mobile">
<a href="https://github.com/derisamedia/luci-theme-alpha"><%= ver.luciname %> | <%= ver.luciversion %> | Alpha OS Theme v3.9</a>
</footer>
</div>
<div class="navbar active">
<div class="dropdown">
<% for i = 1, 6 do
local nav_key = 'nav_0' .. i
local link = getLink(nav_key)
if link then %>
<a href="<%=link%>">
<img src="<%=media%><%=icon[link]%>" />
</a>
<% end
end %>
<a href="/cgi-bin/luci/admin/status/overview"><img src="<%=media%>/gaya/icon/navbar/status.png" /></a>
<a href="/cgi-bin/luci/admin/services/ttyd"><img src="<%=media%>/gaya/icon/navbar/terminal.png" /></a>
<a href="/cgi-bin/luci/admin/services/openclash"><img src="<%=media%>/gaya/icon/navbar/oc.png" /></a>
<a href="/cgi-bin/luci/admin/nas/tinyfm"><img src="<%=media%>/gaya/icon/navbar/nas.png" /></a>
<a href="/cgi-bin/luci/admin/modem/main"><img src="<%=media%>/gaya/icon/navbar/modem.png" /></a>
<a href="/cgi-bin/luci/admin/network/network"><img src="<%=media%>/gaya/icon/navbar/interface.png" /></a>
</div>
<label class="toggler">
<img src="<%=media%>/gaya/icon/arrow.svg">
<img src="<%=media%>/gaya/icon/arrow.svg" alt="">
</label>
</div>
<script>
{
{
const nav = document.querySelector(".navbar");
let lastScrollY = window.scrollY;
window.addEventListener("scroll", () => {
if (lastScrollY < window.scrollY) {
nav.classList.add("navbar--hidden");
}
else {
} else {
nav.classList.remove("navbar--hidden");
}
lastScrollY = window.scrollY;
});
}
</script>
</script>
</div>
<script type="text/javascript">L.require('menu-alpha')</script>
<script src="<%=media%>/app.js"></script>
</body>
</html>

View File

@ -57,10 +57,12 @@
</style>
<% end -%>
</head>
<body class="lang_<%=luci.i18n.context.lang%> <% if luci.dispatcher.context.authsession then %>logged-in<% end %> <% if not (path == "") then %>node-<%= path %><% else %>node-main-login<% end %>" data-page="<%= pcdata(path) %>" style="background-image:url('/luci-static/alpha/background/dashboard.png')">
<body class="lang_<%=luci.i18n.context.lang%> <% if luci.dispatcher.context.authsession then %>logged-in<% end %> <% if not (path == "") then %>node-<%= path %><% else %>node-main-login<% end %>" data-page="<%= pcdata(path) %>">
<header>
<div class="fill">
<div class="container">
<a id="logo" href="<% if luci.dispatcher.context.authsession then %><%=url('admin/status/overview')%><% else %>#<% end %>">
<img src="<%=media%>/brand.png" alt="OpenWrt">
</a>
@ -93,4 +95,5 @@
<p><%:You must enable JavaScript in your browser or LuCI will not work properly.%></p>
</div>
</noscript>
<div id="tabmenu" style="display:none"></div>

View File

@ -20,8 +20,10 @@
<title>Alpha - Login Dulu</title>
</head>
<body class="lang_en node-main-login" data-page="" style="background-image:url('/luci-static/alpha/background/dashboard.png')">
<body class="lang_en node-main-login" data-page="">
<header>
<div class="fill">
<div class="container">
<span class="showSide"></span>