Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #513 from LuttyYang/master

Browse source 
luci-theme-material: PR from Version 0.2.11
This commit is contained in:
Hannu Nyman 2015-10-13 18:15:05 +03:00
commit e8349fbfdf
3 changed files with 18 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
themes/luci-theme-material/htdocs/luci-static/material/css/style.css
View file

@ -150,6 +150,9 @@ footer > a{
.main { .main {
top: 4rem; top: 4rem;
bottom: 0rem; bottom: 0rem;
position: relative;
height: 100%;
height: calc(100% - 4rem);
} }
.main > .loading{ .main > .loading{
@ -195,22 +198,29 @@ footer > a{
.main-left { .main-left {
float: left; float: left;
top: 4rem;
width: 15%; width: 15%;
width: calc(0% + 17rem); width: calc(0% + 17rem);
height: 100%; height: 100%;
overflow-y: auto; height: calc(100% - 4rem);
background-color: white; background-color: white;
overflow-x: auto;
position: fixed;
} }
.main-right { .main-right {
width: 85%; width: 85%;
width: calc(100% - 17rem); width: calc(100% - 17rem);
float: right; float: right;
overflow-y: auto;
height: 100%; height: 100%;
background-color: #EEE; background-color: #EEE;
} }
.main-right > #maincontent{
background-color: #EEE;
}
.pull-right { .pull-right {
float: right; float: right;
} }
@ -1195,10 +1205,13 @@ body.lang_pl.node-main-login .cbi-value-title {
.main { .main {
top: 3.5rem; top: 3.5rem;
height: calc(100% - 3.5rem);
} }
.main-left { .main-left {
width: calc(0% + 13rem); width: calc(0% + 13rem);
top: 3.5rem;
height: calc(100% - 3.5rem);
} }
.main-right { .main-right {

2
themes/luci-theme-material/luasrc/view/themes/material/footer.htm
View file

@ -42,6 +42,6 @@
</div> </div>
<script src="<%=media%>/js/jquery.min.js"></script> <script src="<%=media%>/js/jquery.min.js"></script>
<script src="<%=media%>/js/script.js"></script> <script src="<%=media%>/js/script.js?<%= ver.luciversion %>"></script>
</body> </body>
</html> </html>

3
themes/luci-theme-material/luasrc/view/themes/material/header.htm
View file

@ -19,6 +19,7 @@
-%> -%>
<% <%
local ver = require "luci.version"
local sys = require "luci.sys" local sys = require "luci.sys"
local util = require "luci.util" local util = require "luci.util"
local http = require "luci.http" local http = require "luci.http"
@ -121,7 +122,7 @@
<meta name="msapplication-tap-highlight" content="no"> <meta name="msapplication-tap-highlight" content="no">
<meta name="msapplication-TileColor" content="#0099CC"> <meta name="msapplication-TileColor" content="#0099CC">
<meta name="msapplication-TileImage" content="<%=media%>/logo.png"/> <meta name="msapplication-TileImage" content="<%=media%>/logo.png"/>
<link rel="stylesheet" href="<%=media%>/css/style.css"> <link rel="stylesheet" href="<%=media%>/css/style.css?<%= ver.luciversion %>">
<link rel="shortcut icon" href="<%=media%>/favicon.ico"> <link rel="shortcut icon" href="<%=media%>/favicon.ico">
<% if node and node.css then %> <% if node and node.css then %>
<link rel="stylesheet" href="<%=resource%>/<%=node.css%>"> <link rel="stylesheet" href="<%=resource%>/<%=node.css%>">