From 2237aab76b6876bc9bc1c0c0fad818898cfbe495 Mon Sep 17 00:00:00 2001 From: Lutty Yang Date: Fri, 18 Sep 2015 11:32:44 +0800 Subject: luci-theme-material: fix some bug fixed "logout" text theme error and "unsaved changes" page dislocation. Signed-off-by: Lutty Yang --- gitconfig | 5 +++++ .../htdocs/luci-static/material/css/style.css | 21 ++++++++++++++++----- .../htdocs/luci-static/material/js/script.js | 8 +++++--- .../luasrc/view/themes/material/header.htm | 6 +++--- 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 gitconfig diff --git a/gitconfig b/gitconfig new file mode 100644 index 000000000..1475b18b4 --- /dev/null +++ b/gitconfig @@ -0,0 +1,5 @@ +[user] + name = Lutty Yang + email = lutty@wcan.in +[commit] + template = /home/dlll/Documents/git-commitmessage 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 4962323e7..6cd78d24b 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 b6e0db474..c7d60b9e3 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(""); 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 3a4f897ca..494cfe39e 100755 --- a/themes/luci-theme-material/luasrc/view/themes/material/header.htm +++ b/themes/luci-theme-material/luasrc/view/themes/material/header.htm @@ -154,11 +154,11 @@ end %> <% if ucichanges > 0 then %> - <%:Unsaved Changes%>: <%=ucichanges%> + <%:Unsaved Changes%>: <%=ucichanges%> <% end %> <% end %> -- cgit v1.2.3 From e04e263adfa8b25a5fe588617c8fbb326f8a5334 Mon Sep 17 00:00:00 2001 From: Lutty Yang Date: Fri, 18 Sep 2015 13:51:15 +0800 Subject: luci-theme-material: fix Polish text longer bug Signed-off-by: Lutty Yang --- .../htdocs/luci-static/material/css/style.css | 50 ++++++++++++++++++---- 1 file changed, 42 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 6cd78d24b..58f6f328c 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 @@ -572,12 +572,13 @@ td > table > tbody > tr > td { } .cbi-value-title { + word-wrap: break-word; padding-top: 0.6rem; - min-width: 23rem; - display: inline-block; + width: 23rem; float: left; text-align: right; padding-right: 2rem; + display: table-cell; } .cbi-value { @@ -915,8 +916,8 @@ header > .container > .pull-right > *{ } .node-main-login > .main fieldset { - margin-bottom: 2rem; - margin-bottom: 2rem; + padding: 0; + margin-bottom: 1rem; display: inline; background: none; border: none; @@ -924,7 +925,7 @@ header > .container > .pull-right > *{ } .node-main-login > .main .cbi-value-title { - min-width: 6rem; + width: 7rem; } .node-main-login > .main #maincontent { @@ -1047,6 +1048,12 @@ header > .container > .pull-right > *{ padding: 0.5rem 1rem; } +.node-system-software > .main .cbi-value > pre{ + background-color: #eee; + padding: 0.5rem; + overflow: auto; +} + .node-status-firewall fieldset, .node-system-software fieldset, .node-system-backup_flash_firmware fieldset { @@ -1060,6 +1067,11 @@ header > .container > .pull-right > *{ box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .16), 0 0 2px 0 rgba(0, 0, 0, .12); } +/* language fix */ +body.lang_pl.node-main-login .cbi-value-title{ + width: 12rem; +} + @media screen and (max-width: 1600px) { .main-left { width: calc(0% + 15rem); @@ -1084,7 +1096,7 @@ header > .container > .pull-right > *{ } .cbi-value-title { - min-width: 15rem; + width: 15rem; } fieldset { @@ -1129,7 +1141,8 @@ header > .container > .pull-right > *{ } .cbi-value-title { - min-width: 6rem; + width: 9rem; + padding-right: 1rem; } @@ -1158,6 +1171,10 @@ header > .container > .pull-right > *{ #diag-rc-output > pre { font-size: 1.2rem; } + + .node-main-login > .main .cbi-value-title{ + text-align: left; + } } @media screen and (max-width: 480px) { @@ -1187,10 +1204,12 @@ header > .container > .pull-right > *{ } .cbi-value-title { + width: 100%; min-width: 0rem !important; display: block; margin-top: 1rem; margin-bottom: 0.5rem; + text-align: left; } .cbi-value-field, .cbi-value-description { @@ -1227,11 +1246,13 @@ header > .container > .pull-right > *{ } .node-main-login > .main .cbi-value-title { + width: 100% !important; font-size: 1.2rem; } .node-main-login > .main fieldset { margin: 0; + padding: 0.5rem; } h2 { @@ -1258,8 +1279,21 @@ header > .container > .pull-right > *{ input { font-size: 1.2rem; } - + .mobile-hide{ display: none; } + + .panel-title{ + font-size: 1.4rem; + padding-bottom: 1rem; + } + + .node-system-software > .main .cbi-value.cbi-value-last > div{ + width: 100% !important; + } + + .node-system-software > .main .cbi-value .cbi-value-field input{ + width: 100%; + } } -- cgit v1.2.3 From cf0623f4f527bd315f164bb51b949e88e00e93d7 Mon Sep 17 00:00:00 2001 From: Lutty Yang Date: Fri, 18 Sep 2015 16:22:39 +0800 Subject: luci-theme-material: fix font size bug fix "textarea font-size too big in firefox" Signed-off-by: Lutty Yang --- gitconfig | 5 ----- .../htdocs/luci-static/material/css/style.css | 15 ++++++++++----- 2 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 gitconfig diff --git a/gitconfig b/gitconfig deleted file mode 100644 index 1475b18b4..000000000 --- a/gitconfig +++ /dev/null @@ -1,5 +0,0 @@ -[user] - name = Lutty Yang - email = lutty@wcan.in -[commit] - template = /home/dlll/Documents/git-commitmessage 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 58f6f328c..3f80ccd31 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 @@ -683,17 +683,18 @@ td > table > tbody > tr > td { .cbi-input-textarea { box-sizing: border-box; width: 100%; - min-height: 15rem; + min-height: 16rem; padding: 1rem; - font-size: 1.2rem; + font-size: 0.9rem; + font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; + color: black; } #syslog { - width: 90%; - width: calc(100% - 2rem); + width: 100%; min-height: 15rem; padding: 1rem; - font-size: 1rem; + font-size: smaller; color: #5F5F5F; margin-bottom: 20px; @@ -1102,6 +1103,10 @@ body.lang_pl.node-main-login .cbi-value-title{ fieldset { padding: 1rem; } + + .cbi-input-textarea{ + font-size: smaller; + } } @media screen and (max-width: 1280px) { -- cgit v1.2.3