jqh 5 лет назад
Родитель
Сommit
e43359e5ba

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

@@ -125,7 +125,7 @@ $sidebar-light-color: #565656 !default;
 $sidebar-light-hover-color: $gray-900 !default;
 $sidebar-light-hover-color: $gray-900 !default;
 $sidebar-light-active-color: #565656 !default;
 $sidebar-light-active-color: #565656 !default;
 $sidebar-light-submenu-bg: transparent !default;
 $sidebar-light-submenu-bg: transparent !default;
-$sidebar-light-submenu-color: #777 !default;
+$sidebar-light-submenu-color: $sidebar-light-color !default;
 $sidebar-light-submenu-hover-color: #000 !default;
 $sidebar-light-submenu-hover-color: #000 !default;
 $sidebar-light-submenu-hover-bg: $sidebar-light-hover-bg !default;
 $sidebar-light-submenu-hover-bg: $sidebar-light-hover-bg !default;
 $sidebar-light-submenu-active-color: $sidebar-light-hover-color !default;
 $sidebar-light-submenu-active-color: $sidebar-light-hover-color !default;

+ 1 - 1
resources/assets/dcat/sass/components/_checkbox.scss

@@ -11,6 +11,6 @@
   }
   }
 }
 }
 .vs-checkbox-con input:checked ~ .vs-checkbox .vs-checkbox--check .vs-icon {
 .vs-checkbox-con input:checked ~ .vs-checkbox .vs-checkbox--check .vs-icon {
-  font-size: 85rem;
+  font-size: .85rem;
   margin-top: -1px;
   margin-top: -1px;
 }
 }

+ 3 - 2
resources/assets/dcat/sass/components/_custom-data-table.scss

@@ -54,10 +54,11 @@
   //padding: 1.45rem 2.8rem !important;
   //padding: 1.45rem 2.8rem !important;
   //border-radius: 1.428rem;
   //border-radius: 1.428rem;
   //border: 1px solid #dae1e7;
   //border: 1px solid #dae1e7;
-  padding: 1.2rem 2.8rem !important;
+  padding: 1.15rem 2.8rem !important;
   border-radius: 1.4rem;
   border-radius: 1.4rem;
   border: 0;
   border: 0;
   box-shadow: $shadow;
   box-shadow: $shadow;
+  font-size: .82rem;
 }
 }
 
 
 .custom-data-table-header .table-responsive .top .dataTables_filter label{
 .custom-data-table-header .table-responsive .top .dataTables_filter label{
@@ -68,7 +69,7 @@
   content: "\E8BD";
   content: "\E8BD";
   font-family: feather;
   font-family: feather;
   position: absolute;
   position: absolute;
-  top: 0.55rem;
+  top: 0.5rem;
   font-size: 1rem;
   font-size: 1rem;
   left: 1.2rem;
   left: 1.2rem;
   font-weight: 300;
   font-weight: 300;

+ 6 - 0
resources/assets/dcat/sass/components/_form.scss

@@ -1,3 +1,9 @@
+.form-control {
+  border-color: $input-border-color;
+  color: $font-color;
+  padding: .5rem .7rem;
+  font-size: .9rem;
+}
 
 
 .form-control-sm {
 .form-control-sm {
   padding: 0.5rem 1.5rem;
   padding: 0.5rem 1.5rem;

+ 2 - 2
resources/assets/dcat/sass/components/_layer.scss

@@ -22,7 +22,7 @@
 .layui-layer-setwin .layui-layer-min cite:before {
 .layui-layer-setwin .layui-layer-min cite:before {
   font-family: "feather";
   font-family: "feather";
   content: "\e897";
   content: "\e897";
-  font-size: 1.2rem;
+  font-size: 1.1rem;
   color: $font-color;
   color: $font-color;
 }
 }
 
 
@@ -43,7 +43,7 @@
 .layui-layer-setwin .layui-layer-close1:before {
 .layui-layer-setwin .layui-layer-close1:before {
   font-family: "feather";
   font-family: "feather";
   content: "\e8f6";
   content: "\e8f6";
-  font-size: 1.2rem;
+  font-size: 1.1rem;
 }
 }
 .layui-layer-setwin .layui-layer-close1 {
 .layui-layer-setwin .layui-layer-close1 {
   margin-left: 7px!important;
   margin-left: 7px!important;

+ 2 - 0
resources/lang/en/admin.php

@@ -148,6 +148,8 @@ return [
     'size'                  => 'Size',
     'size'                  => 'Size',
     'between_start'         => 'Start',
     'between_start'         => 'Start',
     'between_end'           => 'End',
     'between_end'           => 'End',
+    'next_page'             => 'Next',
+    'prev_page'             => 'Previous',
     'next_step'             => 'Next',
     'next_step'             => 'Next',
     'prev_step'             => 'Previous',
     'prev_step'             => 'Previous',
     'done'                  => 'Done',
     'done'                  => 'Done',

+ 2 - 0
resources/lang/zh-CN/admin.php

@@ -149,6 +149,8 @@ return [
     'size'                  => '大小',
     'size'                  => '大小',
     'between_start'         => '起始',
     'between_start'         => '起始',
     'between_end'           => '结束',
     'between_end'           => '结束',
+    'next_page'             => '下一页',
+    'prev_page'             => '上一页',
     'next_step'             => '下一步',
     'next_step'             => '下一步',
     'prev_step'             => '上一步',
     'prev_step'             => '上一步',
     'done'                  => '完成',
     'done'                  => '完成',

+ 4 - 4
resources/views/grid/pagination.blade.php

@@ -1,9 +1,9 @@
 <ul class="pagination pagination-sm no-margin pull-right">
 <ul class="pagination pagination-sm no-margin pull-right">
     <!-- Previous Page Link -->
     <!-- Previous Page Link -->
     @if ($paginator->onFirstPage())
     @if ($paginator->onFirstPage())
-    <li class="page-item previous disabled"><span class="page-link">{{ __('admin.prev_step') }}</span></li>
+    <li class="page-item previous disabled"><span class="page-link">{{ __('admin.prev_page') }}</span></li>
     @else
     @else
-    <li class="page-item previous"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">{{ __('admin.prev_step') }}</a></li>
+    <li class="page-item previous"><a class="page-link" href="{{ $paginator->previousPageUrl() }}" rel="prev">{{ __('admin.prev_page') }}</a></li>
     @endif
     @endif
 
 
     <!-- Pagination Elements -->
     <!-- Pagination Elements -->
@@ -27,8 +27,8 @@
 
 
     <!-- Next Page Link -->
     <!-- Next Page Link -->
     @if ($paginator->hasMorePages())
     @if ($paginator->hasMorePages())
-    <li class="page-item next"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">{{ __('admin.next_step') }}</a></li>
+    <li class="page-item next"><a class="page-link" href="{{ $paginator->nextPageUrl() }}" rel="next">{{ __('admin.next_page') }}</a></li>
     @else
     @else
-    <li class="page-item next disabled"><span class="page-link">{{ __('admin.next_step') }}</span></li>
+    <li class="page-item next disabled"><span class="page-link">{{ __('admin.next_page') }}</span></li>
     @endif
     @endif
 </ul>
 </ul>

+ 3 - 3
src/Admin.php

@@ -10,7 +10,7 @@ use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Menu;
 use Dcat\Admin\Layout\Menu;
 use Dcat\Admin\Layout\Navbar;
 use Dcat\Admin\Layout\Navbar;
 use Dcat\Admin\Layout\SectionManager;
 use Dcat\Admin\Layout\SectionManager;
-use Dcat\Admin\Models\HasPermissions;
+use Dcat\Admin\Traits\HasPermissions;
 use Dcat\Admin\Repositories\EloquentRepository;
 use Dcat\Admin\Repositories\EloquentRepository;
 use Dcat\Admin\Repositories\Proxy;
 use Dcat\Admin\Repositories\Proxy;
 use Dcat\Admin\Support\Helper;
 use Dcat\Admin\Support\Helper;
@@ -30,11 +30,11 @@ class Admin
     use HasAssets;
     use HasAssets;
 
 
     /**
     /**
-     * The version.
+     * 版本号.
      *
      *
      * @var string
      * @var string
      */
      */
-    const VERSION = '0.1.0';
+    const VERSION = '1.0.0';
 
 
     /**
     /**
      * @var array
      * @var array

+ 0 - 2
src/Widgets/DialogForm.php

@@ -306,8 +306,6 @@ JS
         Admin::baseJs([]);
         Admin::baseJs([]);
         Admin::fonts(false);
         Admin::fonts(false);
 
 
-        Admin::asset()->full();
-
         $form->wrap(function ($v) {
         $form->wrap(function ($v) {
             return $v;
             return $v;
         });
         });