最大化最小化功能的样式修复

yuzd · yuzd · commit 2bae2ff70321 · 2019-07-04T13:44:40.000+08:00
diff --git a/ant.mgr/mgr.core/Views/Shared/_HomeLayout.cshtml b/ant.mgr/mgr.core/Views/Shared/_HomeLayout.cshtml
@@ -48,7 +48,7 @@
         </nav>
         <!--左侧导航结束-->
         <!--右侧部分开始-->
-        <div id="page-wrapper" class="gray-bg dashbard-1">
+        <div id="page-wrapper" class="gray-bg dashbard-1 page-wrapper">
             <div class="row border-bottom">
                 <nav class="navbar navbar-static-top" role="navigation" style="margin-bottom: 0">
                     <div class="navbar-header">
diff --git a/ant.mgr/mgr.core/wwwroot/css/style.css b/ant.mgr/mgr.core/wwwroot/css/style.css
@@ -3526,7 +3526,7 @@ video {
     padding: 20px;
 }
 
-#page-wrapper {
+.page-wrapper {
     padding: 0 15px;
     position: inherit;
     margin: 0 0 0 220px;
diff --git a/ant.mgr/mgr.core/wwwroot/js/hplus.js b/ant.mgr/mgr.core/wwwroot/js/hplus.js
@@ -131,6 +131,7 @@ function SmoothlyMenu() {
         setTimeout(
             function () {
                 $('#side-menu').fadeIn(500);
+                $('#page-wrapper').attr('style', '');
             }, 300);
     } else {
         $('#side-menu').removeAttr('style');
@@ -288,6 +289,11 @@ function iframeZoom(flag) {
         $('.navbar-static-top').show();
         $('.footer').show();
         $('#content-main').css('height', 'calc(100% - 140px)');
-        $('#page-wrapper').css('margin', '0 0 0 220px');
+       
+        if ($('body').hasClass('fixed-sidebar')) {
+            $('#page-wrapper').attr('style', '');
+        } else {
+            $('#page-wrapper').css('margin', '0 0 0 220px');
+        }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -3526,7 +3526,7 @@ video {`
`3526`	`3526`	`padding: 20px;`
`3527`	`3527`	`}`
`3528`	`3528`
`3529`		`-#page-wrapper {`
	`3529`	`+.page-wrapper {`
`3530`	`3530`	`padding: 0 15px;`
`3531`	`3531`	`position: inherit;`
`3532`	`3532`	`margin: 0 0 0 220px;`