Home Explore Help
Register Sign In
wangjunyun
/
Dcat-Admin
mirror of https://gitee.com/jqhph/dcat-admin.git
1
0
Fork 0
Files Issues 0 Wiki
Browse Source

update

jqh 5 years ago
parent
90cd2ce98c
commit
3d3927075c
9 changed files with 35 additions and 16 deletions
Unified View Show Diff Stats
  1. 4 0
      resources/assets/adminlte/scss/_sidebar-mini.scss
  2. 1 1
      resources/assets/dcat/sass/components/_custom-data-table.scss
  3. 8 6
      resources/assets/dcat/sass/dcat-app.scss
  4. 13 1
      resources/lang/zh-CN/admin.php
  5. 2 1
      resources/views/layouts/vertical.blade.php
  6. 1 1
      resources/views/partials/navbar.blade.php
  7. 1 1
      src/Layout/Content.php
  8. 1 1
      src/Show/Tools.php
  9. 4 4
      webpack.mix.js

+ 4 - 0
resources/assets/adminlte/scss/_sidebar-mini.scss
View File 

@@ -92,6 +92,10 @@
 
     width: calc(100vw - (100vw - 100%) - 70px - #{$sidebar-mini-width});
 
     width: calc(100vw - (100vw - 100%) - 70px - #{$sidebar-mini-width});
 
   }
 
   }
 
 
 
+  .header-navbar.fixed-top {
 
+    left: #{$sidebar-mini-width};
 
+  }
 
+
 
   .nav-sidebar > .nav-item > .nav-link i {
 
   .nav-sidebar > .nav-item > .nav-link i {
 
     font-size: 1.3rem;
 
     font-size: 1.3rem;
 
   }
 
   }

+ 1 - 1
resources/assets/dcat/sass/components/_custom-data-table.scss
View File 

@@ -163,7 +163,7 @@
 
 }
 
 }
 
 
 
 table.custom-data-table.dataTable, table.data-thumb-view.dataTable {
 
 table.custom-data-table.dataTable, table.data-thumb-view.dataTable {
 
-  border-spacing: 0 .9rem;
 
+  border-spacing: 0 .8rem;
 
   padding: 0;
 
   padding: 0;
 
 }
 
 }

+ 8 - 6
resources/assets/dcat/sass/dcat-app.scss
View File 

@@ -26,17 +26,19 @@ body, .header-navbar, .navigation, .breadcrumb, h1, h2, h3, h4, h5 {
 
   font-family: $font-family-sans-serif;

   font-family: $font-family-sans-serif;

 }

 }

 

 

-html body .content .content-wrapper {

+.content .content-wrapper {

   padding: calc(2.2rem - 0.4rem) 2.1rem 0;

   padding: calc(2.2rem - 0.4rem) 2.1rem 0;

-  //margin-top: 3.5rem;

+  margin-top: 5rem;

 }

 }

 

 

-.content-header {

-  padding: 20px 0 2px;

+.navbar-fixed-top {

+  .content-wrapper {

+    margin-top: 6.5rem;

+  }

 }

 }

 

 

-.navbar-fixed .content-header {

-  padding: 10px 0 2px;

+.content-header {

+  padding: 3px 0 2px;

 }

 }

 

 

 ol, ul, dl {

 ol, ul, dl {

+ 13 - 1
resources/lang/zh-CN/admin.php
View File 

@@ -202,5 +202,17 @@ return [
 
         'minlength' => ':attribute 字符长度不能少于 :min。',
 
         'minlength' => ':attribute 字符长度不能少于 :min。',
 
         'maxlength' => ':attribute 字符长度不能超出 :max。',
 
         'maxlength' => ':attribute 字符长度不能超出 :max。',
 
     ],
 
     ],
 
-    'menu_titles' => [],
 
+    'menu_titles' => [
 
+        'index'         => '主页',
 
+        'admin'         => '系统',
 
+        'users'         => '管理员',
 
+        'roles'         => '角色',
 
+        'permission'    => '权限',
 
+        'menu'          => '菜单',
 
+        'operation_log' => '操作日志',
 
+        'helpers'       => '开发工具',
 
+        'extensions'    => '扩展',
 
+        'scaffold'      => '代码生成器',
 
+        'icons'         => '图标',
 
+    ],
 
 ];
 
 ];

+ 2 - 1
resources/views/layouts/vertical.blade.php
View File 

@@ -1,5 +1,6 @@
 
 <body

 <body

-    class="dcat-admin-body sidebar-mini layout-fixed layout-navbar-fixed layout-footer-fixed {{ $configData['body_class']}} {{ $configData['sidebar_class'] }}" >

+    class="dcat-admin-body sidebar-mini layout-fixed {{ $configData['body_class']}} {{ $configData['sidebar_class'] }}

+    {{ $configData['navbar_class'] === 'fixed-top' ? 'navbar-fixed-top' : '' }} " >

 

 

     <script>

     <script>

         var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});

         var Dcat = CreateDcat({!! Dcat\Admin\Admin::jsVariables() !!});

+ 1 - 1
resources/views/partials/navbar.blade.php
View File 

@@ -1,7 +1,7 @@
 
 

 

 <nav class="header-navbar navbar-expand-lg navbar

 <nav class="header-navbar navbar-expand-lg navbar

     navbar-with-menu {{ $configData['navbar_class'] }}

     navbar-with-menu {{ $configData['navbar_class'] }}

-{{ $configData['navbar_color'] }}

+    {{ $configData['navbar_color'] }}

         navbar-light navbar-shadow " style="top: 0;">

         navbar-light navbar-shadow " style="top: 0;">

 

 

     <div class="navbar-wrapper">

     <div class="navbar-wrapper">

+ 1 - 1
src/Layout/Content.php
View File 

@@ -412,7 +412,7 @@ class Content implements Renderable
 
             'theme' => '',
 
             'theme' => '',
 
             'sidebar_collapsed' => false,
 
             'sidebar_collapsed' => false,
 
             'navbar_color' => '',
 
             'navbar_color' => '',
 
-            'navbar_class' => 'floating',
 
+            'navbar_class' => 'sticky',
 
             'footer_type' => '',
 
             'footer_type' => '',
 
             'body_class' => '',
 
             'body_class' => '',
 
         ];
 
         ];

+ 1 - 1
src/Show/Tools.php
View File 

@@ -298,7 +298,7 @@ EOF;
 
 
 
             $text = $this->showEdit ? '' : "<span class='d-none d-sm-inline'> &nbsp; $edit</span>";
 
             $text = $this->showEdit ? '' : "<span class='d-none d-sm-inline'> &nbsp; $edit</span>";
 
 
 
-            $quickBtn = "<a data-url='$url' class='btn btn-sm btn-primary {$id}'><i class=' fa fa-clone'></i>$text</a>";
 
+            $quickBtn = "<button data-url='$url' class='btn btn-sm btn-primary {$id}'><i class=' fa fa-clone'></i>$text</button>";
 
         }
 
         }
 
 
 
         return <<<HTML
 
         return <<<HTML

+ 4 - 4
webpack.mix.js
View File 

@@ -42,8 +42,8 @@ mix.copyDirectory('resources/assets/fonts', distPath + '/fonts');
 
 mix.copyDirectory('resources/assets/vendors', distPath + '/vendors');
 
 mix.copyDirectory('resources/assets/vendors', distPath + '/vendors');
 
 
 
 // AdminLTE3.0
 
 // AdminLTE3.0
 
-mix.sass('resources/assets/adminlte/scss/AdminLTE.scss', distPath + '/adminlte/adminlte.css');
 
-mix.js('resources/assets/adminlte/js/AdminLTE.js', distPath + '/adminlte/adminlte.js');
 
+mix.sass('resources/assets/adminlte/scss/AdminLTE.scss', distPath + '/adminlte/adminlte.css').sourceMaps();
 
+mix.js('resources/assets/adminlte/js/AdminLTE.js', distPath + '/adminlte/adminlte.js').sourceMaps();
 
 
 
 // ------------------------------------ Dcat Admin -------------------------------------------
 
 // ------------------------------------ Dcat Admin -------------------------------------------
 
 function dcatPath(path) {
 
 function dcatPath(path) {
 
@@ -57,9 +57,9 @@ function dcatDistPath(path) {
 
 // 复制第三方插件文件夹
 
 // 复制第三方插件文件夹
 
 mix.copyDirectory(dcatPath('plugins'), dcatDistPath('plugins'));
 
 mix.copyDirectory(dcatPath('plugins'), dcatDistPath('plugins'));
 
 // 打包app.js
 
 // 打包app.js
 
-mix.js(dcatPath('js/dcat-app.js'), dcatDistPath('js/dcat-app.js'));
 
+mix.js(dcatPath('js/dcat-app.js'), dcatDistPath('js/dcat-app.js')).sourceMaps();
 
 // 打包app.scss
 
 // 打包app.scss
 
-mix.sass(dcatPath('sass/dcat-app.scss'), dcatDistPath('css/dcat-app.css'));
 
+mix.sass(dcatPath('sass/dcat-app.scss'), dcatDistPath('css/dcat-app.css')).sourceMaps();
 
 
 
 // 打包所有 extra 里面的所有js和css
 
 // 打包所有 extra 里面的所有js和css
 
 mixAssetsDir('dcat/extra/*.js', (src, dest) => mix.js(src, dest));
 
 mixAssetsDir('dcat/extra/*.js', (src, dest) => mix.js(src, dest));