From: Lutty Yang Date: Tue, 13 Oct 2015 15:07:16 +0000 (+0800) Subject: luci-theme-material: PR from Version 0.2.11 X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=780778e6f98d0e8b5bd531f79636fd43b7b99c11;hp=7567f2d01f6e136abfa82e1b1ef85bfe287f13dc;p=project%2Fluci.git luci-theme-material: PR from Version 0.2.11 Signed-off-by: Lutty Yang --- diff --git a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css b/themes/luci-theme-material/htdocs/luci-static/material/css/style.css index f11f1ca0f..851659503 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/css/style.css +++ b/themes/luci-theme-material/htdocs/luci-static/material/css/style.css @@ -150,6 +150,9 @@ footer > a{ .main { top: 4rem; bottom: 0rem; + position: relative; + height: 100%; + height: calc(100% - 4rem); } .main > .loading{ @@ -195,22 +198,29 @@ footer > a{ .main-left { float: left; + top: 4rem; width: 15%; width: calc(0% + 17rem); height: 100%; - overflow-y: auto; + height: calc(100% - 4rem); background-color: white; + + overflow-x: auto; + position: fixed; } .main-right { width: 85%; width: calc(100% - 17rem); float: right; - overflow-y: auto; height: 100%; background-color: #EEE; } +.main-right > #maincontent{ + background-color: #EEE; +} + .pull-right { float: right; } @@ -1195,10 +1205,13 @@ body.lang_pl.node-main-login .cbi-value-title { .main { top: 3.5rem; + height: calc(100% - 3.5rem); } .main-left { width: calc(0% + 13rem); + top: 3.5rem; + height: calc(100% - 3.5rem); } .main-right { diff --git a/themes/luci-theme-material/luasrc/view/themes/material/footer.htm b/themes/luci-theme-material/luasrc/view/themes/material/footer.htm index 5cb74ce1e..312785577 100755 --- a/themes/luci-theme-material/luasrc/view/themes/material/footer.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/footer.htm @@ -42,6 +42,6 @@ - + diff --git a/themes/luci-theme-material/luasrc/view/themes/material/header.htm b/themes/luci-theme-material/luasrc/view/themes/material/header.htm index 05d9419a8..99afc065b 100755 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -19,6 +19,7 @@ -%> <% + local ver = require "luci.version" local sys = require "luci.sys" local util = require "luci.util" local http = require "luci.http" @@ -121,7 +122,7 @@ - + <% if node and node.css then %> @@ -154,7 +155,7 @@ end %> <% if ucichanges > 0 then %> - <%:Unsaved Changes%>: <%=ucichanges%> + "><%:Unsaved Changes%>: <%=ucichanges%> <% end %>