فهرست منبع

导航栏优化

jqh 5 سال پیش
والد
کامیت
dd173854f5

+ 18 - 6
resources/assets/adminlte/scss/_sidebar-mini.scss

@@ -55,11 +55,7 @@
     @include sidebar-mini-breakpoint;
   }
 }
-@include media-breakpoint-down(sm) {
-  .sidebar-mini-md.sidebar-collapse .main-sidebar {
-    box-shadow: none !important;
-  }
-}
+
 
 .sidebar-collapse {
   .main-sidebar.sidebar-focused,
@@ -87,7 +83,7 @@
     }
   }
 
-  // navbar
+  // 导航栏
   .header-navbar.floating-nav {
     width: calc(100vw - (100vw - 100%) - 70px - #{$sidebar-mini-width});
   }
@@ -170,6 +166,22 @@
   }
 }
 
+// 导航栏兼容
+@include media-breakpoint-down(sm) {
+  .sidebar-mini-md.sidebar-collapse .main-sidebar {
+    box-shadow: none !important;
+  }
+
+  .sidebar-collapse .header-navbar.fixed-top {
+    left: 0;
+  }
+}
+@media (max-width: 1201px) {
+  .sidebar-collapse .header-navbar.fixed-top {
+    left: 0;
+  }
+}
+
 .sidebar .nav-link p,
 .main-sidebar .brand-text,
 .main-sidebar .logo-xs,

+ 2 - 2
resources/assets/dcat/sass/dcat-app.scss

@@ -33,12 +33,12 @@ body, .header-navbar, .navigation, .breadcrumb, h1, h2, h3, h4, h5 {
 
 .navbar-fixed-top {
   .content-wrapper {
-    margin-top: 6.5rem;
+    margin-top: 4rem;
   }
 }
 
 .content-header {
-  padding: 3px 0 2px;
+  padding: 0 0 2px;
 }
 
 ol, ul, dl {

+ 1 - 1
resources/views/grid/quick-search.blade.php

@@ -1,6 +1,6 @@
 <style>::-ms-clear,::-ms-reveal{display: none;}</style>
 
-<form action="{!! $action !!}" class="input-no-border" pjax-container style="display:inline-block;margin-right: 16px">
+<form action="{!! $action !!}" class="input-no-border d-md-inline-block" pjax-container style="display:none;margin-right: 16px">
     <div class="dataTables_filter">
         <label style="width: {{ $width }}rem">
             <input