diff options
5 files changed, 26 insertions, 12 deletions
diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua index 06bce01fc4..8be354b448 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/ifaces.lua @@ -53,7 +53,7 @@ local function get_ifstate(name, option) m.uci:foreach("luci", "ifstate", function (s) if s.interface == name then - val = m.uci:get("luci", s[".name"], option) + val = s[option] return false end end) diff --git a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua index 3e46628d3f..d79b3c4704 100644 --- a/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua +++ b/modules/luci-mod-admin-full/luasrc/model/cbi/admin_network/vlan.lua @@ -17,7 +17,7 @@ local update_interfaces = function(old_ifname, new_ifname) local info = { } m.uci:foreach("network", "interface", function(section) - local old_ifnames = m.uci:get("network", section[".name"], "ifname") + local old_ifnames = section.ifname local new_ifnames = { } local cur_ifname local changed = false diff --git a/protocols/luci-proto-ipv6/Makefile b/protocols/luci-proto-ipv6/Makefile index b28c8d5895..b0c8395e86 100644 --- a/protocols/luci-proto-ipv6/Makefile +++ b/protocols/luci-proto-ipv6/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk LUCI_TITLE:=Support for DHCPv6/6in4/6to4/6rd/DS-Lite -LUCI_DEPENDS:= +LUCI_DEPENDS:=@IPV6 PKG_LICENSE:=Apache-2.0 diff --git a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css index 4875c33f8d..fa0316343b 100644 --- a/themes/luci-theme-material/htdocs/luci-static/material/cascade.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/cascade.css @@ -19,6 +19,11 @@ */ /* + * Include custom css + */ +@import url("custom.css"); + +/* * Font generate by Icomoon<icomoon.io> */ @font-face { @@ -255,7 +260,7 @@ footer > a { width: calc(0% + 15rem); height: 100%; height: calc(100% - 4rem); - background-color: white; + background-color: var(--menu-bg-color, #FFFFFF); overflow-x: auto; position: fixed; } @@ -281,8 +286,8 @@ footer > a { } header { - background: #0099CC; - color: white; + background: var(--header-bg, #0099CC); + color: var(--header-color, #FFFFFF); } header > .fill > .container { @@ -292,7 +297,7 @@ header > .fill > .container { header > .fill > .container > .brand { font-size: 1.4rem; - color: white; + color: var(--header-color, #FFFFFF); text-decoration: none; cursor: default; vertical-align: text-bottom; @@ -374,7 +379,7 @@ header > .fill > .container > .brand { } .main > .main-left > .nav > li a { - color: #404040; + color: var(--menu-color, #404040); display: block; } @@ -406,7 +411,7 @@ header > .fill > .container > .brand { .main > .main-left > .nav > li:hover, .main > .main-left > .nav > .slide > .menu:hover { - background: #D4D4D4; + background: var(--submenu-bg-hover, #D4D4D4) } .main > .main-left > .nav > .slide:hover { @@ -418,7 +423,7 @@ header > .fill > .container > .brand { } .main > .main-left > .nav > .slide > .slide-menu > .active { - background-color: #0099CC; + background-color: var(--submenu-bg-hover-active, #0099CC); } .main > .main-left > .nav > .slide > .slide-menu > li > a { @@ -431,7 +436,7 @@ header > .fill > .container > .brand { } .main > .main-left > .nav > .slide > .slide-menu > li:hover { - background: #D4D4D4; + background: var(--submenu-bg-hover, #D4D4D4) } .main > .main-left > .nav > .slide > .slide-menu > .active:hover { @@ -1226,7 +1231,7 @@ td > .ifacebadge, min-height: 14rem; padding: 0.8rem; font-size: 0.8rem; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + font-family: monospace; color: black; } diff --git a/themes/luci-theme-material/htdocs/luci-static/material/custom.css b/themes/luci-theme-material/htdocs/luci-static/material/custom.css new file mode 100644 index 0000000000..b32eb2af1b --- /dev/null +++ b/themes/luci-theme-material/htdocs/luci-static/material/custom.css @@ -0,0 +1,9 @@ + +:root { + --header-bg: #0099CC; + --header-color: #FFFFFF; + --menu-bg-color: #FFFFFF; + --menu-color: #404040; + --submenu-bg-hover: #D4D4D4; + --submenu-bg-hover-active: #0099CC; +} |