diff options
author | Lutty Yang <lutty@wcan.in> | 2015-09-18 11:32:44 +0800 |
---|---|---|
committer | Lutty Yang <lutty@wcan.in> | 2015-09-18 11:32:44 +0800 |
commit | 2237aab76b6876bc9bc1c0c0fad818898cfbe495 (patch) | |
tree | 1b55baa65caf1f7d47d924f8144cd4c31ecab746 /themes/luci-theme-material/htdocs/luci-static | |
parent | 6c1a2e34833a8514b4f13bfc16a1c0c2d0116bc9 (diff) |
luci-theme-material: fix some bug
fixed "logout" text theme error and "unsaved changes" page dislocation.
Signed-off-by: Lutty Yang <lutty@wcan.in>
Diffstat (limited to 'themes/luci-theme-material/htdocs/luci-static')
-rwxr-xr-x | themes/luci-theme-material/htdocs/luci-static/material/css/style.css | 21 | ||||
-rwxr-xr-x | themes/luci-theme-material/htdocs/luci-static/material/js/script.js | 8 |
2 files changed, 21 insertions, 8 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 4962323e72..6cd78d24bc 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 @@ -219,10 +219,12 @@ header > .container > .brand { .main > .main-left > .nav > li a { color: #404040; + display: block; } .main > .main-left > .nav > li:nth-last-child(1) { margin-top: 2rem; + font-size: 1.2rem; } .main > .main-left > .nav > li { @@ -859,7 +861,7 @@ input[name="nslookup"] { width: 80%; } -#xhr_poll_status { +header > .container > .pull-right > *{ position: relative; top: 0.45rem; cursor: pointer; @@ -869,7 +871,7 @@ input[name="nslookup"] { background-color: #14CE14; } -#xhr_poll_status > .label { +.label { padding: 0.3rem 0.8rem; font-size: 1rem; box-sizing: border-box; @@ -882,6 +884,11 @@ input[name="nslookup"] { -moz-border-radius: 3px; border-radius: 3px; text-shadow: none; + text-decoration: none; +} + +.notice{ + background-color: #5BC0DE; } .showSide { @@ -1068,11 +1075,11 @@ input[name="nslookup"] { line-height: 1.5; } - #xhr_poll_status { + header > .container > .pull-right > * { top: 0.35rem; } - #xhr_poll_status > .label { + .label { padding: 0.2rem 0.6rem; } @@ -1203,7 +1210,7 @@ input[name="nslookup"] { padding: 0.2rem 0.7rem; } - .cbi-page-actions > div { + .cbi-page-actions > div > input { display: none; } @@ -1251,4 +1258,8 @@ input[name="nslookup"] { input { font-size: 1.2rem; } + + .mobile-hide{ + display: none; + } } diff --git a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js index b6e0db4740..c7d60b9e34 100755 --- a/themes/luci-theme-material/htdocs/luci-static/material/js/script.js +++ b/themes/luci-theme-material/htdocs/luci-static/material/js/script.js @@ -260,14 +260,16 @@ */ if (!getCurrentNodeByUrl()){ getCurrentNodeByHash(); - if (tree[0] == "Status" && tree[1] == "Overview"){ + if (tree != undefined && tree[0] == "Status" && tree[1] == "Overview"){ //overview lastNode.addClass("active"); $($(".main > .main-left > .nav > .slide > .menu")[0]).click(); } } - var mainNodeName = "node-"+ tree[0] + "-" + tree[1]; - $("body").addClass(mainNodeName.replace(/[ \t\n\r\/]+/g,"_").toLowerCase()); + if (tree != undefined){ + var mainNodeName = "node-"+ tree[0] + "-" + tree[1]; + $("body").addClass(mainNodeName.replace(/[ \t\n\r\/]+/g,"_").toLowerCase()); + } $(".cbi-button-up").val(""); $(".cbi-button-down").val(""); |