summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorHannu Nyman <hannu.nyman@iki.fi>2015-10-24 09:33:42 +0300
committerHannu Nyman <hannu.nyman@iki.fi>2015-10-24 09:33:42 +0300
commit2a9b2107ba9fec08e7883e7eeb13bd37c555c623 (patch)
tree5739c9bf3db85006f809bf0cfaaebc4e2d7e1853
parenta19f97f7cacf65fa3f51b668449bcca56db1f53f (diff)
parent1328b89ef875671d973835f19675166248df5674 (diff)
Merge pull request #522 from LuttyYang/master
luci-theme-material: fix some style bugs
-rwxr-xr-xthemes/luci-theme-material/htdocs/luci-static/material/css/style.css8
-rwxr-xr-xthemes/luci-theme-material/htdocs/luci-static/material/js/script.js2
2 files changed, 5 insertions, 5 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 6b5a0bae31..d4feb368b2 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
@@ -807,7 +807,7 @@ form.inline + form.inline,
width: 100%;
min-height: 15rem;
padding: 1rem;
- font-size: smaller;
+ font-size: small;
color: #5F5F5F;
margin-bottom: 20px;
@@ -945,7 +945,7 @@ div.cbi-value var, td.cbi-value-field var {
}
small {
- font-size: smaller;
+ font-size: small;
white-space: normal;
}
@@ -1166,7 +1166,7 @@ header > .container > .pull-right > * {
#cbi-firewall-redirect table *,
#cbi-network-switch_vlan table *,
#cbi-firewall-zone table *{
- font-size: smaller;
+ font-size: small;
}
#cbi-firewall-redirect table input[type="text"],
@@ -1220,7 +1220,7 @@ body.lang_pl.node-main-login .cbi-value-title {
}
.cbi-input-textarea {
- font-size: smaller;
+ font-size: small;
}
.node-status-iptables > .main fieldset li > a {
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 d402728e55..03e5739ad8 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
@@ -57,7 +57,7 @@
var ret = false;
if (!$('body').hasClass('logged-in')) {
luciLocation = ["Main", "Login"];
- return false;
+ return true;
}
$(".main > .main-left > .nav > .slide > .menu").each(function () {