Skip to content

Commit

Permalink
修复 移动端 的 登录页面[sysauth] 因可拖动导致显示出模糊层以外的溢出区域,修复后该页面将不可拖动
Browse files Browse the repository at this point in the history
-重做footer自动隐藏,修复在浏览器刷新时,且窗口高度过小时,footer不会自动隐藏
-将 登录页面[sysauth] 中 主机名[brand-text] 的文本长度从原先的最长3行 改为 2行
-同时调整footer自动隐藏的窗口高度为<600,避免出现footer与其他元素重叠
  • Loading branch information
SpeedPartner committed May 23, 2023
1 parent b0c99af commit 7eb29a1
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 25 deletions.
6 changes: 2 additions & 4 deletions htdocs/luci-static/argon/css/cascade.css
Expand Up @@ -283,6 +283,7 @@ li {
max-width: 420px;
background-color: #fff;
background-color: var(--white);
overflow:hidden;
}
.login-page .login-container .login-form .brand {
display: flex;
Expand All @@ -308,7 +309,7 @@ li {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}
.login-page .login-container .login-form .brand:hover {
Expand Down Expand Up @@ -3062,9 +3063,6 @@ input[name="nslookup"] {
margin-left: 0rem !important;
width: 100%;
}
.login-page .login-container .login-form {
max-width: 480px;
}
.login-page .login-container .login-form .form-login .input-group::before {
color: #525461;
}
Expand Down
4 changes: 2 additions & 2 deletions htdocs/luci-static/argon/less/cascade.less
Expand Up @@ -325,6 +325,7 @@ li {
max-width: 420px;
background-color: #fff;
background-color: var(--white);
overflow:hidden;

.brand {
display: flex;
Expand Down Expand Up @@ -356,7 +357,7 @@ li {
overflow: hidden;
text-overflow: ellipsis;
display: -webkit-box;
-webkit-line-clamp: 3;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
}

Expand Down Expand Up @@ -3780,7 +3781,6 @@ input[name="nslookup"] {
width: 100%;

.login-form {
max-width: 480px;

.form-login {
.input-group {
Expand Down
26 changes: 7 additions & 19 deletions luasrc/view/themes/argon/footer.htm
Expand Up @@ -59,25 +59,13 @@
</div>
</div>
<script>
// thanks for Jo-Philipp Wich <jow@openwrt.org>
var winHeight = $(window).height();
$(window).resize(function () {
if($(document.body).height() < 525 ){
if($(".ftc").css('display') != 'none'){
$(".ftc").hide()
}
}else{
if($(".ftc").css('display') == 'none'){
$(".ftc").show()
}
}
})
</script>

<script>
if (window.orientation == 90 || window.orientation == -90) {
$(".ftc").hide()
}
window.addEventListener('resize', function() {
if (window.innerHeight < 600) {
document.getElementsByClassName("ftc")[0].style.display = "none";
} else {
document.getElementsByClassName("ftc")[0].style.display = "block";
}
})
</script>

<script src="<%=media%>/js/styles-argon.js<%# ?v=PKG_VERSION %>"></script>
Expand Down

0 comments on commit 7eb29a1

Please sign in to comment.