github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复浏览器手动缩放比例后菜单无法自适应问题

pull/129/MERGE
RuoYi 2020-06-19 19:29:54 +08:00
parent 07c3a67b70
commit 7dc982aded
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ruoyi-admin/src/main/resources/static/css/style.css
View File

@ -865,9 +865,9 @@ body.canvas-menu.mini-navbar nav.navbar-static-side {
color: #cacaca; color: #cacaca;
} }
/* .form-control, .form-control:focus, .has-error .form-control:focus, .has-success .form-control:focus, .has-warning .form-control:focus, .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus, .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle, .panel, .popover, .progress, .progress-bar { */ .form-control, .has-error .form-control:focus, .has-success .form-control:focus, .has-warning .form-control:focus, .navbar-collapse, .navbar-form, .navbar-form-custom .form-control:focus, .navbar-form-custom .form-control:hover, .open .btn.dropdown-toggle, .panel, .popover, .progress, .progress-bar {
/* box-shadow: none; */ box-shadow: none;
/* } */ }
.btn-outline { .btn-outline {
color: inherit; color: inherit;

21
ruoyi-admin/src/main/resources/static/ruoyi/index.js
View File

@ -7,7 +7,7 @@ layer.config({
skin: 'layer-ext-moon' skin: 'layer-ext-moon'
}); });
var isMobile = $.common.isMobile() || $(window).width() < 769; var isMobile = false;
var sidebarHeight = isMobile ? '100%' : '96%'; var sidebarHeight = isMobile ? '100%' : '96%';
$(function() { $(function() {
@ -52,12 +52,23 @@ $(function() {
}); });
$(window).bind("load resize", $(window).bind("load resize", function() {
function() { isMobile = $.common.isMobile() || $(window).width() < 769;
if ($(this).width() < 769) { if (isMobile) {
$('body').addClass('canvas-menu'); $('body').addClass('canvas-menu');
$("body").removeClass("mini-navbar");
$("nav .logo").addClass("hide"); $("nav .logo").addClass("hide");
$(".slimScrollDiv").css({ "overflow":"hidden" }) $(".slimScrollDiv").css({ "overflow": "hidden" });
$('.navbar-static-side').fadeOut();
} else {
if($('body').hasClass('canvas-menu')) {
$('body').addClass('fixed-sidebar');
$('body').removeClass('canvas-menu');
$("body").removeClass("mini-navbar");
$("nav .logo").removeClass("hide");
$(".slimScrollDiv").css({ "overflow": "visible" });
$('.navbar-static-side').fadeIn();
}
} }
}); });