Merge branch 'dev'

README.md

@@ -1,7 +1,8 @@
 
-<h2>
-    Dcat Admin
-</h2>
+<p align="center">
+<a href="https://jqhph.gitee.io/dcatadmin/">
+<img height="60px" src="https://jqhph.gitee.io/dcatadmin/assets/img/logo.png" alt="dcat-admin">
+</a>
 
 <p align="center"><code>Dcat Admin</code>是一个基于<a href="https://www.laravel-admin.org/" target="_blank">laravel-admin</a>二次开发而成的后台构建工具，只需使用很少的代码即可快速构建出一个功能完善的漂亮的管理后台。</p>
 

resources/assets/AdminLTE/dist/css/skins/skin-blue-light.min.css

@@ -1,10 +1,10 @@
 .skin-blue-light .main-header {
-    box-shadow: 0 2px 4px -1px rgba(0, 0, 0, .2), 0 4px 5px 0 rgba(0, 0, 0, .14), 0 1px 10px 0 rgba(0, 0, 0, .12);
-    background-color: #1867c0
+    /*box-shadow: 0 2px 4px -1px rgba(0, 0, 0, .2), 0 4px 5px 0 rgba(0, 0, 0, .14), 0 1px 10px 0 rgba(0, 0, 0, .12);*/
+    background-color: #297ec0
 }
 
 .skin-blue-light .main-header .navbar {
-    background-color: #1867c0
+    background-color: #297ec0
 }
 
 .skin-blue-light .main-header .navbar .nav > li > a {
@@ -30,7 +30,7 @@
 }
 
 /*.skin-blue-light .main-header .navbar .sidebar-toggle:hover {*/
-/*background-color: #1867c0*/
+/*background-color: #297ec0*/
 /*}*/
 
 @media (max-width: 767px) {
@@ -43,23 +43,23 @@
     }
 
     .skin-blue-light .main-header .navbar .dropdown-menu li a:hover {
-        background: #1867c0
+        background: #297ec0
     }
 }
 
 .skin-blue-light .main-header .logo {
-    background-color: #1867c0;
+    background-color: #297ec0;
     color: #fff;
     border-bottom: 0 solid transparent
 }
 
 .skin-blue-light .main-header .logo:hover {
-    /*background-color: #1867c0*/
+    /*background-color: #297ec0*/
     background:rgba(0, 0, 0, .1);
 }
 
 .skin-blue-light .main-header li.user-header {
-    background-color: #1867c0
+    background-color: #297ec0
 }
 
 .skin-blue-light .content-header {
@@ -68,7 +68,7 @@
 
 .skin-blue-light .left-side, .skin-blue-light .main-sidebar, .skin-blue-light .wrapper {
     background-color: #fff;
-    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .26)
+    /*box-shadow: 0 2px 5px 0 rgba(0, 0, 0, .26)*/
 }
 
 .skin-blue-light .content-wrapper, .skin-blue-light .main-footer {
@@ -100,7 +100,7 @@
 }
 
 .skin-blue-light .sidebar-menu > li.active {
-    border-left-color: #1867c0
+    border-left-color: #297ec0
 }
 
 .skin-blue-light .sidebar-menu > li.active > a {
@@ -184,7 +184,7 @@
 }
 
 .skin-blue-light.layout-top-nav .main-header > .logo {
-    background-color: #1867c0;
+    background-color: #297ec0;
     color: #fff;
     border-bottom: 0 solid transparent;
     font-family: Rancho, cursive;
@@ -192,7 +192,7 @@
 }
 
 .skin-blue-light.layout-top-nav .main-header > .logo:hover {
-    background-color: #1867c0
+    background-color: #297ec0
 }
 
 .skin-blue-light .navbar-search-from {

resources/assets/dcat-admin/main.css

@@ -2126,7 +2126,7 @@ div.layui-layer-btn{
 }
 
 .material .box-header,.material .card-header {
-    padding: 13px 12px;
+    padding: 11px;
 }
 .material .box-header .btn, .material .card-header .btn {
     /*text-transform: uppercase;*/

resources/views/form.blade.php

@@ -1,6 +1,6 @@
 @if($showHeader)
 <div class="box-header with-border">
-    <h3 class="box-title text-80 bold" style="line-height:30px">{!! $form->title() !!}</h3>
+    <h3 class="box-title" style="line-height:30px">{!! $form->title() !!}</h3>
     <div class="pull-right">{!! $form->renderTools() !!}</div>
 </div>
 @endif

resources/views/index.blade.php

@@ -17,6 +17,11 @@
 
     <script src="{{ Dcat\Admin\Admin::jQuery() }}"></script>
     {!! Dcat\Admin\Admin::headerJs() !!}
+
+    @if(!empty($favicon = Dcat\Admin\Admin::favicon()))
+        <link rel="shortcut icon" href="{{$favicon}}">
+    @endif
+
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
     <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>

resources/views/show/panel.blade.php

@@ -1,6 +1,6 @@
 @if($title || $tools)
 <div class="box-header with-border">
-    <h3 class="box-title text-80 bold" style="line-height:30px;">{!! $title !!}</h3>
+    <h3 class="box-title" style="line-height:30px;">{!! $title !!}</h3>
     <div class="pull-right">{!! $tools !!}</div>
 </div>
 @endif

src/Admin.php

@@ -37,11 +37,6 @@ class Admin
      */
     const VERSION = '1.0.0';
 
-    /**
-     * @var string
-     */
-    protected static $metaTitle;
-
     /**
      * @var array
      */
@@ -52,6 +47,16 @@ class Admin
      */
     protected static $availableExtensions;
 
+    /**
+     * @var string
+     */
+    protected static $metaTitle;
+
+    /**
+     * @var string
+     */
+    protected static $favicon;
+
     /**
      * Returns the long version of dcat-admin.
      *
@@ -97,6 +102,21 @@ class Admin
         return static::$metaTitle ?: config('admin.title');
     }
 
+
+    /**
+     * @param null|string $favicon
+     *
+     * @return string|void
+     */
+    public static function favicon($favicon = null)
+    {
+        if (is_null($favicon)) {
+            return static::$favicon;
+        }
+
+        static::$favicon = $favicon;
+    }
+
     /**
      * @param $repository
      * @param Closure|null $callback

src/Form/Builder.php

@@ -765,8 +765,6 @@ EOF;
             return $wrapper($view);
         }
 
-        $style = $this->isCreating() ? 'success' : 'default';
-
         return "<div class='card material'>{$view->render()}</div>";
     }
 

src/Form/Concerns/HasEvents.php

@@ -182,8 +182,8 @@ trait HasEvents
     }
 
     /**
-     * @param array $listeners
-     * @return mixed|void
+     * @param string $name
+     * @return RedirectResponse|\Illuminate\Http\Response|void
      */
     protected function callListeners($name)
     {