luci-theme-Butterfly: sync with upstream source

This commit is contained in:
CN_SZTL 2020-03-09 17:34:59 +08:00
parent f0b6095d3b
commit 13f20d8863
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
4 changed files with 28 additions and 38 deletions

View File

@ -8,6 +8,8 @@ include $(TOPDIR)/rules.mk
LUCI_TITLE:=Butterfly Theme
LUCI_DEPENDS:=
PKG_VERSION:=2.0
PKG_RELEASE:=03-20200302
include $(TOPDIR)/feeds/luci/luci.mk

View File

@ -535,7 +535,7 @@ fieldset > table > tbody > tr:nth-of-type(odd) {
#memcache > div > div,
#memtotal > div > div {
height: 1.4rem !important;
background-color: #e4eaec !important;
background-color: #e6e6e6 !important;
}
/* fix multiple table */
@ -559,28 +559,22 @@ td > table > tbody > tr > td {
/* button style */
.cbi-button {
-webkit-appearance: none;
text-transform: uppercase;
color: #fff;
background-color: #337ab7;
transition: all 0.2s ease-in-out;
display: inline-block;
padding: 0.2rem 1rem;
border: none;
border-radius: 0.3rem;
cursor: pointer;
-ms-touch-action: manipulation;
touch-action: manipulation;
background-image: none;
text-align: center;
white-space: nowrap;
-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
font-size: 14px;
width: auto !important;
min-width: 80px;
cursor: pointer;
display: inline-block;
background-color: #e6e6e6;
background-repeat: no-repeat;
padding: 5px 14px 6px;
color: #333;
font-size: 14px;
line-height: normal;
border: 1px solid #ccc;
border-bottom-color: #bbb;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.2), 0 1px 2px rgba(0, 0, 0, 0.05);
}
.cbi-button:hover,

View File

@ -1,7 +1,7 @@
<%#
luci-theme-Butterfly
Copyright 2017 Tracemouse <tracemouse@wcan.in>
Copyright 2020 Tracemouse <tracemouse@wcan.in>
Smart Menu:
https://www.smartmenus.org/
@ -35,7 +35,7 @@
</div>
<footer class="mobile-hide" style="text-align:center">
<a href="https://github.com/openwrt/luci">Powered by LeoJo <%= ver.luciname %> (<%= ver.luciversion %>)</a> /
<a href="http://butong.me/"><%= ver.distversion %></a> /
<a href="https://github.com/openwrt/openwrt/"><%= ver.distversion %></a> /
<% if #categories > 1 then %>
<ul class="breadcrumb pull-right" id="modemenu">
<% for i, r in ipairs(categories) do %>
@ -96,21 +96,18 @@ $(document).ready(function(){
$(".node-main-login > .main form > div > h2").html(str);
//add icons for navbar
status = ".main-nav > #main-menu > .slide > a[data-title='新春版客户端'] > i";
$(status).attr("class","fa fa-windows");
status = ".main-nav > #main-menu > .slide > a[data-title='Status'] > i";
$(status).attr("class","fa fa-university");
$(status).attr("class","fa fa-bank");
status = ".main-nav > #main-menu > .slide > a[data-title='System'] > i";
$(status).attr("class","fa fa-cogs");
$(status).attr("class","fa fa-windows");
status = ".main-nav > #main-menu > .slide > a[data-title='Docker'] > i";
$(status).attr("class","fa fa-cubes");
status = ".main-nav > #main-menu > .slide > a[data-title='Control'] > i";
$(status).attr("class","fa fa-life-ring");
$(status).attr("class","fa fa-user-md");
status = ".main-nav > #main-menu > .slide > a[data-title='NAS'] > i";
$(status).attr("class","fa fa-recycle");
@ -119,16 +116,16 @@ $(document).ready(function(){
$(status).attr("class","fa fa-paper-plane-o");
status = ".main-nav > #main-menu > .slide > a[data-title='Services'] > i";
$(status).attr("class","fa fa-sitemap");
$(status).attr("class","fa fa-outdent");
status = ".main-nav > #main-menu > .slide > a[data-title='Network'] > i";
$(status).attr("class","fa fa-globe");
status = ".main-nav > #main-menu > .slide > a[data-title='Bandwidth Monitor'] > i";
$(status).attr("class","fa fa-gg-circle");
$(status).attr("class","fa fa-rocket");
status = ".main-nav > #main-menu > .slide > a[data-title='QOS'] > i";
$(status).attr("class","fa fa-drupal");
$(status).attr("class","fa fa-support");
status = ".main-nav > #main-menu > .slide > a[data-title='Quick Guide'] > i";
$(status).attr("class","fa fa-paper-plane");

View File

@ -156,9 +156,6 @@
<body class="lang_<%=luci.i18n.context.lang%> <%- if node then %><%= striptags( node.title ) %><%- end %> <% if luci.dispatcher.context.authsession then %>logged-in<% end %>">
<div class="header-logo">
<div class="container"><img src="<%=media%>/images/logo.png" style="margin-top:0px;"></div>
</div>
<nav class="main-nav" role="navigation">