summaryrefslogtreecommitdiffhomepage
path: root/themes/luci-theme-material/htdocs
diff options
context:
space:
mode:
authorLutty Yang <lutty@wcan.in>2015-10-13 23:07:16 +0800
committerLutty Yang <lutty@wcan.in>2015-10-13 23:07:16 +0800
commit780778e6f98d0e8b5bd531f79636fd43b7b99c11 (patch)
tree5aa69190c9486d497ba7a5d64a6095561d657276 /themes/luci-theme-material/htdocs
parent7567f2d01f6e136abfa82e1b1ef85bfe287f13dc (diff)
luci-theme-material: PR from Version 0.2.11
Signed-off-by: Lutty Yang <lutty@wcan.in>
Diffstat (limited to 'themes/luci-theme-material/htdocs')
-rwxr-xr-xthemes/luci-theme-material/htdocs/luci-static/material/css/style.css17
1 files changed, 15 insertions, 2 deletions
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 f11f1ca0fd..8516595038 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 {