소스 검색

黑色菜单栏适配

jqh 5 년 전
부모
커밋
09319573eb

+ 2 - 0
config/admin.php

@@ -316,6 +316,8 @@ return [
 
         'sidebar_collapsed' => false,
 
+        'sidebar_dark' => false,
+
         // bg-primary, bg-info, bg-warning, bg-success, bg-danger, bg-dark
         'navbar_color' => '',
     ],

+ 2 - 2
resources/assets/adminlte/scss/_main-sidebar.scss

@@ -389,7 +389,7 @@
     > .nav-link {
       // border-left: 3px solid transparent;
       &:active {
-        color: $sidebar-dark-color;
+        color: $sidebar-dark-active-color;
       }
     }
 
@@ -402,7 +402,7 @@
     }
 
     > .nav-link.active {
-      color: $sidebar-dark-hover-color;
+      color: $sidebar-dark-active-color;
 
       @if $enable-shadows {
         box-shadow: map-get($elevations, 1);

+ 4 - 4
resources/assets/adminlte/scss/_variables.scss

@@ -107,11 +107,11 @@ $main-footer-bg: transparent !default;
 // Dark sidebar
 $sidebar-dark-bg: $dark !default;
 $sidebar-dark-hover-bg: hsla(100, 100%, 100%, 0.1) !default;
-$sidebar-dark-color: #C2C7D0 !default;
+$sidebar-dark-color: lighten(#C2C7D0, 10%) !default;
 $sidebar-dark-hover-color: $white !default;
-$sidebar-dark-active-color: $white !default;
+$sidebar-dark-active-color: $font-color !default;
 $sidebar-dark-submenu-bg: transparent !default;
-$sidebar-dark-submenu-color: #C2C7D0 !default;
+$sidebar-dark-submenu-color: lighten(#C2C7D0, 10%) !default;
 $sidebar-dark-submenu-hover-color: $white !default;
 $sidebar-dark-submenu-hover-bg: $sidebar-dark-hover-bg !default;
 $sidebar-dark-submenu-active-color: $sidebar-dark-bg !default;
@@ -121,7 +121,7 @@ $sidebar-dark-header-color: $white !default;
 // Light sidebar
 $sidebar-light-bg: $white !default;
 $sidebar-light-hover-bg: #f7f7f9 !default;
-$sidebar-light-color: $font-color !default;
+$sidebar-light-color: $pure-black !default;
 $sidebar-light-hover-color: $gray-900 !default;
 $sidebar-light-active-color: $font-color !default;
 $sidebar-light-submenu-bg: transparent !default;

+ 3 - 3
resources/assets/adminlte/scss/mixins/_sidebar.scss

@@ -4,17 +4,17 @@
 
 // Sidebar Color
 @mixin sidebar-color($color) {
-  .nav-sidebar > .nav-item {
+  .nav-item {
     & > .nav-link.active {
       //background-color: $color;
-      background-color: transparent;
+      background-color: transparent!important;
       background-image: linear-gradient(118deg, $color, rgba($color,.7));
       color: color-yiq($color);
       box-shadow: 0 0 8px 1px rgba($color,.7);
     }
   }
 
-  .nav-sidebar.nav-legacy > .nav-item {
+  .nav-legacy > .nav-item {
     & > .nav-link.active {
       border-color: $color;
     }

+ 9 - 0
resources/assets/dcat/sass/components/_menu.scss

@@ -17,6 +17,7 @@
     .logo-mini {
       display: none;
       font-size: 1.8rem;
+      color: $primary;
     }
 
     .logo-lg {
@@ -39,6 +40,14 @@
       margin: 10px 0;
     }
   }
+
+  [class*='sidebar-dark-'] {
+    .navbar-header {
+      .logo-lg,.logo-mini {
+        color: #f7f7f7;
+      }
+    }
+  }
 }
 
 .main-menu.menu-light .navigation > li.active > a {

+ 1 - 1
resources/assets/sass/bootstrap-extended/_nav.scss

@@ -40,7 +40,7 @@
         padding: .2rem 1rem;
         padding-top: .3rem;
         margin-right: 0.5rem;
-        color: $pure-black;
+        //color: $pure-black;
         &.active {
           color: $white;
         }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
resources/dist/adminlte/adminlte.css


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
resources/dist/dcat/css/dcat-app.css


+ 1 - 1
resources/views/pages/login.blade.php

@@ -18,7 +18,7 @@
         </div>
         <div class="card">
             <div class="card-body login-card-body p-2 shadow-100">
-                <p class="login-box-msg mb-1">{{ __('admin.welcome_back') }}</p>
+                <p class="login-box-msg mt-1 mb-1">{{ __('admin.welcome_back') }}</p>
 
                 <form id="login-form" method="POST" action="{{ admin_url('auth/login') }}">
 

+ 1 - 1
resources/views/partials/sidebar.blade.php

@@ -1,6 +1,6 @@
 <div class="main-menu">
     <div class="main-menu-content">
-        <aside class="main-sidebar sidebar-light-primary shadow">
+        <aside class="main-sidebar {{ $configData['sidebar_dark'] ? 'sidebar-dark-white' : 'sidebar-light-primary' }} shadow">
             <div class="navbar-header">
                 <ul class="nav navbar-nav flex-row">
                     <li class="nav-item mr-auto">

+ 3 - 0
src/Layout/Content.php

@@ -459,6 +459,7 @@ JS
         $defaultData = [
             'theme' => '',
             'sidebar_collapsed' => false,
+            'sidebar_dark' => false,
             'navbar_color' => '',
             'navbar_class' => 'sticky',
             'footer_type' => '',
@@ -474,6 +475,7 @@ JS
             'theme' => '',
             'footer_type' => '',
             'body_class' => '',
+            'sidebar_dark' => '',
             'sidebar_collapsed' => [true, false],
             'navbar_color' => ['bg-primary', 'bg-info', 'bg-warning', 'bg-success', 'bg-danger', 'bg-dark'],
             'navbar_class' => ['floating' => 'floating-nav', 'sticky' => 'fixed-top', 'hidden' => 'd-none'],
@@ -509,6 +511,7 @@ JS
             'navbar_class' => $allOptions['navbar_class'][$data['navbar_class']],
             'sidebar_class' => $data['sidebar_collapsed'] ? 'sidebar-collapse' : '',
             'body_class' => $data['body_class'],
+            'sidebar_dark' => $data['sidebar_dark'],
         ];
     }
 

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.