diff --git a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/background/3.jpg b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/background/3.jpg index 53b7fc5f38..0da1d98f87 100644 Binary files a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/background/3.jpg and b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/background/3.jpg differ diff --git a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/cascade.css b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/cascade.css index b0b72f9822..f684f4609e 100644 --- a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/cascade.css +++ b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/cascade.css @@ -385,12 +385,11 @@ h5, h6 { font-family: inherit; font-weight: normal; - line-height: 1.1 !important; + line-height: 1.1rem; color: inherit; } html { - overflow-y: hidden; -webkit-text-size-adjust: 100%; -ms-text-size-adjust: 100%; } @@ -403,7 +402,6 @@ body { html, body { - height: 100%; margin: 0; padding: 0; overflow-x: hidden; @@ -1486,7 +1484,7 @@ button:hover, font-weight: normal; color: #fff; border: none; - background-color: #00CFDD !important; + background-color: #23bd70 !important; } /* green */ .cbi-button-success, @@ -2704,6 +2702,7 @@ input[name="nslookup"] { .node-main-login .main .main-right #maincontent { height: 100%; padding-top: 23vh; + padding-bottom:1rem; margin-top: 0rem; background-color: transparent !important; text-align: center; @@ -3635,11 +3634,11 @@ input[type="checkbox"]:checked { } .cbi-button,.btn { - background-color: #00CFDD; + background-color: #23bd70; } .cbi-button.reconnect { - background-color: #00CFDD !important; + background-color: #23bd70 !important; } .cpu .cbi-progressbar > div { @@ -4026,9 +4025,8 @@ ul.errors li { min-width: 5rem !important; } -#cbi-passwall .status .red, #cbi-passwall .status .green { - font-size: 0.83rem !important; - line-height: 2rem; +#cbi-passwall .block h4 { + padding:0; } .waves-input-wrapper .waves-button-input { @@ -4073,9 +4071,12 @@ div[id^="cbi-unblockmusic"] .cbi-button { padding-left: 1.5rem; } -.cbi-section-table .tr>.td:last-child,#packages .tr>.td:last-child{ +#packages .tr>.td:last-child{ padding-right:3%; } +.cbi-section-table .tr>.td:last-child{ + padding-right:2rem; +} .command-output { padding: 0 2rem; @@ -4117,4 +4118,12 @@ div[id^="cbi-unblockmusic"] .cbi-button { } table.interfaces .th{ padding:1.1em 0.5rem !important; +} +.cbi-value>.cbi-value-field>div:first-child+br{ +display:none; +} +.cbi-page-actions.control-group.fixed { + position: fixed; + bottom: 1.3rem; + right: 2rem; } \ No newline at end of file diff --git a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/js/script.js b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/js/script.js index a1b7175c90..e5681bb52a 100644 --- a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/js/script.js +++ b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/js/script.js @@ -317,5 +317,8 @@ $("input[type='checkbox']").filter(function () { var mutationObserver = new MutationObserver(callback); mutationObserver.observe($("body")[0], options); $(".cbi-value").has("textarea").css("background","none"); +if(document.body.scrollHeight > window.innerHeight){ + $(".cbi-page-actions.control-group").addClass("fixed") +} })(jQuery); }); \ No newline at end of file diff --git a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/landscape.css b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/landscape.css index 10817377b4..b55ab6957a 100644 --- a/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/landscape.css +++ b/package/ctcgfw/luci-theme-edge/htdocs/luci-static/edge/landscape.css @@ -4,12 +4,13 @@ position: absolute; width: 100%; height: 100%; + overflow: hidden; } #CrossFade img { position: absolute; min-width: 100%; min-height: 100%; - height: auto; + width:100%; background: #fff; -webkit-backface-visibility: hidden; backface-visibility: hidden; diff --git a/package/ctcgfw/luci-theme-edge/luasrc/view/themes/edge/sysauth.htm b/package/ctcgfw/luci-theme-edge/luasrc/view/themes/edge/sysauth.htm index c54ee850b0..989e473d90 100644 --- a/package/ctcgfw/luci-theme-edge/luasrc/view/themes/edge/sysauth.htm +++ b/package/ctcgfw/luci-theme-edge/luasrc/view/themes/edge/sysauth.htm @@ -133,7 +133,7 @@ if (/(iPhone|iPad|iPod|iOS|Android)/i.test(navigator.userAgent)) { <%+footer%> <% -luci.sys.exec("(sleep 1;curl -k -L https://source.unsplash.com/featured/1080x720/?wallpaper -o /www/luci-static/edge/background/1.jpg) &") -luci.sys.exec("(sleep 1;curl -k -L https://source.unsplash.com/featured/1080x720/?fashion -o /www/luci-static/edge/background/2.jpg) &") -luci.sys.exec("(sleep 1;curl -k -L https://source.unsplash.com/featured/1080x720 -o /www/luci-static/edge/background/3.jpg) &") +luci.sys.exec("(curl -k -L \"$(curl -s https://instant.unsplash.com | grep -o 'src=.*w=1080' | grep -o 'https://.*' | sed 's/amp;//g')\" -o /www/luci-static/edge/background/1.jpg) &") +luci.sys.exec("(curl -k -L \"$(curl -s https://instant.unsplash.com | grep -o 'src=.*w=1080' | grep -o 'https://.*' | sed 's/amp;//g')\" -o /www/luci-static/edge/background/2.jpg) &") +luci.sys.exec("(curl -k -L \"$(curl -s https://instant.unsplash.com | grep -o 'src=.*w=1080' | grep -o 'https://.*' | sed 's/amp;//g')\" -o /www/luci-static/edge/background/3.jpg) &") %>